Replace the types from sys/types.h and netinet/in.h by their glib.h
authorjmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 2 Aug 2002 22:04:22 +0000 (22:04 +0000)
committerjmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 2 Aug 2002 22:04:22 +0000 (22:04 +0000)
equivalents for the plugins/ directory.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5929 f5534014-38df-0310-8fa8-9805f1628bb7

28 files changed:
plugins/docsis/packet-bpkmattr.c
plugins/docsis/packet-bpkmreq.c
plugins/docsis/packet-bpkmrsp.c
plugins/docsis/packet-docsis.c
plugins/docsis/packet-docsis.h
plugins/docsis/packet-dsaack.c
plugins/docsis/packet-dsareq.c
plugins/docsis/packet-dsarsp.c
plugins/docsis/packet-dscack.c
plugins/docsis/packet-dscreq.c
plugins/docsis/packet-dscrsp.c
plugins/docsis/packet-dsdreq.c
plugins/docsis/packet-dsdrsp.c
plugins/docsis/packet-macmgmt.c
plugins/docsis/packet-map.c
plugins/docsis/packet-regack.c
plugins/docsis/packet-regreq.c
plugins/docsis/packet-regrsp.c
plugins/docsis/packet-rngreq.c
plugins/docsis/packet-rngrsp.c
plugins/docsis/packet-tlv.c
plugins/docsis/packet-uccreq.c
plugins/docsis/packet-uccrsp.c
plugins/docsis/packet-ucd.c
plugins/giop/packet-coseventcomm.c
plugins/giop/packet-cosnaming.c
plugins/gryphon/packet-gryphon.c
plugins/mgcp/packet-mgcp.c

index e2baa9e13256ea70608e58f90b160b1ee7a0d1e6..5f222207b25f94fbd45b611850deee73c4f7bdb4 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index b9898a5f82dc31289b5ef1240a21ed982d7b3a04..d76d000a34f6060b457c9a95eddaf26bba2c987a 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index 6b220326ddc19c2e4a4b6049eb01eed34033adb7..aaad61c6bd40864ff64d3a7e7fc84ab86751f474 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index 8ac8e36925ceef0f906c4b4c878836cad843046d..0ec1d6ca735e6b373c6dddd913b051da141ae1a1 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for docsis dissection
  * Copyright 2002, Anand V. Narwani <anarwani@cisco.com>
  *
