From ab96c5694efe518f81314b8fa5b48fe8f5bac8aa Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 22 Apr 2002 09:43:03 +0000 Subject: Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223 --- packet-dcerpc-nt.c | 18 ++--- packet-dcerpc-nt.h | 8 +-- packet-dcerpc-spoolss.c | 178 ++++++++++++++++++++++++------------------------ packet-dcerpc.c | 20 +++--- packet-dcerpc.h | 6 +- 5 files changed, 115 insertions(+), 115 deletions(-) diff --git a/packet-dcerpc-nt.c b/packet-dcerpc-nt.c index 66d99b55ba..3e465cd5ec 100644 --- a/packet-dcerpc-nt.c +++ b/packet-dcerpc-nt.c @@ -2,7 +2,7 @@ * Routines for DCERPC over SMB packet disassembly * Copyright 2001, Tim Potter * - * $Id: packet-dcerpc-nt.c,v 1.27 2002/04/18 00:29:17 guy Exp $ + * $Id: packet-dcerpc-nt.c,v 1.28 2002/04/22 09:43:02 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -664,8 +664,8 @@ typedef struct { } pol_hash_key; typedef struct { - int open_frame, close_frame; /* Frame numbers for open/close */ - char *name; /* Name of policy handle */ + guint32 open_frame, close_frame; /* Frame numbers for open/close */ + char *name; /* Name of policy handle */ } pol_hash_value; #define POL_HASH_INIT_COUNT 100 @@ -709,8 +709,8 @@ static gint pol_hash_compare(gconstpointer k1, gconstpointer k2) /* Store a policy handle */ -void dcerpc_smb_store_pol(const guint8 *policy_hnd, char *name, int open_frame, - int close_frame) +void dcerpc_smb_store_pol(const guint8 *policy_hnd, char *name, + guint32 open_frame, guint32 close_frame) { pol_hash_key *key; pol_hash_value *value; @@ -774,7 +774,7 @@ void dcerpc_smb_store_pol(const guint8 *policy_hnd, char *name, int open_frame, /* Retrieve a policy handle */ gboolean dcerpc_smb_fetch_pol(const guint8 *policy_hnd, char **name, - int *open_frame, int *close_frame) + guint32 *open_frame, guint32 *close_frame) { pol_hash_key key; pol_hash_value *value; @@ -944,7 +944,7 @@ dissect_nt_policy_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_item *item; proto_tree *subtree; e_ctx_hnd hnd; - int open_frame = 0, close_frame = 0; + guint32 open_frame = 0, close_frame = 0; char *name; /* Add to proto tree */ @@ -963,11 +963,11 @@ dissect_nt_policy_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo, if (open_frame) proto_tree_add_text(subtree, tvb, offset, 0, - "Opened in frame %d", open_frame); + "Opened in frame %u", open_frame); if (close_frame) proto_tree_add_text(subtree, tvb, offset, 0, - "Closed in frame %d", close_frame); + "Closed in frame %u", close_frame); } /* Store request/reply information */ diff --git a/packet-dcerpc-nt.h b/packet-dcerpc-nt.h index 4a7dfb08e4..80a1a3ec32 100644 --- a/packet-dcerpc-nt.h +++ b/packet-dcerpc-nt.h @@ -2,7 +2,7 @@ * Routines for DCERPC over SMB packet disassembly * Copyright 2001, Tim Potter * - * $Id: packet-dcerpc-nt.h,v 1.21 2002/04/18 00:29:17 guy Exp $ + * $Id: packet-dcerpc-nt.h,v 1.22 2002/04/22 09:43:03 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -137,10 +137,10 @@ dissect_ndr_nt_SID_AND_ATTRIBUTES(tvbuff_t *tvb, int offset, gboolean dcerpc_smb_fetch_pol(const guint8 *policy_hnd, char **name, - int *open_frame, int *close_frame); + guint32 *open_frame, guint32 *close_frame); void -dcerpc_smb_store_pol(const guint8 *policy_hnd, char *name, int open_frame, - int close_frame); +dcerpc_smb_store_pol(const guint8 *policy_hnd, char *name, + guint32 open_frame, guint32 close_frame); /* Check for unparsed data at the end of a frame */ diff --git a/packet-dcerpc-spoolss.c b/packet-dcerpc-spoolss.c index 41ad590bb7..fac0ba7932 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 * - * $Id: packet-dcerpc-spoolss.c,v 1.18 2002/04/22 01:07:19 guy Exp $ + * $Id: packet-dcerpc-spoolss.c,v 1.19 2002/04/22 09:43:03 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -223,11 +223,11 @@ static void display_pol(proto_tree *tree, tvbuff_t *tvb, int offset, if (pol_open_frame) proto_tree_add_text(subtree, tvb, offset, 0, - "Opened in frame %d", pol_open_frame); + "Opened in frame %u", pol_open_frame); if (pol_close_frame) proto_tree_add_text(subtree, tvb, offset, 0, - "Closed in frame %d", pol_close_frame); + "Closed in frame %u", pol_close_frame); proto_tree_add_text(subtree, tvb, offset, 20, "Policy Handle: %s", tvb_bytes_to_str(tvb, offset, 20)); @@ -250,9 +250,9 @@ static int SpoolssClosePrinter_q(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "ClosePrinter request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd); @@ -279,9 +279,9 @@ static int SpoolssClosePrinter_r(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "ClosePrinter response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -366,9 +366,9 @@ static int SpoolssGetPrinterData_q(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "GetPrinterData request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ @@ -406,9 +406,9 @@ static int SpoolssGetPrinterData_r(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "GetPrinterData response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -448,9 +448,9 @@ static int SpoolssGetPrinterDataEx_q(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "GetPrinterDataEx request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ @@ -507,9 +507,9 @@ static int SpoolssGetPrinterDataEx_r(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "GetPrinterDataEx response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -550,9 +550,9 @@ static int SpoolssSetPrinterData_q(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "SetPrinterData request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ @@ -599,9 +599,9 @@ static int SpoolssSetPrinterData_r(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "SetPrinterData response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -632,9 +632,9 @@ static int SpoolssSetPrinterDataEx_q(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "SetPrinterDataEx request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ @@ -687,9 +687,9 @@ static int SpoolssSetPrinterDataEx_r(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "SetPrinterDataEx response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -1200,9 +1200,9 @@ static int SpoolssOpenPrinterEx_q(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "OpenPrinterEx request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ @@ -1253,9 +1253,9 @@ static int SpoolssOpenPrinterEx_r(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "OpenPrinterEx response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -1430,9 +1430,9 @@ static int SpoolssRFFPCNEX_q(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "RFFPCNEX request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ @@ -1485,9 +1485,9 @@ static int SpoolssRFFPCNEX_r(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "RFFPCNEX response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -1515,9 +1515,9 @@ static int SpoolssReplyOpenPrinter_q(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "ReplyOpenPrinter request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ @@ -1554,9 +1554,9 @@ static int SpoolssReplyOpenPrinter_r(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "ReplyOpenPrinter response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -1668,9 +1668,9 @@ static int SpoolssGetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "GetPrinter request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ @@ -1710,9 +1710,9 @@ static int SpoolssGetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "GetPrinter response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, ", level %d", level); @@ -1813,9 +1813,9 @@ static int SpoolssSetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "SetPrinter request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ @@ -1856,9 +1856,9 @@ static int SpoolssSetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "SetPrinter response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -1940,9 +1940,9 @@ static int SpoolssEnumForms_q(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "EnumForms request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ @@ -1982,9 +1982,9 @@ static int SpoolssEnumForms_r(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "EnumForms response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -2051,9 +2051,9 @@ static int SpoolssDeletePrinter_q(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "DeletePrinter request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ @@ -2079,9 +2079,9 @@ static int SpoolssDeletePrinter_r(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "DeletePrinter response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -2113,9 +2113,9 @@ static int SpoolssAddPrinterEx_q(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "AddPrinterEx request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ @@ -2163,9 +2163,9 @@ static int SpoolssAddPrinterEx_r(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "AddPrinterEx response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -2216,9 +2216,9 @@ static int SpoolssEnumPrinterData_q(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "EnumPrinterData request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ @@ -2252,9 +2252,9 @@ static int SpoolssEnumPrinterData_r(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "EnumPrinterData response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -2311,9 +2311,9 @@ static int SpoolssEnumPrinters_q(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "EnumPrinters request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ @@ -2351,9 +2351,9 @@ static int SpoolssEnumPrinters_r(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "EnumPrinters response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -2387,9 +2387,9 @@ static int SpoolssAddPrinterDriver_q(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "AddPrinterDriver request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ @@ -2410,9 +2410,9 @@ static int SpoolssAddPrinterDriver_r(tvbuff_t *tvb, int offset, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "AddPrinterDriver response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -2521,9 +2521,9 @@ static int SpoolssAddForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "AddForm request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ @@ -2559,9 +2559,9 @@ static int SpoolssAddForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "AddForm response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -2589,9 +2589,9 @@ static int SpoolssDeleteForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "DeleteForm request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ @@ -2624,9 +2624,9 @@ static int SpoolssDeleteForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "DeleteForm response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -2655,9 +2655,9 @@ static int SpoolssSetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "SetForm request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ @@ -2699,9 +2699,9 @@ static int SpoolssSetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "SetForm response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -2730,9 +2730,9 @@ static int SpoolssGetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "GetForm request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ @@ -2779,9 +2779,9 @@ static int SpoolssGetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "GetForm response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); /* Parse packet */ @@ -2840,9 +2840,9 @@ static int SpoolssGeneric_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_text(tree, tvb, offset, 0, "[Unimplemented dissector: SPOOLSS]"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); prs_werror(tvb, len - 4, pinfo, tree, NULL); @@ -2870,9 +2870,9 @@ static int SpoolssFoo_q(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Foo request"); - if (dcv->rep_frame != -1) + if (dcv->rep_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Response in frame %d", dcv->rep_frame); + "Response in frame %u", dcv->rep_frame); /* Parse packet */ @@ -2892,9 +2892,9 @@ static int SpoolssFoo_r(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Foo response"); - if (dcv->req_frame != -1) + if (dcv->req_frame != 0) proto_tree_add_text(tree, tvb, offset, 0, - "Request in frame %d", dcv->req_frame); + "Request in frame %u", dcv->req_frame); /* Parse packet */ diff --git a/packet-dcerpc.c b/packet-dcerpc.c index b398cc688e..72139b50f6 100644 --- a/packet-dcerpc.c +++ b/packet-dcerpc.c @@ -2,7 +2,7 @@ * Routines for DCERPC packet disassembly * Copyright 2001, Todd Sabin * - * $Id: packet-dcerpc.c,v 1.43 2002/03/22 09:44:58 guy Exp $ + * $Id: packet-dcerpc.c,v 1.44 2002/04/22 09:43:03 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -659,7 +659,7 @@ add_pointer_to_list(packet_info *pinfo, proto_tree *tree, /* if we havent seen the request bail out since we cant know whether this is the first non-NULL instance or not */ - if(value->req_frame==-1){ + if(value->req_frame==0){ /* XXX THROW EXCEPTION */ } @@ -1431,7 +1431,7 @@ dissect_dcerpc_cn_rqst (tvbuff_t *tvb, packet_info *pinfo, proto_tree *dcerpc_tr call_value->ver = bind_value->ver; call_value->opnum = opnum; call_value->req_frame=pinfo->fd->num; - call_value->rep_frame=-1; + call_value->rep_frame=0; call_value->max_ptr=0; call_value->private_data = NULL; g_hash_table_insert (dcerpc_calls, call_key, call_value); @@ -1459,7 +1459,7 @@ dissect_dcerpc_cn_rqst (tvbuff_t *tvb, packet_info *pinfo, proto_tree *dcerpc_tr di.request = TRUE; di.call_data = value; - if(value->rep_frame!=-1){ + if(value->rep_frame!=0){ proto_tree_add_uint(dcerpc_tree, hf_dcerpc_response_in, tvb, 0, 0, value->rep_frame); } @@ -1527,7 +1527,7 @@ dissect_dcerpc_cn_resp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *dcerpc_tr if((call_value=g_hash_table_lookup(dcerpc_calls, &call_key))){ g_hash_table_insert (dcerpc_matched, (void *)pinfo->fd->num, call_value); - if(call_value->rep_frame==-1){ + if(call_value->rep_frame==0){ call_value->rep_frame=pinfo->fd->num; } @@ -1555,7 +1555,7 @@ dissect_dcerpc_cn_resp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *dcerpc_tr di.call_data = value; proto_tree_add_uint (dcerpc_tree, hf_dcerpc_opnum, tvb, 0, 0, value->opnum); - if(value->req_frame!=-1){ + if(value->req_frame!=0){ proto_tree_add_uint(dcerpc_tree, hf_dcerpc_request_in, tvb, 0, 0, value->req_frame); } @@ -2052,7 +2052,7 @@ dissect_dcerpc_dg (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_value->ver = hdr.if_ver; call_value->opnum = hdr.opnum; call_value->req_frame=pinfo->fd->num; - call_value->rep_frame=-1; + call_value->rep_frame=0; call_value->max_ptr=0; call_value->private_data = NULL; g_hash_table_insert (dcerpc_calls, call_key, call_value); @@ -2066,7 +2066,7 @@ dissect_dcerpc_dg (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) v.ver = hdr.if_ver; v.opnum = hdr.opnum; v.req_frame = pinfo->fd->num; - v.rep_frame = -1; + v.rep_frame = 0; v.max_ptr = 0; v.private_data=NULL; value = &v; @@ -2105,7 +2105,7 @@ dissect_dcerpc_dg (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if((call_value=g_hash_table_lookup(dcerpc_calls, &call_key))){ g_hash_table_insert (dcerpc_matched, (void *)pinfo->fd->num, call_value); - if(call_value->rep_frame==-1){ + if(call_value->rep_frame==0){ call_value->rep_frame=pinfo->fd->num; } } @@ -2116,7 +2116,7 @@ dissect_dcerpc_dg (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) v.uuid = hdr.if_id; v.ver = hdr.if_ver; v.opnum = hdr.opnum; - v.req_frame=-1; + v.req_frame=0; v.rep_frame=pinfo->fd->num; v.private_data=NULL; value = &v; diff --git a/packet-dcerpc.h b/packet-dcerpc.h index 9c9211792d..2b4b0c7689 100644 --- a/packet-dcerpc.h +++ b/packet-dcerpc.h @@ -1,7 +1,7 @@ /* packet-dcerpc.h * Copyright 2001, Todd Sabin * - * $Id: packet-dcerpc.h,v 1.12 2002/02/12 07:35:21 guy Exp $ + * $Id: packet-dcerpc.h,v 1.13 2002/04/22 09:43:03 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -187,8 +187,8 @@ typedef struct _dcerpc_call_value { e_uuid_t uuid; guint16 ver; guint16 opnum; - gint32 req_frame; - gint32 rep_frame; + guint32 req_frame; + guint32 rep_frame; guint32 max_ptr; void *private_data; } dcerpc_call_value; -- cgit v1.2.3