diff options
| -rw-r--r-- | gtk/dcerpc_stat.c | 4 | ||||
| -rw-r--r-- | packet-dcerpc.c | 16 | ||||
| -rw-r--r-- | packet-dcerpc.h | 4 | ||||
| -rw-r--r-- | tap-dcerpcstat.c | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c index b05c8a6c6c..54b887fd82 100644 --- a/gtk/dcerpc_stat.c +++ b/gtk/dcerpc_stat.c @@ -1,7 +1,7 @@ /* dcerpc_stat.c * dcerpc_stat 2002 Ronnie Sahlberg * - * $Id: dcerpc_stat.c,v 1.54 2004/04/12 08:53:01 ulfl Exp $ + * $Id: dcerpc_stat.c,v 1.55 2004/05/07 11:25:15 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -133,7 +133,7 @@ dcerpcstat_packet(void *rs_arg, packet_info *pinfo, epan_dissect_t *edt _U_, voi } /* we are only interested in reply packets */ - if(ri->request){ + if(ri->ptype != PDU_RESP){ return 0; } diff --git a/packet-dcerpc.c b/packet-dcerpc.c index 70ec91ec1e..7eaa61af51 100644 --- a/packet-dcerpc.c +++ b/packet-dcerpc.c @@ -3,7 +3,7 @@ * Copyright 2001, Todd Sabin <tas@webspan.net> * Copyright 2003, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc.c,v 1.168 2004/05/07 11:07:53 ulfl Exp $ + * $Id: packet-dcerpc.c,v 1.169 2004/05/07 11:24:02 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1475,7 +1475,7 @@ add_pointer_to_list(packet_info *pinfo, proto_tree *tree, proto_item *item, di=pinfo->private_data; value=di->call_data; - if(di->request){ + if(di->ptype == PDU_REQ){ if(!(pinfo->fd->flags.visited)){ if(id>value->max_ptr){ value->max_ptr=id; @@ -1854,7 +1854,7 @@ dcerpc_try_handoff (packet_info *pinfo, proto_tree *tree, if (check_col (pinfo->cinfo, COL_INFO)) { col_add_fstr (pinfo->cinfo, COL_INFO, "%s %s", - name, info->request ? "request" : "response"); + name, (info->ptype == PDU_REQ) ? "request" : "response"); } if (tree) { @@ -2878,7 +2878,7 @@ dissect_dcerpc_cn_rqst (tvbuff_t *tvb, gint offset, packet_info *pinfo, di->conv = conv; di->call_id = hdr->call_id; di->smb_fid = get_smb_fid(pinfo->private_data); - di->request = TRUE; + di->ptype = PDU_REQ; di->call_data = value; di->hf_index = -1; @@ -2973,7 +2973,7 @@ dissect_dcerpc_cn_resp (tvbuff_t *tvb, gint offset, packet_info *pinfo, di->conv = conv; di->call_id = hdr->call_id; di->smb_fid = get_smb_fid(pinfo->private_data); - di->request = FALSE; + di->ptype = PDU_RESP; di->call_data = value; proto_tree_add_uint (dcerpc_tree, hf_dcerpc_opnum, tvb, 0, 0, value->opnum); @@ -3086,7 +3086,7 @@ dissect_dcerpc_cn_fault (tvbuff_t *tvb, gint offset, packet_info *pinfo, di->conv = conv; di->call_id = hdr->call_id; di->smb_fid = get_smb_fid(pinfo->private_data); - di->request = FALSE; + di->ptype = PDU_FAULT; di->call_data = value; proto_tree_add_uint (dcerpc_tree, hf_dcerpc_opnum, tvb, 0, 0, value->opnum); @@ -3878,7 +3878,7 @@ dissect_dcerpc_dg_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, di->conv = conv; di->call_id = hdr->seqnum; di->smb_fid = -1; - di->request = TRUE; + di->ptype = PDU_REQ; di->call_data = value; if(value->rep_frame!=0){ @@ -3935,7 +3935,7 @@ dissect_dcerpc_dg_resp (tvbuff_t *tvb, int offset, packet_info *pinfo, di->conv = conv; di->call_id = 0; di->smb_fid = -1; - di->request = FALSE; + di->ptype = PDU_RESP; di->call_data = value; if(value->req_frame!=0){ diff --git a/packet-dcerpc.h b/packet-dcerpc.h index 2f9e2ab09b..702b59e03b 100644 --- a/packet-dcerpc.h +++ b/packet-dcerpc.h @@ -2,7 +2,7 @@ * Copyright 2001, Todd Sabin <tas@webspan.net> * Copyright 2003, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc.h,v 1.40 2004/03/05 23:09:32 sahlberg Exp $ + * $Id: packet-dcerpc.h,v 1.41 2004/05/07 11:24:02 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -256,7 +256,7 @@ typedef struct _dcerpc_info { conversation_t *conv; /* Which TCP stream we are in */ guint32 call_id; /* Context id for this call */ guint16 smb_fid; /* FID for DCERPC over SMB */ - gboolean request; + guint8 ptype; /* packet type: PDU_REQ, PDU_RESP, ... */ gboolean conformant_run; gint32 conformant_eaten; /* how many bytes did the conformant run eat?*/ guint32 array_max_count; /* max_count for conformant arrays */ diff --git a/tap-dcerpcstat.c b/tap-dcerpcstat.c index d1b1c47ec9..bd14a7b718 100644 --- a/tap-dcerpcstat.c +++ b/tap-dcerpcstat.c @@ -1,7 +1,7 @@ /* tap-dcerpcstat.c * dcerpcstat 2002 Ronnie Sahlberg * - * $Id: tap-dcerpcstat.c,v 1.9 2004/01/19 23:43:29 guy Exp $ + * $Id: tap-dcerpcstat.c,v 1.10 2004/05/07 11:25:15 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -80,7 +80,7 @@ dcerpcstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt _U_, void * } /* we are only interested in reply packets */ - if(ri->request){ + if(ri->ptype != PDU_RESP){ return 0; } |