From 173fe5aef4167b9ad35fe514d05ef25fb66c076f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Fri, 2 Aug 2002 23:36:07 +0000 Subject: 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 --- packet-igmp.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'packet-igmp.c') diff --git a/packet-igmp.c b/packet-igmp.c index 397cc16063..d289312241 100644 --- a/packet-igmp.c +++ b/packet-igmp.c @@ -1,7 +1,7 @@ /* packet-igmp.c 2001 Ronnie Sahlberg * Routines for IGMP packet disassembly * - * $Id: packet-igmp.c,v 1.19 2002/05/02 07:54:41 guy Exp $ + * $Id: packet-igmp.c,v 1.20 2002/08/02 23:35:51 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -92,10 +92,6 @@ # include "config.h" #endif -#ifdef HAVE_SYS_TYPES_H -# include -#endif - #include #include #include @@ -853,18 +849,18 @@ dissect_igmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) break; case IGMP_TYPE_0x23: - dst = htonl(MC_ALL_IGMPV3_ROUTERS); + dst = g_htonl(MC_ALL_IGMPV3_ROUTERS); if (!memcmp(pinfo->dst.data, &dst, 4)) { offset = dissect_msnip(tvb, pinfo, parent_tree, offset); } break; case IGMP_TYPE_0x24: - dst = htonl(MC_ALL_ROUTERS); + dst = g_htonl(MC_ALL_ROUTERS); if (!memcmp(pinfo->dst.data, &dst, 4)) { offset = dissect_mrdisc(tvb, pinfo, parent_tree, offset); } - dst = htonl(MC_ALL_IGMPV3_ROUTERS); + dst = g_htonl(MC_ALL_IGMPV3_ROUTERS); if (!memcmp(pinfo->dst.data, &dst, 4)) { offset = dissect_msnip(tvb, pinfo, parent_tree, offset); } @@ -876,7 +872,7 @@ dissect_igmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) offset = dissect_msnip(tvb, pinfo, parent_tree, offset); } else { /* ok its not MSNIP, check if it might be MRDISC */ - dst = htonl(MC_ALL_ROUTERS); + dst = g_htonl(MC_ALL_ROUTERS); if (!memcmp(pinfo->dst.data, &dst, 4)) { offset = dissect_mrdisc(tvb, pinfo, parent_tree, offset); } @@ -884,7 +880,7 @@ dissect_igmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) break; case IGMP_TYPE_0x26: - dst = htonl(MC_ALL_ROUTERS); + dst = g_htonl(MC_ALL_ROUTERS); if (!memcmp(pinfo->dst.data, &dst, 4)) { offset = dissect_mrdisc(tvb, pinfo, parent_tree, offset); } -- cgit v1.2.3