Set the svn:eol-style property on all text files to "native", so that

[obnox/wireshark/wip.git] / packet-lpd.c

diff --git a/packet-lpd.c b/packet-lpd.c
index 5d06fd9c7c391ade907d14adf4933456f45de961..d79ea396380bfa51edaaa7eb234d442c10dbd24d 100644 (file)
--- a/packet-lpd.c
+++ b/packet-lpd.c
@@ -1,24 +1,23 @@
 /* packet-lpd.c
  * Routines for LPR and LPRng packet disassembly
- * Gilbert Ramirez <gram@xiexie.org>
+ * Gilbert Ramirez <gram@alumni.rice.edu>
  *
- * $Id: packet-lpd.c,v 1.27 2001/01/22 08:03:45 guy Exp $
+ * $Id$
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
  *
- * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -28,14 +27,10 @@
 # include "config.h"
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
 #include <string.h>
 
 #include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
 
 #define TCP_PORT_PRINTER               515
 
@@ -49,6 +44,8 @@ enum lpr_type { request, response, unknown };
 
 static gint find_printer_string(tvbuff_t *tvb, int offset);
 
+static dissector_handle_t data_handle;
+
 static void
 dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
@@ -60,7 +57,7 @@ dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        /* This information comes from the LPRng HOWTO, which also describes
                RFC 1179. http://www.astart.com/lprng/LPRng-HOWTO.html */
-       char            *lpd_client_code[] = {
+       static char     *lpd_client_code[] = {
                "Unknown command",
                "LPC: start print / jobcmd: abort",
                "LPR: transfer a printer job / jobcmd: receive control file",
@@ -72,17 +69,17 @@ dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                "LPRng lpc: secure command transfer",
                "LPRng lpq: verbose status information"
        };
-       char            *lpd_server_code[] = {
+       static char     *lpd_server_code[] = {
                "Success: accepted, proceed",
                "Queue not accepting jobs",
                "Queue temporarily full, retry later",
                "Bad job format, do not retry"
        };
 
-       if (check_col(pinfo->fd, COL_PROTOCOL))
-               col_set_str(pinfo->fd, COL_PROTOCOL, "LPD");
-       if (check_col(pinfo->fd, COL_INFO))
-               col_clear(pinfo->fd, COL_INFO);
+       if (check_col(pinfo->cinfo, COL_PROTOCOL))
+               col_set_str(pinfo->cinfo, COL_PROTOCOL, "LPD");
+       if (check_col(pinfo->cinfo, COL_INFO))
+               col_clear(pinfo->cinfo, COL_INFO);
 
        /* rfc1179 states that all responses are 1 byte long */
        code = tvb_get_guint8(tvb, 0);
@@ -96,21 +93,20 @@ dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                lpr_packet_type = unknown;
        }
 
-       if (check_col(pinfo->fd, COL_INFO)) {
+       if (check_col(pinfo->cinfo, COL_INFO)) {
                if (lpr_packet_type == request) {
-                       col_add_str(pinfo->fd, COL_INFO, lpd_client_code[code]);
+                       col_set_str(pinfo->cinfo, COL_INFO, lpd_client_code[code]);
                }
                else if (lpr_packet_type == response) {
-                       col_set_str(pinfo->fd, COL_INFO, "LPD response");
+                       col_set_str(pinfo->cinfo, COL_INFO, "LPD response");
                }
                else {
-                       col_set_str(pinfo->fd, COL_INFO, "LPD continuation");
+                       col_set_str(pinfo->cinfo, COL_INFO, "LPD continuation");
                }
        }
 
        if (tree) {
-               ti = proto_tree_add_item(tree, proto_lpd, tvb, 0, 
-                                        tvb_length(tvb), FALSE);
+               ti = proto_tree_add_item(tree, proto_lpd, tvb, 0, -1, FALSE);
                lpd_tree = proto_item_add_subtree(ti, ett_lpd);
 
                if (lpr_packet_type == response) {
@@ -132,7 +128,7 @@ dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                                         tvb_format_text(tvb, 1, printer_len));
                        }
                        else {
-                               dissect_data(tvb, 0, pinfo, tree);
+                               call_dissector(data_handle,tvb, pinfo, tree);
                        }
                }
                else if (lpr_packet_type == response) {
@@ -141,11 +137,11 @@ dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                                        "Response: %s", lpd_server_code[code]);
                        }
                        else {
-                               dissect_data(tvb, 0, pinfo, tree);
+                               call_dissector(data_handle,tvb, pinfo, tree);
                        }
                }
                else {
-                       dissect_data(tvb, 0, pinfo, tree);
+                       call_dissector(data_handle,tvb, pinfo, tree);
                }
        }
 }
@@ -171,14 +167,14 @@ proto_register_lpd(void)
 {
   static hf_register_info hf[] = {
     { &hf_lpd_response,
-      { "Response",           "lpd.response",          
+      { "Response",           "lpd.response",
        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-       "TRUE if LPD response" }},
+       "TRUE if LPD response", HFILL }},
 
     { &hf_lpd_request,
       { "Request",            "lpd.request",
        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-       "TRUE if LPD request" }}
+       "TRUE if LPD request", HFILL }}
   };
   static gint *ett[] = {
     &ett_lpd,
@@ -192,5 +188,9 @@ proto_register_lpd(void)
 void
 proto_reg_handoff_lpd(void)
 {
-  dissector_add("tcp.port", TCP_PORT_PRINTER, &dissect_lpd, proto_lpd);
+  dissector_handle_t lpd_handle;
+
+  lpd_handle = create_dissector_handle(dissect_lpd, proto_lpd);
+  dissector_add("tcp.port", TCP_PORT_PRINTER, lpd_handle);
+  data_handle = find_dissector("data");
 }