diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 1999-11-21 16:32:23 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 1999-11-21 16:32:23 +0000 |
| commit | 6e11f6f0b51cfc28e3f15f4d9246e8a800f92331 (patch) | |
| tree | a1c4c5a4b44d1a8986a902260ac1a291e13b97c1 /packet-ipx.c | |
| parent | f7b3c5a4a9754a430d3e73d5f7d7776f219c25ab (diff) | |
| download | wireshark-6e11f6f0b51cfc28e3f15f4d9246e8a800f92331.tar.gz wireshark-6e11f6f0b51cfc28e3f15f4d9246e8a800f92331.tar.bz2 wireshark-6e11f6f0b51cfc28e3f15f4d9246e8a800f92331.zip | |
Enable IPX network name resolution by providing for an /etc/ipxnets
and a $HOME/.ethereal/ipxnets file. get_ipxnet_name() and other functions,
similar to get_ether_name() and friends, have been added.
svn path=/trunk/; revision=1085
Diffstat (limited to 'packet-ipx.c')
| -rw-r--r-- | packet-ipx.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/packet-ipx.c b/packet-ipx.c index 0f9af48a20..70065cc734 100644 --- a/packet-ipx.c +++ b/packet-ipx.c @@ -2,7 +2,7 @@ * Routines for NetWare's IPX * Gilbert Ramirez <gram@verdict.uthscsa.edu> * - * $Id: packet-ipx.c,v 1.34 1999/11/20 05:35:13 gram Exp $ + * $Id: packet-ipx.c,v 1.35 1999/11/21 16:32:14 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@unicom.net> @@ -268,10 +268,10 @@ ipx_addr_to_str(guint32 net, const guint8 *ad) name = get_ether_name_if_known(ad); if (name) { - sprintf(cur, "%X.%s", net, name); + sprintf(cur, "%s.%s", get_ipxnet_name(net), name); } else { - sprintf(cur, "%X.%s", net, ether_to_str_punct(ad, '\0')); + sprintf(cur, "%s.%s", get_ipxnet_name(net), ether_to_str_punct(ad, '\0')); } return cur; } @@ -286,7 +286,6 @@ dissect_ipx(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { int len; guint8 *ipx_snode, *ipx_dnode, *ipx_snet, *ipx_dnet; - gchar *str_dnet, *str_snet; guint16 ipx_dsocket, ipx_ssocket; dissect_func_t *dissect; guint32 ipx_dnet_val, ipx_snet_val; @@ -294,8 +293,6 @@ dissect_ipx(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { /* Calculate here for use in pinfo and in tree */ ipx_dnet = (guint8*)&pd[offset+6]; ipx_snet = (guint8*)&pd[offset+18]; - str_dnet = ipxnet_to_string(ipx_dnet); - str_snet = ipxnet_to_string(ipx_snet); ipx_dnet_val = pntohl(ipx_dnet); ipx_snet_val = pntohl(ipx_snet); ipx_dsocket = pntohs(&pd[offset+16]); |