diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-12-12 08:05:31 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-12-12 08:05:31 +0000 |
| commit | cf54ab47b716649e4e273aa5d42eb337cb6b95f9 (patch) | |
| tree | f6728d426c8eca2ce48875d774aec90d1322d022 /packet-dcerpc-spoolss.c | |
| parent | 7280374f3d8fc18c394d33a45aa8cd26fcabae10 (diff) | |
When dissecting a buffer, use the tvbuff for the buffer, as the offset
we're using is relative to the beginning of that tvbuff, not relative to
the beginning of the containing tvbuff; that also lets us use -1 when in
"proto_tree_add_text()" calls when we mean "to the end of the buffer.
Fix the comment for one field.
svn path=/trunk/; revision=6781
Diffstat (limited to 'packet-dcerpc-spoolss.c')
| -rw-r--r-- | packet-dcerpc-spoolss.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/packet-dcerpc-spoolss.c b/packet-dcerpc-spoolss.c index 1019fb0168..d8a088f0c4 100644 --- a/packet-dcerpc-spoolss.c +++ b/packet-dcerpc-spoolss.c @@ -2,7 +2,7 @@ * Routines for SMB \PIPE\spoolss packet disassembly * Copyright 2001-2002, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-spoolss.c,v 1.64 2002/12/04 05:41:47 tpot Exp $ + * $Id: packet-dcerpc-spoolss.c,v 1.65 2002/12/12 08:05:31 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -3469,8 +3469,8 @@ static int SpoolssGetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, case 3: case 7: item = proto_tree_add_text( - buffer.tree, buffer.tvb, 0, - tvb_length(buffer.tvb), "PRINTER_INFO_%d", level); + buffer.tree, buffer.tvb, 0, -1, + "PRINTER_INFO_%d", level); /* XXX: is the ett value correct here? */ @@ -3500,7 +3500,7 @@ static int SpoolssGetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, buffer.tvb, 0, pinfo, subtree, drep); break; default: - proto_tree_add_text(buffer.tree, buffer.tvb, 0, 0, + proto_tree_add_text(buffer.tree, buffer.tvb, 0, -1, "[Unknown info level %d]", level); break; } @@ -3814,7 +3814,7 @@ static int SpoolssEnumForms_r(tvbuff_t *tvb, int offset, packet_info *pinfo, int struct_start = buffer_offset; buffer_offset = dissect_FORM_REL( - tvb, buffer_offset, pinfo, buffer.tree, drep, + buffer.tvb, buffer_offset, pinfo, buffer.tree, drep, struct_start); } @@ -4614,15 +4614,15 @@ static int SpoolssGetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, int struct_start = buffer_offset; buffer_offset = dissect_FORM_REL( - tvb, buffer_offset, pinfo, tree, drep, struct_start); + buffer.tvb, buffer_offset, pinfo, tree, drep, + struct_start); break; } default: proto_tree_add_text( - buffer.tree, tvb, buffer_offset, - tvb_length(buffer.tvb), "[Unknown info level %d]", - level); + buffer.tree, buffer.tvb, buffer_offset, -1, + "[Unknown info level %d]", level); goto done; } @@ -4890,13 +4890,13 @@ static int SpoolssEnumJobs_r(tvbuff_t *tvb, int offset, packet_info *pinfo, switch(level) { case 1: buffer_offset = dissect_spoolss_JOB_INFO_1( - tvb, buffer_offset, pinfo, buffer.tree, drep); + buffer.tvb, buffer_offset, pinfo, + buffer.tree, drep); break; case 2: default: proto_tree_add_text( - buffer.tree, tvb, buffer_offset, - tvb_length(buffer.tvb), + buffer.tree, buffer.tvb, buffer_offset, -1, "[Unknown info level %d]", level); goto done; } @@ -5060,14 +5060,13 @@ static int SpoolssGetJob_r(tvbuff_t *tvb, int offset, packet_info *pinfo, switch(level) { case 1: buffer_offset = dissect_spoolss_JOB_INFO_1( - tvb, buffer_offset, pinfo, buffer.tree, drep); + buffer.tvb, buffer_offset, pinfo, buffer.tree, drep); break; case 2: default: proto_tree_add_text( - buffer.tree, tvb, buffer_offset, - tvb_length(buffer.tvb), "[Unknown info level %d]", - level); + buffer.tree, buffer.tvb, buffer_offset, -1, + "[Unknown info level %d]", level); goto done; } @@ -5726,16 +5725,17 @@ static int SpoolssEnumPrinterDrivers_r(tvbuff_t *tvb, int offset, switch(level) { case 1: buffer_offset = dissect_DRIVER_INFO_1( - tvb, buffer_offset, pinfo, buffer.tree, drep); + buffer.tvb, buffer_offset, pinfo, + buffer.tree, drep); break; case 3: buffer_offset = dissect_DRIVER_INFO_3( - tvb, buffer_offset, pinfo, buffer.tree, drep); + buffer.tvb, buffer_offset, pinfo, + buffer.tree, drep); break; default: proto_tree_add_text( - buffer.tree, tvb, buffer_offset, - tvb_length(buffer.tvb), + buffer.tree, buffer.tvb, buffer_offset, -1, "[Unknown info level %d]", level); goto done; } @@ -5839,7 +5839,7 @@ static int SpoolssGetPrinterDriver2_r(tvbuff_t *tvb, int offset, break; default: proto_tree_add_text( - buffer.tree, buffer.tvb, 0, tvb_length(buffer.tvb), + buffer.tree, buffer.tvb, 0, -1, "[Unknown info level %d]", level); break; } @@ -7060,7 +7060,7 @@ proto_register_dcerpc_spoolss(void) NULL, 0x0, "Job total pages", HFILL }}, { &hf_spoolss_jobpagesprinted, { "Job pages printed", "spoolss.job.pagesprinted", FT_UINT32, BASE_DEC, - NULL, 0x0, "Job identification number", HFILL }}, + NULL, 0x0, "Job pages printed", HFILL }}, /* SYSTEM_TIME */ |