diff options
| -rw-r--r-- | epan/proto.h | 11 | ||||
| -rw-r--r-- | packet-dcerpc.c | 7 |
2 files changed, 2 insertions, 16 deletions
diff --git a/epan/proto.h b/epan/proto.h index b02464dcc7..2cacd6139c 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -1,7 +1,7 @@ /* proto.h * Definitions for protocol display * - * $Id: proto.h,v 1.67 2004/05/14 15:55:37 ulfl Exp $ + * $Id: proto.h,v 1.68 2004/05/15 00:52:02 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -163,9 +163,6 @@ typedef struct field_info { /** The protocol field should be displayed as "generated by Ethereal", * used in field_info.flags. */ #define FI_GENERATED 0x0002 -/** The protocol field should be displayed as a link to another packet, - * used in field_info.flags. */ -#define FI_LINK 0x0004 /** convenience macro to get field_info.flags */ #define FI_GET_FLAG(fi, flag) (fi->flags & flag) @@ -209,12 +206,6 @@ typedef proto_node proto_item; /** mark this protocol field as generated by Ethereal (and not read from the packet data) */ #define PROTO_ITEM_SET_GENERATED(proto_item) \ ((proto_item) ? FI_SET_FLAG(proto_item->finfo, FI_GENERATED) : 0) -/** is this protocol field a link to another packet? */ -#define PROTO_ITEM_IS_LINK(proto_item) \ - ((proto_item) ? FI_GET_FLAG(proto_item->finfo, FI_LINK) : 0) -/** mark this protocol field as a link to another packet */ -#define PROTO_ITEM_SET_LINK(proto_item) \ - ((proto_item) ? FI_SET_FLAG(proto_item->finfo, FI_LINK) : 0) typedef void (*proto_tree_foreach_func)(proto_node *, gpointer); diff --git a/packet-dcerpc.c b/packet-dcerpc.c index 75d2d642a8..b4e9645a75 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.172 2004/05/14 17:29:21 ulfl Exp $ + * $Id: packet-dcerpc.c,v 1.173 2004/05/15 00:48:46 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -2887,7 +2887,6 @@ dissect_dcerpc_cn_rqst (tvbuff_t *tvb, gint offset, packet_info *pinfo, pi = proto_tree_add_uint(dcerpc_tree, hf_dcerpc_response_in, tvb, 0, 0, value->rep_frame); PROTO_ITEM_SET_GENERATED(pi); - PROTO_ITEM_SET_LINK(pi); } dissect_dcerpc_cn_stub (tvb, offset, pinfo, dcerpc_tree, tree, @@ -2984,7 +2983,6 @@ dissect_dcerpc_cn_resp (tvbuff_t *tvb, gint offset, packet_info *pinfo, pi = proto_tree_add_uint(dcerpc_tree, hf_dcerpc_request_in, tvb, 0, 0, value->req_frame); PROTO_ITEM_SET_GENERATED(pi); - PROTO_ITEM_SET_LINK(pi); ns.secs= pinfo->fd->abs_secs-value->req_time.secs; ns.nsecs=pinfo->fd->abs_usecs*1000-value->req_time.nsecs; if(ns.nsecs<0){ @@ -3098,7 +3096,6 @@ dissect_dcerpc_cn_fault (tvbuff_t *tvb, gint offset, packet_info *pinfo, pi = proto_tree_add_uint(dcerpc_tree, hf_dcerpc_request_in, tvb, 0, 0, value->req_frame); PROTO_ITEM_SET_GENERATED(pi); - PROTO_ITEM_SET_LINK(pi); ns.secs= pinfo->fd->abs_secs-value->req_time.secs; ns.nsecs=pinfo->fd->abs_usecs*1000-value->req_time.nsecs; if(ns.nsecs<0){ @@ -3890,7 +3887,6 @@ dissect_dcerpc_dg_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, pi = proto_tree_add_uint(dcerpc_tree, hf_dcerpc_response_in, tvb, 0, 0, value->rep_frame); PROTO_ITEM_SET_GENERATED(pi); - PROTO_ITEM_SET_LINK(pi); } dissect_dcerpc_dg_stub (tvb, offset, pinfo, dcerpc_tree, tree, hdr, di); } @@ -3949,7 +3945,6 @@ dissect_dcerpc_dg_resp (tvbuff_t *tvb, int offset, packet_info *pinfo, pi = proto_tree_add_uint(dcerpc_tree, hf_dcerpc_request_in, tvb, 0, 0, value->req_frame); PROTO_ITEM_SET_GENERATED(pi); - PROTO_ITEM_SET_LINK(pi); ns.secs= pinfo->fd->abs_secs-value->req_time.secs; ns.nsecs=pinfo->fd->abs_usecs*1000-value->req_time.nsecs; if(ns.nsecs<0){ |