/* 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.23 2000/11/19 08:53:59 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.
# 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
enum lpr_type { request, response, unknown };
-static char* find_printer_string(const u_char *pd, int offset, int frame_length);
+static gint find_printer_string(tvbuff_t *tvb, int offset);
+
+static dissector_handle_t data_handle;
static void
-dissect_lpd(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
+dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_tree *lpd_tree;
proto_item *ti;
enum lpr_type lpr_packet_type;
- char *printer;
+ guint8 code;
+ gint printer_len;
/* 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",
"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"
};
- OLD_CHECK_DISPLAY_AS_DATA(proto_lpd, pd, offset, fd, tree);
+ 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 */
- if (END_OF_FRAME == 1) {
+ code = tvb_get_guint8(tvb, 0);
+ if (tvb_reported_length(tvb) == 1) {
lpr_packet_type = response;
}
- else if (pd[offset] <= 9) {
+ else if (code <= 9) {
lpr_packet_type = request;
}
else {
lpr_packet_type = unknown;
}
- if (check_col(fd, COL_PROTOCOL))
- col_set_str(fd, COL_PROTOCOL, "LPD");
- if (check_col(fd, COL_INFO)) {
+ if (check_col(pinfo->cinfo, COL_INFO)) {
if (lpr_packet_type == request) {
- col_add_str(fd, COL_INFO, lpd_client_code[pd[offset]]);
+ col_set_str(pinfo->cinfo, COL_INFO, lpd_client_code[code]);
}
else if (lpr_packet_type == response) {
- col_set_str(fd, COL_INFO, "LPD response");
+ col_set_str(pinfo->cinfo, COL_INFO, "LPD response");
}
else {
- col_set_str(fd, COL_INFO, "LPD continuation");
+ col_set_str(pinfo->cinfo, COL_INFO, "LPD continuation");
}
}
if (tree) {
- ti = proto_tree_add_item(tree, proto_lpd, NullTVB, offset,
- END_OF_FRAME, 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) {
- proto_tree_add_boolean_hidden(lpd_tree, hf_lpd_response, NullTVB, 0, 0, TRUE);
+ proto_tree_add_boolean_hidden(lpd_tree, hf_lpd_response,
+ tvb, 0, 0, TRUE);
} else {
- proto_tree_add_boolean_hidden(lpd_tree, hf_lpd_request, NullTVB, 0, 0, TRUE);
+ proto_tree_add_boolean_hidden(lpd_tree, hf_lpd_request,
+ tvb, 0, 0, TRUE);
}
if (lpr_packet_type == request) {
- printer = find_printer_string(pd, offset+1, END_OF_FRAME);
-
- if (pd[offset] <= 9 && printer) {
- proto_tree_add_text(lpd_tree, NullTVB, offset, 1,
- lpd_client_code[pd[offset]]);
- proto_tree_add_text(lpd_tree, NullTVB, offset+1,
- strlen(printer), "Printer/options: %s", printer);
+ printer_len = find_printer_string(tvb, 1);
+
+ if (code <= 9 && printer_len != -1) {
+ proto_tree_add_text(lpd_tree, tvb, 0, 1,
+ lpd_client_code[code]);
+ proto_tree_add_text(lpd_tree, tvb, 1, printer_len,
+ "Printer/options: %s",
+ tvb_format_text(tvb, 1, printer_len));
}
else {
- old_dissect_data(pd, offset, fd, tree);
+ call_dissector(data_handle,tvb, pinfo, tree);
}
-
- if (printer)
- g_free(printer);
}
else if (lpr_packet_type == response) {
- int response = pd[offset];
-
- if (response <= 3) {
- proto_tree_add_text(lpd_tree, NullTVB, offset, 1, "Response: %s",
- lpd_server_code[response]);
+ if (code <= 3) {
+ proto_tree_add_text(lpd_tree, tvb, 0, 1,
+ "Response: %s", lpd_server_code[code]);
}
else {
- old_dissect_data(pd, offset, fd, tree);
+ call_dissector(data_handle,tvb, pinfo, tree);
}
}
else {
- old_dissect_data(pd, offset, fd, tree);
+ call_dissector(data_handle,tvb, pinfo, tree);
}
}
}
-static char*
-find_printer_string(const u_char *pd, int offset, int frame_length)
+static gint
+find_printer_string(tvbuff_t *tvb, int offset)
{
- int i, final_offset;
- char c;
- char *string;
- int bytes;
-
- final_offset = offset + frame_length;
-
- /* try to find end of string, either 0x0a or 0x00 */
- for (i = offset; i < final_offset; i++) {
- c = pd[i];
- if (c == '\x00' || c == '\x0a') {
- bytes = i - offset;
- string = g_malloc(bytes+1);
- memcpy(string, &pd[offset], bytes);
- string[bytes] = 0;
- return string;
- }
- }
-
- return NULL;
+ int i;
+
+ /* try to find end of string, either '\n' or '\0' */
+ i = tvb_find_guint8(tvb, offset, -1, '\0');
+ if (i == -1)
+ i = tvb_find_guint8(tvb, offset, -1, '\n');
+ if (i == -1)
+ return -1;
+ return i - offset; /* length of string */
}
{
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,
};
- proto_lpd = proto_register_protocol("Line Printer Daemon Protocol", "lpd");
+ proto_lpd = proto_register_protocol("Line Printer Daemon Protocol", "LPD", "lpd");
proto_register_field_array(proto_lpd, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
void
proto_reg_handoff_lpd(void)
{
- old_dissector_add("tcp.port", TCP_PORT_PRINTER, &dissect_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");
}
git.samba.org / obnox / wireshark / wip.git / blobdiff