diff options
author | Jörg Mayer <jmayer@loplof.de> | 2002-08-02 23:36:07 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2002-08-02 23:36:07 +0000 |
commit | 173fe5aef4167b9ad35fe514d05ef25fb66c076f (patch) | |
tree | 21967e4c27ac5e02aa39319022dd2858682fc5f4 /packet-ripng.c | |
parent | ff72b97ee01caee4dff97d07195d802086c65f38 (diff) | |
download | wireshark-173fe5aef4167b9ad35fe514d05ef25fb66c076f.tar.gz |
Replace the types from sys/types.h and netinet/in.h by their glib.h
equivalents for the toplevel directory. The removal of winsock2.h will
hopefully not cause any problems under MSVC++, as those files using
struct timeval still include wtap.h, which still includes winsock2.h.
svn path=/trunk/; revision=5932
Diffstat (limited to 'packet-ripng.c')
-rw-r--r-- | packet-ripng.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/packet-ripng.c b/packet-ripng.c index 0e136e1ba0..51af46f4cc 100644 --- a/packet-ripng.c +++ b/packet-ripng.c @@ -3,7 +3,7 @@ * (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org> * derived from packet-rip.c * - * $Id: packet-ripng.c,v 1.25 2002/01/24 09:20:51 guy Exp $ + * $Id: packet-ripng.c,v 1.26 2002/08/02 23:35:57 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -26,14 +26,6 @@ #include "config.h" -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif - -#ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif - #include <string.h> #include <glib.h> #include <epan/packet.h> @@ -99,7 +91,7 @@ dissect_ripng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { ip6_to_str(&ni6.rip6_dest), ni6.rip6_plen, ni6.rip6_metric, - ntohs(ni6.rip6_tag)); + g_ntohs(ni6.rip6_tag)); } else { ti = proto_tree_add_text(ripng_tree, tvb, offset, sizeof(ni6), "IP Address: %s/%u, Metric: %u", @@ -115,7 +107,7 @@ dissect_ripng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_text(subtree, tvb, offset + offsetof(struct netinfo6, rip6_tag), sizeof(ni6.rip6_tag), "Tag: 0x%04x", - ntohs(ni6.rip6_tag)); + g_ntohs(ni6.rip6_tag)); proto_tree_add_text(subtree, tvb, offset + offsetof(struct netinfo6, rip6_plen), sizeof(ni6.rip6_plen), "Prefix length: %u", |