osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Clear the Info column before you start dissecting, just in case you 

throw an exception.

Fix a comment to reflect that the "location", "info", and
"make-and-model" fields are optional (CUPS 1.0[.x] didn't put them into
its browse packets).

svn path=/trunk/; revision=3132
This commit is contained in:
Guy Harris 2001-03-15 07:03:13 +00:00
parent a9659200c1
commit 56d199c7ff
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packet-cups.c
View File

@ -5,7 +5,7 @@
* Charles Levert <charles@comm.polymtl.ca>
* Copyright 2001 Charles Levert
*
* $Id: packet-cups.c,v 1.3 2001/03/15 06:09:19 guy Exp $
* $Id: packet-cups.c,v 1.4 2001/03/15 07:03:13 guy Exp $
*
*
* This program is free software; you can redistribute it and/or
@ -166,6 +166,8 @@ dissect_cups(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (check_col(pinfo->fd, COL_PROTOCOL))
col_set_str(pinfo->fd, COL_PROTOCOL, PROTO_TAG_CUPS);
if (check_col(pinfo->fd, COL_INFO))
col_clear(pinfo->fd, COL_INFO);
if (tree) {
ti = proto_tree_add_item(tree, proto_cups, tvb, offset,
@ -174,7 +176,7 @@ dissect_cups(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
/* Format (1450 bytes max.): */
/* type state uri "location" "info" "make-and-model"\n */
/* type state uri ["location" ["info" ["make-and-model"]]]\n */
ptype = get_hex_uint(tvb, offset, &next_offset);
len = next_offset - offset;