diff options
| author | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-05-15 00:41:27 +0000 |
|---|---|---|
| committer | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-05-15 00:41:27 +0000 |
| commit | 308176490ef0944cf87085cb1d0aa075de82f818 (patch) | |
| tree | 55ba203720e5e29f5b9d69c65c0d3459a39de225 | |
| parent | cbf818e46c109471a3978ec7ed910341a4989165 (diff) | |
remove FI_LINK again,
as this info can be derived from the presence of the FT_FRAMENUM field
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10900 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | gtk/proto_draw.c | 7 | ||||
| -rw-r--r-- | packet-tcp.c | 4 | ||||
| -rw-r--r-- | reassemble.c | 4 |
3 files changed, 5 insertions, 10 deletions
diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c index 4204bdfa45..5aa9962138 100644 --- a/gtk/proto_draw.c +++ b/gtk/proto_draw.c @@ -1,7 +1,7 @@ /* proto_draw.c * Routines for GTK+ packet display * - * $Id: proto_draw.c,v 1.96 2004/05/14 18:02:38 ulfl Exp $ + * $Id: proto_draw.c,v 1.97 2004/05/15 00:40:06 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1626,7 +1626,7 @@ void tree_cell_renderer(GtkTreeViewColumn *tree_column, g_object_set (cell, "weight-set", TRUE, NULL);*/ } - if(FI_GET_FLAG(fi, FI_LINK)) { + if(fi->hfinfo->type == FT_FRAMENUM) { g_object_set (cell, "foreground", "blue", NULL); g_object_set (cell, "foreground-set", TRUE, NULL); @@ -1756,8 +1756,7 @@ main_proto_tree_draw(proto_tree *protocol_tree) void tree_view_follow_link(field_info *fi) { - if(FI_GET_FLAG(fi, FI_LINK)) { - g_assert(fi->hfinfo->type == FT_FRAMENUM); + if(fi->hfinfo->type == FT_FRAMENUM) { goto_frame(&cfile, fi->value.value.integer); } } diff --git a/packet-tcp.c b/packet-tcp.c index f67e645dba..6b9bfdaf08 100644 --- a/packet-tcp.c +++ b/packet-tcp.c @@ -1,7 +1,7 @@ /* packet-tcp.c * Routines for TCP packet disassembly * - * $Id: packet-tcp.c,v 1.234 2004/05/14 17:34:51 ulfl Exp $ + * $Id: packet-tcp.c,v 1.235 2004/05/15 00:41:26 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1159,7 +1159,6 @@ tcp_print_sequence_number_analysis(packet_info *pinfo, tvbuff_t *tvb, proto_tree item = proto_tree_add_uint(tree, hf_tcp_analysis_acks_frame, tvb, 0, 0, ta->frame_acked); PROTO_ITEM_SET_GENERATED(item); - PROTO_ITEM_SET_LINK(item); } if( ta->ts.secs || ta->ts.nsecs ){ item = proto_tree_add_time(tree, hf_tcp_analysis_ack_rtt, @@ -1880,7 +1879,6 @@ desegment_tcp(tvbuff_t *tvb, packet_info *pinfo, int offset, item=proto_tree_add_uint(tcp_tree, hf_tcp_reassembled_in, tvb, 0, 0, ipfd_head->reassembled_in); PROTO_ITEM_SET_GENERATED(item); - PROTO_ITEM_SET_LINK(item); } /* diff --git a/reassemble.c b/reassemble.c index dfa8aa6c4e..78c99624da 100644 --- a/reassemble.c +++ b/reassemble.c @@ -1,7 +1,7 @@ /* reassemble.c * Routines for {fragment,segment} reassembly * - * $Id: reassemble.c,v 1.47 2004/05/14 17:34:51 ulfl Exp $ + * $Id: reassemble.c,v 1.48 2004/05/15 00:41:27 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1569,7 +1569,6 @@ show_fragment(fragment_data *fd, int offset, const fragment_items *fit, offset+fd->len-1, fd->len); PROTO_ITEM_SET_GENERATED(fei); - PROTO_ITEM_SET_LINK(fei); fet = proto_item_add_subtree(fei, *(fit->ett_fragment)); if (fd->flags&FD_OVERLAP) { fei=proto_tree_add_boolean(fet, @@ -1612,7 +1611,6 @@ show_fragment(fragment_data *fd, int offset, const fragment_items *fit, fd->len ); PROTO_ITEM_SET_GENERATED(fei); - PROTO_ITEM_SET_LINK(fei); } } |