osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Replace the types from sys/types.h and netinet/in.h by their glib.h 

equivalents for the plugins/ directory.

svn path=/trunk/; revision=5929
This commit is contained in:
Jörg Mayer 2002-08-02 22:04:22 +00:00
parent 3105ee542f
commit 7e4e31f94c
28 changed files with 8 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/docsis/packet-bpkmattr.c
View File

@ -33,14 +33,6 @@
#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>

8
plugins/docsis/packet-bpkmreq.c
View File

@ -33,14 +33,6 @@
#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>

8
plugins/docsis/packet-bpkmrsp.c
View File

@ -33,14 +33,6 @@
#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>

10
plugins/docsis/packet-docsis.c
View 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>
@ -50,14 +50,6 @@
#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>

4
plugins/docsis/packet-docsis.h
View 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);

8
plugins/docsis/packet-dsaack.c
View File

@ -33,14 +33,6 @@
#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>

8
plugins/docsis/packet-dsareq.c
View File

@ -33,14 +33,6 @@
#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>

8
plugins/docsis/packet-dsarsp.c
View File

@ -33,14 +33,6 @@
#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>

8
plugins/docsis/packet-dscack.c
View File

@ -33,14 +33,6 @@
#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>

8
plugins/docsis/packet-dscreq.c
View File

@ -33,14 +33,6 @@
#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>

8
plugins/docsis/packet-dscrsp.c
View File

@ -33,14 +33,6 @@
#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>

8
plugins/docsis/packet-dsdreq.c
View File

@ -33,14 +33,6 @@
#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>

8
plugins/docsis/packet-dsdrsp.c
View File

@ -33,14 +33,6 @@
#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>

8
plugins/docsis/packet-macmgmt.c
View File

@ -34,14 +34,6 @@
#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>

8
plugins/docsis/packet-map.c
View File

@ -34,14 +34,6 @@
#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>

8
plugins/docsis/packet-regack.c
View File

@ -33,14 +33,6 @@
#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>

8
plugins/docsis/packet-regreq.c
View File

@ -33,14 +33,6 @@
#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>

8
plugins/docsis/packet-regrsp.c
View File

@ -33,14 +33,6 @@
#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>

8
plugins/docsis/packet-rngreq.c
View File

@ -34,14 +34,6 @@
#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>

8
plugins/docsis/packet-rngrsp.c
View File

@ -33,14 +33,6 @@
#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>

8
plugins/docsis/packet-tlv.c
View File

@ -34,14 +34,6 @@
#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>

8
plugins/docsis/packet-uccreq.c
View File

@ -29,18 +29,10 @@
#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>

8
plugins/docsis/packet-uccrsp.c
View File

@ -33,14 +33,6 @@
#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>

8
plugins/docsis/packet-ucd.c
View File

@ -35,14 +35,6 @@
#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>

8
plugins/giop/packet-coseventcomm.c
View File

@ -41,14 +41,6 @@
#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>

8
plugins/giop/packet-cosnaming.c
View File

@ -41,14 +41,6 @@
#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>

15
plugins/gryphon/packet-gryphon.c
View 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>
@ -32,18 +32,11 @@
#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))

10
plugins/mgcp/packet-mgcp.c
View 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>
*
@ -33,14 +33,6 @@
#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>