forked from osmocom/wireshark
Update ipx and conversation list to make it possible to select and filter for ipx conversations from the conversation list popup menu
svn path=/trunk/; revision=8599
This commit is contained in:
parent
5fcc46726c
commit
beb5e5e4e6
|
@ -4,7 +4,7 @@
|
|||
* endpoint_talkers_table 2003 Ronnie Sahlberg
|
||||
* Helper routines common to all endpoint talkers tap.
|
||||
*
|
||||
* $Id: endpoint_talkers_table.c,v 1.19 2003/09/15 22:16:08 guy Exp $
|
||||
* $Id: endpoint_talkers_table.c,v 1.20 2003/10/03 09:09:35 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
@ -110,7 +110,7 @@ ett_get_filter_name(address *addr, int specific_addr_type, int port_type, int na
|
|||
case AT_IPv6:
|
||||
return "ipv6.src";
|
||||
case AT_IPX:
|
||||
return "ipx.src.node";
|
||||
return "ipx.src";
|
||||
case AT_FC:
|
||||
return "fc.s_id";
|
||||
default:
|
||||
|
@ -132,7 +132,7 @@ ett_get_filter_name(address *addr, int specific_addr_type, int port_type, int na
|
|||
case AT_IPv6:
|
||||
return "ipv6.dst";
|
||||
case AT_IPX:
|
||||
return "ipx.dst.node";
|
||||
return "ipx.dst";
|
||||
case AT_FC:
|
||||
return "fc.d_id";
|
||||
default:
|
||||
|
@ -154,7 +154,7 @@ ett_get_filter_name(address *addr, int specific_addr_type, int port_type, int na
|
|||
case AT_IPv6:
|
||||
return "ipv6.addr";
|
||||
case AT_IPX:
|
||||
return "ipx.node";
|
||||
return "ipx.addr";
|
||||
case AT_FC:
|
||||
return "fc.id";
|
||||
default:
|
||||
|
|
25
packet-ipx.c
25
packet-ipx.c
|
@ -6,7 +6,7 @@
|
|||
* Portions Copyright (c) 2000-2002 by Gilbert Ramirez.
|
||||
* Portions Copyright (c) Novell, Inc. 2002-2003
|
||||
*
|
||||
* $Id: packet-ipx.c,v 1.136 2003/08/24 05:37:57 sahlberg Exp $
|
||||
* $Id: packet-ipx.c,v 1.137 2003/10/03 09:09:34 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
@ -63,6 +63,9 @@ static int ipx_tap = -1;
|
|||
static int proto_ipx = -1;
|
||||
static int hf_ipx_checksum = -1;
|
||||
static int hf_ipx_len = -1;
|
||||
static int hf_ipx_src = -1;
|
||||
static int hf_ipx_dst = -1;
|
||||
static int hf_ipx_addr = -1;
|
||||
static int hf_ipx_hops = -1;
|
||||
static int hf_ipx_packet_type = -1;
|
||||
static int hf_ipx_dnet = -1;
|
||||
|
@ -235,7 +238,7 @@ dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
const guint8 *src_net_node, *dst_net_node;
|
||||
|
||||
guint8 ipx_hops;
|
||||
|
||||
char *str;
|
||||
guint16 first_socket, second_socket;
|
||||
guint32 ipx_snet, ipx_dnet;
|
||||
const guint8 *ipx_snode, *ipx_dnode;
|
||||
|
@ -288,6 +291,13 @@ dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
ipx_tree = proto_item_add_subtree(ti, ett_ipx);
|
||||
}
|
||||
|
||||
str=address_to_str(&pinfo->net_src);
|
||||
proto_tree_add_string_hidden(ipx_tree, hf_ipx_src, tvb, 0, 0, str);
|
||||
proto_tree_add_string_hidden(ipx_tree, hf_ipx_addr, tvb, 0, 0, str);
|
||||
str=address_to_str(&pinfo->net_dst);
|
||||
proto_tree_add_string_hidden(ipx_tree, hf_ipx_dst, tvb, 0, 0, str);
|
||||
proto_tree_add_string_hidden(ipx_tree, hf_ipx_addr, tvb, 0, 0, str);
|
||||
|
||||
proto_tree_add_item(ipx_tree, hf_ipx_checksum, tvb, 0, 2, FALSE);
|
||||
proto_tree_add_uint_format(ipx_tree, hf_ipx_len, tvb, 2, 2, ipxh->ipx_length,
|
||||
"Length: %d bytes", ipxh->ipx_length);
|
||||
|
@ -1277,6 +1287,17 @@ proto_register_ipx(void)
|
|||
{ "Checksum", "ipx.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
|
||||
"", HFILL }},
|
||||
|
||||
{ &hf_ipx_src,
|
||||
{ "Source Address", "ipx.src", FT_STRING, BASE_DEC, NULL, 0x0,
|
||||
"Source IPX Address \"network.node\"", HFILL }},
|
||||
|
||||
{ &hf_ipx_dst,
|
||||
{ "Destination Address", "ipx.dst", FT_STRING, BASE_DEC, NULL, 0x0,
|
||||
"Destination IPX Address \"network.node\"", HFILL }},
|
||||
{ &hf_ipx_addr,
|
||||
{ "Src/Dst Address", "ipx.addr", FT_STRING, BASE_DEC, NULL, 0x0,
|
||||
"Source or Destination IPX Address \"network.node\"", HFILL }},
|
||||
|
||||
{ &hf_ipx_len,
|
||||
{ "Length", "ipx.len", FT_UINT16, BASE_DEC, NULL, 0x0,
|
||||
"", HFILL }},
|
||||
|
|
Loading…
Reference in New Issue