- * $Id: packet-docsis.c,v 1.5 2002/07/22 20:18:23 guy Exp $
+ * $Id: packet-docsis.c,v 1.6 2002/08/02 22:04:13 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index c7b27a2cf3a08f2e236079a6dd60d6093e000a4b..8cc82a6e1e4e7cd37211001bc33a7398becd1bcf 100644 (file)
@@ -1,6 +1,6 @@
 /* packet-docsis.h
  *
- * $Id: packet-docsis.h,v 1.1 2002/07/12 22:52:41 guy Exp $
+ * $Id: packet-docsis.h,v 1.2 2002/08/02 22:04:13 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -24,7 +24,7 @@
 #ifndef __PACKET_DOCSIS_H__
 #define __PACKET_DOCSIS_H__
 
-void capture_docsis (const u_char *, int, int, packet_counts *);
+void capture_docsis (const guchar *, int, int, packet_counts *);
 void proto_reg_handoff_docsis_bpkmattr (void);
 void proto_reg_handoff_docsis_bpkmreq (void);
 void proto_reg_handoff_docsis_bpkmrsp (void);
index 12d6eb6946918cf3a25cd7bf34fe37e41306f682..e44687a52e2a883cb24316478bb0ebf03b024459 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index 4c6b7808bfa60375062ea4318db5bc22ff8f7692..c0efe665f34eb8b21adb52febfc87e9bdf97b9b1 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index 6d79955e7189c8edda0620752cdf455d176ba824..db2a4bbc4890c3e795812e476192376716a6107f 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index fabc8f11d32a2b81678973eb971f18aba70bab19..f697c1e0ef1e709df4970748b70ecdeb05e99ab0 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index 9bb7a64446051fd721e1057aacecec4b4c273f66..5deaa078cd6058eaa8dac891648339e9f74bff2c 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index 9d187d3ef3c65af0aa450f5e662c721241dcc344..686ea0bdbc477824f92b4ea17cf2b5ef5df0cff0 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index 7d29ce65a8868b0f5e0024da2a059694645a1422..2ad1945406fc6ab45111a9e6b596c0799ea2ecaf 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index c06a37688feb0f86bcc07542fcbdb1bfac6aca6d..d618ac366a6fcc3f42a55c4f02d33e595d0d81a4 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index 1cd0c0e858809e4cc532515446a9d22764df4c3d..45d4e18ad0d8039829c56629e9f2a676859999c6 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <glib.h>
 
 #include <epan/packet.h>
index 78c2a7fb93250af170401c547ffc01924e2c128b..d2fb6467a31ff1a6782fb207aeeda72dc438061c 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index 8763d031e99c36a0ca348b7cbbfe5e0136ce0c3a..181d470c2893c099d4e9331d64e02805ff12184c 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index 80f6aa6dc3b073fed6a94a0ce92023eb81ea691b..b402ca5b31e07f0112f2917f2f21d1bad9291d41 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index 6d6b025b21eb128a72e4a59ece508cf9b6fa5c1b..e0196d64e447fc77a4223a4e9ba9c711c1d87974 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index 76625ea627b59a5046ecfab072edb7f0fad2a850..ac59ce08aff0ba3c7bee5ce8e59c08e38c5bb54a 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index 27b5077d90c3a3dd88f6f11ce92b16a78952b926..fae001a541ecaebb7d3f0b438e4ba344e42ae6c1 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index 919d7d69614ed7fea783e72065045ceeb2efaf55..314b8a5de4614fb91e9955b6fa8c5270312c7dca 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index 7c3375062225b75860ead9e4d786fcbf01b715fa..e33734068deffe1d1d49318fe0a60003fd98f2cd 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
 #include "plugins/plugin_api.h"
 #include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index d26d51da0f99f9a33a204e8130413f2f6ff2c6ae..3227ab3c256d410242390d3303bcdd70fae99af0 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index 5b2dad9810d877ebef65e722e3546e372cb43938..5f369a8ff1f7b583fca67491d617dd5520949cd1 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <gmodule.h>
 
 #include <epan/packet.h>
index eea3ec329f2630df2941185e1f536afb6901ef58..24786b22572d79e5ccfef7fe5d3857933ec685d6 100644 (file)
 #include <stdlib.h>
 #include <gmodule.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>
index 4dca0299c06086a247d4f57fdff83dace5ca9c9b..9e1e22bb4ed4d68c5a05d396bbead39d31df2155 100644 (file)
 #include <stdlib.h>
 #include <gmodule.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>
index fddad1487e6b506006eb257f42f07d8a33afa1f2..03fae22b9e0064b54655e029ff526ae2839e1a0e 100644 (file)
@@ -3,7 +3,7 @@
  * By Steve Limkemann <stevelim@dgtech.com>
  * Copyright 1998 Steve Limkemann
  *
- * $Id: packet-gryphon.c,v 1.33 2002/05/05 00:16:38 guy Exp $
+ * $Id: packet-gryphon.c,v 1.34 2002/08/02 22:04:20 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
 
 #include "moduleinfo.h"
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
 #include <string.h>
 #include <ctype.h>
 #include <time.h>
 
 #include <gmodule.h>
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
 #include <epan/packet.h>
 #include "packet-gryphon.h"
 #include "packet-tcp.h"
@@ -1673,7 +1666,7 @@ static int
 cmd_files(tvbuff_t *tvb, int offset, proto_tree *pt)
 {
     int            msglen;
-    u_char  *which;
+    guchar  *which;
     
     msglen = tvb_reported_length_remaining(tvb, offset);
     if (tvb_get_guint8(tvb, offset) == 0)
@@ -1692,7 +1685,7 @@ static int
 resp_files(tvbuff_t *tvb, int offset, proto_tree *pt)
 {
     int                msglen;
-    u_char     *flag;
+    guchar     *flag;
     
     msglen = tvb_reported_length_remaining(tvb, offset);
     flag = tvb_get_guint8(tvb, offset) ? "Yes": "No";
@@ -1705,7 +1698,7 @@ resp_files(tvbuff_t *tvb, int offset, proto_tree *pt)
 static int
 cmd_usdt(tvbuff_t *tvb, int offset, proto_tree *pt)
 {
-    u_char  *desc;
+    guchar  *desc;
     guint8  assemble_flag;
     
     if (tvb_get_guint8(tvb, offset))
index 320d63373319438e6a6231d208ec7f35817cc043..8bc9d04437605143ae691730eb80dc0a07bcfb77 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for mgcp packet disassembly
  * RFC 2705
  *
- * $Id: packet-mgcp.c,v 1.33 2002/07/17 06:55:29 guy Exp $
+ * $Id: packet-mgcp.c,v 1.34 2002/08/02 22:04:22 jmayer Exp $
  * 
  * Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
  *
 
 #include "moduleinfo.h"
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <gmodule.h>