osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

AFAICT sys/types.h & netinet/in.h #includes are not needed for these files. 

(Let's see if any of the buildbots give any errors).
Also: remove trailing whitespace on lines.

svn path=/trunk/; revision=42429
This commit is contained in:
Bill Meier 2012-05-04 21:29:00 +00:00
parent 0c1b9e9007
commit d12d5a606c
73 changed files with 112 additions and 469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-ansi_637.c
View File

@ -34,14 +34,6 @@
# include "config.h" # include "config.h"
#endif #endif
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#include <epan/packet.h> #include <epan/packet.h>
#include <epan/emem.h> #include <epan/emem.h>
#include <epan/strutil.h> #include <epan/strutil.h>

8
epan/dissectors/packet-ansi_683.c
View File

@ -34,14 +34,6 @@
# include "config.h" # include "config.h"
#endif #endif
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#include <string.h> #include <string.h>
#include <epan/packet.h> #include <epan/packet.h>

8
epan/dissectors/packet-ansi_801.c
View File

@ -42,14 +42,6 @@
#include <glib.h> #include <glib.h>
#include <math.h> #include <math.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#include <epan/packet.h> #include <epan/packet.h>

8
epan/dissectors/packet-bssap.c
View File

@ -37,14 +37,6 @@
#include <glib.h> #include <glib.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#include <epan/packet.h> #include <epan/packet.h>
#include <epan/prefs.h> #include <epan/prefs.h>
#include <epan/emem.h> #include <epan/emem.h>

8
epan/dissectors/packet-csm-encaps.c
View File

@ -29,14 +29,6 @@
# include "config.h" # include "config.h"
#endif #endif
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>

4
epan/dissectors/packet-dcerpc-bossvr.c
View File

@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

6
epan/dissectors/packet-dcerpc-cds_clerkserver.c
View File

@ -5,7 +5,7 @@
* Copyright 2002, Jaime Fournier <Jaime.Fournier@hush.com> * Copyright 2002, Jaime Fournier <Jaime.Fournier@hush.com>
* This information is based off the released idl files from opengroup. * This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/directory.tar.gz directory/cds/stubs/cds_clerkserver.idl * ftp://ftp.opengroup.org/pub/dce122/dce/src/directory.tar.gz directory/cds/stubs/cds_clerkserver.idl
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
@ -32,10 +32,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

6
epan/dissectors/packet-dcerpc-cds_solicit.c
View File

@ -3,7 +3,7 @@
* Copyright 2002, Jaime Fournier <Jaime.Fournier@hush.com> * Copyright 2002, Jaime Fournier <Jaime.Fournier@hush.com>
* This information is based off the released idl files from opengroup. * This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/directory.tar.gz directory/cds/stubs/cds_solicit.idl * ftp://ftp.opengroup.org/pub/dce122/dce/src/directory.tar.gz directory/cds/stubs/cds_solicit.idl
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
@ -30,10 +30,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

4
epan/dissectors/packet-dcerpc-conv.c
View File

@ -28,10 +28,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

6
epan/dissectors/packet-dcerpc-cprpc_server.c
View File

@ -3,7 +3,7 @@
* Copyright 2002, Jaime Fournier <Jaime.Fournier@hush.com> * Copyright 2002, Jaime Fournier <Jaime.Fournier@hush.com>
* This information is based off the released idl files from opengroup. * This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/directory.tar.gz directory/cds/stubs/cprpc_server.idl * ftp://ftp.opengroup.org/pub/dce122/dce/src/directory.tar.gz directory/cds/stubs/cprpc_server.idl
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
@ -30,10 +30,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

4
epan/dissectors/packet-dcerpc-dtsprovider.c
View File

@ -30,10 +30,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

8
epan/dissectors/packet-dcerpc-dtsstime_req.c
View File

@ -1,9 +1,9 @@
/* packet-dcerpc-dtsstime_req.c /* packet-dcerpc-dtsstime_req.c
* Routines for Time services stuff. * Routines for Time services stuff.
* Copyright 2002, Jaime Fournier <Jaime.Fournier@hush.com> * Copyright 2002, Jaime Fournier <Jaime.Fournier@hush.com>
* This information is based off the released idl files from opengroup. * This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/time.tar.gz time/service/dtsstime_req.idl * ftp://ftp.opengroup.org/pub/dce122/dce/src/time.tar.gz time/service/dtsstime_req.idl
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
@ -30,10 +30,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

4
epan/dissectors/packet-dcerpc-fileexp.c
View File

@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

4
epan/dissectors/packet-dcerpc-fldb.c
View File

@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

4
epan/dissectors/packet-dcerpc-ftserver.c
View File

@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

6
epan/dissectors/packet-dcerpc-icl_rpc.c
View File

@ -5,7 +5,7 @@
* ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz icl_rpc.idl * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz icl_rpc.idl
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org> * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs * Copyright 1998 Gerald Combs
@ -30,10 +30,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

4
epan/dissectors/packet-dcerpc-krb5rpc.c
View File

@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include <epan/asn1.h> #include <epan/asn1.h>

6
epan/dissectors/packet-dcerpc-llb.c
View File

@ -4,7 +4,7 @@
* Copyright 2004, Jaime Fournier <jaime.fournier@hush.com> * Copyright 2004, Jaime Fournier <jaime.fournier@hush.com>
* This information is based off the released idl files from opengroup. * This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/admin.tar.gz ./admin/dced/idl/llb.idl * ftp://ftp.opengroup.org/pub/dce122/dce/src/admin.tar.gz ./admin/dced/idl/llb.idl
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

6
epan/dissectors/packet-dcerpc-rdaclif.c
View File

@ -6,7 +6,7 @@
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz ../security/idl/rdaclif.idl * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz ../security/idl/rdaclif.idl
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org> * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs * Copyright 1998 Gerald Combs
@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

4
epan/dissectors/packet-dcerpc-rep_proc.c
View File

@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

4
epan/dissectors/packet-dcerpc-roverride.c
View File

@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

4
epan/dissectors/packet-dcerpc-rpriv.c
View File

@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

4
epan/dissectors/packet-dcerpc-rs_acct.c
View File

@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

6
epan/dissectors/packet-dcerpc-rs_attr.c
View File

@ -4,7 +4,7 @@
* Copyright 2002, Jaime Fournier <Jaime.Fournier@hush.com> * Copyright 2002, Jaime Fournier <Jaime.Fournier@hush.com>
* This information is based off the released idl files from opengroup. * This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_attr.idl * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_attr.idl
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

6
epan/dissectors/packet-dcerpc-rs_attr_schema.c
View File

@ -6,7 +6,7 @@
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_attr_schema.idl * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_attr_schema.idl
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org> * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs * Copyright 1998 Gerald Combs
@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

8
epan/dissectors/packet-dcerpc-rs_bind.c
View File

@ -4,7 +4,7 @@
* Copyright 2003, Jaime Fournier <Jaime.Fournier@hush.com> * Copyright 2003, Jaime Fournier <Jaime.Fournier@hush.com>
* This information is based off the released idl files from opengroup. * This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_bind.idl * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_bind.idl
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"
@ -50,7 +46,7 @@ static gint ett_rs_bind = -1;
static e_uuid_t uuid_rs_bind = static e_uuid_t uuid_rs_bind =
{ 0xd46113d0, 0xa848, 0x11cb, {0xb8, 0x63, 0x08, 0x00, 0x1e, 0x04, 0x6a, { 0xd46113d0, 0xa848, 0x11cb, {0xb8, 0x63, 0x08, 0x00, 0x1e, 0x04, 0x6a,
0xa5} 0xa5}
}; };
static guint16 ver_rs_bind = 2; static guint16 ver_rs_bind = 2;

4
epan/dissectors/packet-dcerpc-rs_misc.c
View File

@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

4
epan/dissectors/packet-dcerpc-rs_pgo.c
View File

@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

6
epan/dissectors/packet-dcerpc-rs_prop_acct.c
View File

@ -5,7 +5,7 @@
* ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz bubasics/rs_prop_acct.idl * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz bubasics/rs_prop_acct.idl
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org> * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs * Copyright 1998 Gerald Combs
@ -30,10 +30,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

6
epan/dissectors/packet-dcerpc-rs_prop_acl.c
View File

@ -6,7 +6,7 @@
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_prop_acl.idl * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_prop_acl.idl
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org> * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs * Copyright 1998 Gerald Combs
@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

6
epan/dissectors/packet-dcerpc-rs_prop_attr.c
View File

@ -6,7 +6,7 @@
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_prop_attr.idl * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_prop_attr.idl
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org> * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs * Copyright 1998 Gerald Combs
@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

8
epan/dissectors/packet-dcerpc-rs_prop_pgo.c
View File

@ -1,12 +1,12 @@
/* packet-dcerpc-rs_prop_pgo.c /* packet-dcerpc-rs_prop_pgo.c
* *
* Routines for rs_prop_pgo dissection * Routines for rs_prop_pgo dissection
* Copyright 2004, Jaime Fournier <jaime.fournier@hush.com> * Copyright 2004, Jaime Fournier <jaime.fournier@hush.com>
* This information is based off the released idl files from opengroup. * This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_prop_pgo.idl * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_prop_pgo.idl
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org> * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs * Copyright 1998 Gerald Combs
@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

6
epan/dissectors/packet-dcerpc-rs_prop_plcy.c
View File

@ -6,7 +6,7 @@
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_prop_plcy.idl * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_prop_plcy.idl
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org> * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs * Copyright 1998 Gerald Combs
@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

6
epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c
View File

@ -6,7 +6,7 @@
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_pwd_mgmt.idl * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_pwd_mgmt.idl
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org> * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs * Copyright 1998 Gerald Combs
@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

4
epan/dissectors/packet-dcerpc-rs_repadm.c
View File

@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

6
epan/dissectors/packet-dcerpc-rs_replist.c
View File

@ -4,7 +4,7 @@
* Copyright 2002, Jaime Fournier <Jaime.Fournier@hush.com> * Copyright 2002, Jaime Fournier <Jaime.Fournier@hush.com>
* This information is based off the released idl files from opengroup. * This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_repadm.idl * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_repadm.idl
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

6
epan/dissectors/packet-dcerpc-rs_repmgr.c
View File

@ -6,7 +6,7 @@
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_repmgr.idl * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_repmgr.idl
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org> * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs * Copyright 1998 Gerald Combs
@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

4
epan/dissectors/packet-dcerpc-rs_unix.c
View File

@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

6
epan/dissectors/packet-dcerpc-rsec_login.c
View File

@ -4,7 +4,7 @@
* Copyright 2002, Jaime Fournier <Jaime.Fournier@hush.com> * Copyright 2002, Jaime Fournier <Jaime.Fournier@hush.com>
* This information is based off the released idl files from opengroup. * This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rsec_login.idl * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rsec_login.idl
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

9
epan/dissectors/packet-dcerpc-secidmap.c
View File

@ -4,7 +4,7 @@
* Copyright 2002, Jaime Fournier <Jaime.Fournier@hush.com> * Copyright 2002, Jaime Fournier <Jaime.Fournier@hush.com>
* This information is based off the released idl files from opengroup. * This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rsecidmap.idl * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rsecidmap.idl
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"
@ -56,7 +52,7 @@ static dcerpc_sub_dissector secidmap_dissectors[] = {
{ 2, "avoid_cn_bug", NULL, NULL}, { 2, "avoid_cn_bug", NULL, NULL},
{ 3, "parse_name_cache", NULL, NULL}, { 3, "parse_name_cache", NULL, NULL},
{ 4, "gen_name_cache", NULL, NULL}, { 4, "gen_name_cache", NULL, NULL},
{ 0, NULL, NULL, NULL }, { 0, NULL, NULL, NULL },
}; };
@ -83,4 +79,3 @@ proto_reg_handoff_secidmap (void)
/* Register the protocol as dcerpc */ /* Register the protocol as dcerpc */
dcerpc_init_uuid (proto_secidmap, ett_secidmap, &uuid_secidmap, ver_secidmap, secidmap_dissectors, hf_secidmap_opnum); dcerpc_init_uuid (proto_secidmap, ett_secidmap, &uuid_secidmap, ver_secidmap, secidmap_dissectors, hf_secidmap_opnum);
} }

4
epan/dissectors/packet-dcerpc-tkn4int.c
View File

@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

4
epan/dissectors/packet-dcerpc-ubikdisk.c
View File

@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

4
epan/dissectors/packet-dcerpc-ubikvote.c
View File

@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

4
epan/dissectors/packet-dcerpc-update.c
View File

@ -31,10 +31,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-dcerpc.h" #include "packet-dcerpc.h"

8
epan/dissectors/packet-fc.c
View File

@ -32,14 +32,6 @@
#include <stdlib.h> #include <stdlib.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 <glib.h>
#include <epan/packet.h> #include <epan/packet.h>

8
epan/dissectors/packet-fcct.c
View File

@ -29,14 +29,6 @@
#include <stdlib.h> #include <stdlib.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 <glib.h>
#include <epan/packet.h> #include <epan/packet.h>

8
epan/dissectors/packet-fcels.c
View File

@ -34,14 +34,6 @@
#include <stdlib.h> #include <stdlib.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 <glib.h>
#include <epan/packet.h> #include <epan/packet.h>

8
epan/dissectors/packet-fcfcs.c
View File

@ -29,14 +29,6 @@
#include <stdlib.h> #include <stdlib.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 <glib.h>
#include <epan/packet.h> #include <epan/packet.h>

22
epan/dissectors/packet-fclctl.c
View File

@ -1,5 +1,5 @@
/* packet-fclctl.c /* packet-fclctl.c
* Routines for FC Link Control Frames * Routines for FC Link Control Frames
* Copyright 2001, Dinesh G Dutt <ddutt@cisco.com> * Copyright 2001, Dinesh G Dutt <ddutt@cisco.com>
* *
* $Id$ * $Id$
@ -7,17 +7,17 @@
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org> * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs * Copyright 1998 Gerald Combs
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@ -29,14 +29,6 @@
#include <stdlib.h> #include <stdlib.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 <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
@ -132,7 +124,7 @@ fclctl_get_typestr (guint8 linkctl_type, guint8 type)
{ {
if ((linkctl_type == FC_LCTL_FBSYB) || if ((linkctl_type == FC_LCTL_FBSYB) ||
(linkctl_type == FC_LCTL_FBSYL)) { (linkctl_type == FC_LCTL_FBSYL)) {
return (val_to_str ((type & 0xF0), fc_lctl_fbsy_val, "0x%x")); return (val_to_str ((type & 0xF0), fc_lctl_fbsy_val, "0x%x"));
} }
return ""; return "";
} }
@ -141,13 +133,13 @@ const gchar *
fclctl_get_paramstr (guint32 linkctl_type, guint32 param) fclctl_get_paramstr (guint32 linkctl_type, guint32 param)
{ {
if (linkctl_type == FC_LCTL_PBSY) { if (linkctl_type == FC_LCTL_PBSY) {
return g_strdup_printf("%s, %s", return g_strdup_printf("%s, %s",
val_to_str (((param & 0xFF000000) >> 24), fc_lctl_pbsy_acode_val, "0x%x"), val_to_str (((param & 0xFF000000) >> 24), fc_lctl_pbsy_acode_val, "0x%x"),
val_to_str (((param & 0x00FF0000) >> 16), fc_lctl_pbsy_rjt_val, "0x%x")); val_to_str (((param & 0x00FF0000) >> 16), fc_lctl_pbsy_rjt_val, "0x%x"));
} }
if ((linkctl_type == FC_LCTL_FRJT) || if ((linkctl_type == FC_LCTL_FRJT) ||
(linkctl_type == FC_LCTL_PRJT)) { (linkctl_type == FC_LCTL_PRJT)) {
return g_strdup_printf("%s, %s", return g_strdup_printf("%s, %s",
val_to_str (((param & 0xFF000000) >> 24), fc_lctl_rjt_acode_val, "0x%x"), val_to_str (((param & 0xFF000000) >> 24), fc_lctl_rjt_acode_val, "0x%x"),
val_to_str (((param & 0x00FF0000) >> 16), fc_lctl_rjt_val, "%x")); val_to_str (((param & 0x00FF0000) >> 16), fc_lctl_rjt_val, "%x"));
} }

8
epan/dissectors/packet-fcp.c
View File

@ -27,14 +27,6 @@
# include "config.h" # include "config.h"
#endif #endif
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/emem.h> #include <epan/emem.h>

8
epan/dissectors/packet-fcsb3.c
View File

@ -28,14 +28,6 @@
# include "config.h" # include "config.h"
#endif #endif
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>

8
epan/dissectors/packet-fcsp.c
View File

@ -30,14 +30,6 @@
#include <stdlib.h> #include <stdlib.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 <glib.h>
#include <epan/packet.h> #include <epan/packet.h>

4
epan/dissectors/packet-fmp.c
View File

@ -22,10 +22,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif

4
epan/dissectors/packet-fmp_notify.c
View File

@ -27,10 +27,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/strutil.h> #include <epan/strutil.h>

30
epan/dissectors/packet-gsm_sms.c
View File

@ -41,14 +41,6 @@
#include <glib.h> #include <glib.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 <string.h>
#include <epan/packet.h> #include <epan/packet.h>
@ -2409,7 +2401,7 @@ dis_iei_upi(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint8 length)
#if 0 #if 0
/* TS 123 040 V9.3.0 (2010-10) */ /* TS 123 040 V9.3.0 (2010-10) */
static const value_string gsm_sms_tp_ud_ie-_d_vals[] = { static const value_string gsm_sms_tp_ud_ie-_d_vals[] = {
{ 0x00, "Concatenated short messages, 8-bit reference number (SMS Control)" }, { 0x00, "Concatenated short messages, 8-bit reference number (SMS Control)" },
{ 0x01, "Special SMS Message Indication (SMS Control)" }, { 0x01, "Special SMS Message Indication (SMS Control)" },
{ 0x02, "Reserved" }, { 0x02, "Reserved" },
{ 0x03, "Value not used to avoid misinterpretation as <LF> character" }, { 0x03, "Value not used to avoid misinterpretation as <LF> character" },
@ -2436,23 +2428,23 @@ static const value_string gsm_sms_tp_ud_ie-_d_vals[] = {
{ 0x18, "Standard WVG object (EMS Content)" }, { 0x18, "Standard WVG object (EMS Content)" },
{ 0x19, "Character Size WVG object (EMS Content)" }, { 0x19, "Character Size WVG object (EMS Content)" },
{ 0x1A, "Extended Object Data Request Command (EMS Control)" }, { 0x1A, "Extended Object Data Request Command (EMS Control)" },
/*1B-1F Reserved for future EMS features (see subclause 3.10) */ /*1B-1F Reserved for future EMS features (see subclause 3.10) */
{ 0x20, "RFC 822 E-Mail Header (SMS Control)" }, { 0x20, "RFC 822 E-Mail Header (SMS Control)" },
{ 0x21, "Hyperlink format element (SMS Control)" },s { 0x21, "Hyperlink format element (SMS Control)" },s
{ 0x22, "Reply Address Element (SMS Control)" }, { 0x22, "Reply Address Element (SMS Control)" },
{ 0x23, "Enhanced Voice Mail Information (SMS Control)" }, { 0x23, "Enhanced Voice Mail Information (SMS Control)" },
{ 0x24, "National Language Single Shift (SMS Control)" }, { 0x24, "National Language Single Shift (SMS Control)" },
{ 0x25, "National Language Locking Shift (SMS Control)" }, { 0x25, "National Language Locking Shift (SMS Control)" },
/*26-6F Reserved for future use */ /*26-6F Reserved for future use */
/*70-7F (U)SIM Toolkit Security Headers (SMS Control) */ /*70-7F (U)SIM Toolkit Security Headers (SMS Control) */
/*80-9F SME to SME specific use (SMS Control) */ /*80-9F SME to SME specific use (SMS Control) */
/*A0-BF Reserved for future use */ /*A0-BF Reserved for future use */
/*C0-DF SC specific use (SMS Control) */ /*C0-DF SC specific use (SMS Control) */
/*E0-FF Reserved for future use */ /*E0-FF Reserved for future use */
{ 0, NULL }, { 0, NULL },
}; };
#endif #endif
static void static void
dis_field_ud_iei(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint8 length) dis_field_ud_iei(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint8 length)
{ {
@ -2757,12 +2749,12 @@ dis_field_ud(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint32 length, gb
gsm_sms_char_7bit_unpack(fill_bits, p_frag_params->length, gsm_sms_char_7bit_unpack(fill_bits, p_frag_params->length,
(p_frag_params->udl > SMS_MAX_MESSAGE_SIZE ? SMS_MAX_MESSAGE_SIZE : p_frag_params->udl), (p_frag_params->udl > SMS_MAX_MESSAGE_SIZE ? SMS_MAX_MESSAGE_SIZE : p_frag_params->udl),
tvb_get_ptr(sm_tvb, total_sms_len, p_frag_params->length), messagebuf); tvb_get_ptr(sm_tvb, total_sms_len, p_frag_params->length), messagebuf);
messagebuf[out_len] = '\0'; messagebuf[out_len] = '\0';
proto_tree_add_string(subtree, hf_gsm_sms_text, sm_tvb, proto_tree_add_string(subtree, hf_gsm_sms_text, sm_tvb,
total_sms_len, p_frag_params->length, total_sms_len, p_frag_params->length,
gsm_sms_chars_to_utf8(messagebuf, out_len)); gsm_sms_chars_to_utf8(messagebuf, out_len));
total_sms_len += p_frag_params->length; total_sms_len += p_frag_params->length;
} }
} }

4
epan/dissectors/packet-gssapi.c
View File

@ -29,10 +29,6 @@
# include "config.h" # include "config.h"
#endif #endif
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>

4
epan/dissectors/packet-ieee802154.c
View File

@ -65,10 +65,6 @@
#include <string.h> #include <string.h>
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <sys/stat.h> #include <sys/stat.h>
#include <glib.h> #include <glib.h>

3
epan/dissectors/packet-ipmi-app.c
View File

@ -27,9 +27,6 @@
#include "config.h" #include "config.h"
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <string.h> #include <string.h>
#include <epan/packet.h> #include <epan/packet.h>

4
epan/dissectors/packet-ipmi-bridge.c
View File

@ -27,10 +27,6 @@
#include "config.h" #include "config.h"
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-ipmi.h" #include "packet-ipmi.h"

4
epan/dissectors/packet-ipmi-chassis.c
View File

@ -27,10 +27,6 @@
#include "config.h" #include "config.h"
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-ipmi.h" #include "packet-ipmi.h"

4
epan/dissectors/packet-ipmi-picmg.c
View File

@ -27,10 +27,6 @@
#include "config.h" #include "config.h"
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-ipmi.h" #include "packet-ipmi.h"

4
epan/dissectors/packet-ipmi-pps.c
View File

@ -27,10 +27,6 @@
#include "config.h" #include "config.h"
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-ipmi.h" #include "packet-ipmi.h"

4
epan/dissectors/packet-ipmi-se.c
View File

@ -27,10 +27,6 @@
#include "config.h" #include "config.h"
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-ipmi.h" #include "packet-ipmi.h"

4
epan/dissectors/packet-ipmi-storage.c
View File

@ -27,10 +27,6 @@
#include "config.h" #include "config.h"
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-ipmi.h" #include "packet-ipmi.h"

4
epan/dissectors/packet-ipmi-transport.c
View File

@ -27,10 +27,6 @@
#include "config.h" #include "config.h"
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-ipmi.h" #include "packet-ipmi.h"

4
epan/dissectors/packet-ipmi-update.c
View File

@ -27,10 +27,6 @@
#include "config.h" #include "config.h"
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <epan/packet.h> #include <epan/packet.h>
#include "packet-ipmi.h" #include "packet-ipmi.h"

5
epan/dissectors/packet-ipmi.c
View File

@ -27,16 +27,13 @@
#include "config.h" #include "config.h"
#endif #endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <math.h> #include <math.h>
#include <epan/packet.h>
#include <epan/conversation.h> #include <epan/conversation.h>
#include <epan/emem.h> #include <epan/emem.h>
#include <epan/packet.h>
#include <epan/to_str.h> #include <epan/to_str.h>
#include <epan/prefs.h> #include <epan/prefs.h>
#include <epan/addr_resolv.h> #include <epan/addr_resolv.h>

8
epan/dissectors/packet-isns.c
View File

@ -34,14 +34,6 @@
#endif #endif
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>

10
epan/dissectors/packet-ncp.c
View File

@ -46,16 +46,10 @@
# include "config.h" # include "config.h"
#endif #endif
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include <epan/emem.h> #include <epan/emem.h>
#include <epan/prefs.h> #include <epan/prefs.h>

134
epan/dissectors/packet-ndp.c
View File

@ -1,43 +1,39 @@
/* packet-ndp.c /* packet-ndp.c
* Routines for the disassembly of the Nortel Discovery Protocol, formerly * Routines for the disassembly of the Nortel Discovery Protocol, formerly
* the SynOptics Network Management Protocol (SONMP). * the SynOptics Network Management Protocol (SONMP).
* (c) Copyright Giles Scott <giles.scott1 [AT] arubanetworks.com> * (c) Copyright Giles Scott <giles.scott1 [AT] arubanetworks.com>
* *
* $Id$ * $Id$
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org> * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs * Copyright 1998 Gerald Combs
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* This protocol has gone by many names over the years: * This protocol has gone by many names over the years:
* *
* Bay Discovery Protocol (BDP), Bay Topology Protocol, Bay Network Management * Bay Discovery Protocol (BDP), Bay Topology Protocol, Bay Network Management
* Protocol (BNMP), Nortel Management MIB (NMM), Nortel Topology Discovery * Protocol (BNMP), Nortel Management MIB (NMM), Nortel Topology Discovery
* Protocol (NTDP), SynOptics Network Management Protocol (SONMP). * Protocol (NTDP), SynOptics Network Management Protocol (SONMP).
* (source: Wikipedia article on "Nortel Discovery Protocol") * (source: Wikipedia article on "Nortel Discovery Protocol")
* *
*/ */
#include "config.h" #include "config.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <stdlib.h> #include <stdlib.h>
#include <glib.h> #include <glib.h>
@ -45,14 +41,14 @@
#include <epan/nlpid.h> #include <epan/nlpid.h>
/* Although this protocol is proprietary it is documented in the SynOptics MIB's /* Although this protocol is proprietary it is documented in the SynOptics MIB's
* So I'm not giving anything away :-) * So I'm not giving anything away :-)
* The only thing I have not done is decode the segment identifier; * The only thing I have not done is decode the segment identifier;
* This changes so much depending on whether the chassis supports * This changes so much depending on whether the chassis supports
* multi-segment autotopology. As the 5000 is now EOL don't see much point. * multi-segment autotopology. As the 5000 is now EOL don't see much point.
* *
* MIB's s5emt104.mib, s5tcs112.mib, synro199.mib these should be available via * MIB's s5emt104.mib, s5tcs112.mib, synro199.mib these should be available via
* http://www.nortelnetworks.com * http://www.nortelnetworks.com
*/ */
/* chassis types */ /* chassis types */
@ -337,43 +333,43 @@ dissect_ndp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
void void
proto_register_ndp(void) proto_register_ndp(void)
{ {
static hf_register_info hf[] = { static hf_register_info hf[] = {
{ &hf_ndp_ip_address, { &hf_ndp_ip_address,
{ "IP address", "ndp.ipaddress", FT_IPv4, BASE_NONE, NULL, 0x0, { "IP address", "ndp.ipaddress", FT_IPv4, BASE_NONE, NULL, 0x0,
"IP address of the Network Management Module (NMM))", HFILL }}, "IP address of the Network Management Module (NMM))", HFILL }},
{ &hf_ndp_segment_identifier, { &hf_ndp_segment_identifier,
{ "Segment Identifier", "ndp.segmentident", FT_UINT24, BASE_HEX, NULL, 0x0, { "Segment Identifier", "ndp.segmentident", FT_UINT24, BASE_HEX, NULL, 0x0,
"Segment id of the segment from which the agent is sending the topology message", HFILL }}, "Segment id of the segment from which the agent is sending the topology message", HFILL }},
{ &hf_ndp_chassis_type, { &hf_ndp_chassis_type,
{ "Chassis type", "ndp.chassis", FT_UINT8, BASE_DEC|BASE_EXT_STRING, { "Chassis type", "ndp.chassis", FT_UINT8, BASE_DEC|BASE_EXT_STRING,
&ndp_chassis_val_ext, 0x0, &ndp_chassis_val_ext, 0x0,
"Chassis type of the agent sending the topology message", HFILL }}, "Chassis type of the agent sending the topology message", HFILL }},
{ &hf_ndp_backplane_type, { &hf_ndp_backplane_type,
{ "Backplane type", "ndp.backplane", FT_UINT8, BASE_DEC|BASE_EXT_STRING, { "Backplane type", "ndp.backplane", FT_UINT8, BASE_DEC|BASE_EXT_STRING,
&ndp_backplane_val_ext, 0x0, &ndp_backplane_val_ext, 0x0,
"Backplane type of the agent sending the topology message", HFILL }}, "Backplane type of the agent sending the topology message", HFILL }},
{ &hf_ndp_state, { &hf_ndp_state,
{ "State", "ndp.state", FT_UINT8, BASE_DEC, { "State", "ndp.state", FT_UINT8, BASE_DEC,
VALS(ndp_state_val), 0x0, VALS(ndp_state_val), 0x0,
"Current state of this Network Management Module (NMM)", HFILL }}, "Current state of this Network Management Module (NMM)", HFILL }},
{ &hf_ndp_number_of_links, { &hf_ndp_number_of_links,
{ "Number of links", "ndp.numberoflinks", FT_UINT8, BASE_DEC, NULL, 0x0, { "Number of links", "ndp.numberoflinks", FT_UINT8, BASE_DEC, NULL, 0x0,
"Number of interconnect ports", HFILL }}, "Number of interconnect ports", HFILL }},
}; };
static gint *ett[] = { static gint *ett[] = {
&ett_ndp, &ett_ndp,
}; };
proto_ndp = proto_register_protocol("Nortel Discovery Protocol", "NDP", "ndp"); proto_ndp = proto_register_protocol("Nortel Discovery Protocol", "NDP", "ndp");
proto_register_field_array(proto_ndp, hf, array_length(hf)); proto_register_field_array(proto_ndp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett)); proto_register_subtree_array(ett, array_length(ett));
register_dissector("ndp", dissect_ndp, proto_ndp); register_dissector("ndp", dissect_ndp, proto_ndp);
} }
void void
@ -384,8 +380,8 @@ proto_reg_handoff_ndp(void)
ndp_handle = find_dissector("ndp"); ndp_handle = find_dissector("ndp");
dissector_add_uint("llc.nortel_pid", 0x01a1, ndp_handle); /* flatnet hello */ dissector_add_uint("llc.nortel_pid", 0x01a1, ndp_handle); /* flatnet hello */
dissector_add_uint("llc.nortel_pid", 0x01a2, ndp_handle); /* Segment hello */ dissector_add_uint("llc.nortel_pid", 0x01a2, ndp_handle); /* Segment hello */
/* not got round to adding this but its really old, so I'm not sure people will see it */ /* not got round to adding this but it's really old, so I'm not sure people will see it */
/* it uses a different packet format */ /* it uses a different packet format */
/* dissector_add_uint("llc.nortel_pid", 0x01a3, ndp_handle); */ /* Bridge hello */ /* dissector_add_uint("llc.nortel_pid", 0x01a3, ndp_handle); */ /* Bridge hello */
} }

4
epan/dissectors/packet-nt-tpcp.c
View File

@ -30,10 +30,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include <epan/addr_resolv.h> /* this is for get_hostname and get_udp_port */ #include <epan/addr_resolv.h> /* this is for get_hostname and get_udp_port */

8
epan/dissectors/packet-olsr.c
View File

@ -37,14 +37,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.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 <glib.h>
#include <epan/packet.h> #include <epan/packet.h>

8
epan/dissectors/packet-tzsp.c
View File

@ -30,10 +30,6 @@
# include "config.h" # include "config.h"
#endif #endif
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
@ -117,11 +113,11 @@ static int hf_sensormac = -1;
/* Add option information to the display */ /* Add option information to the display */
/* ************************************************************************* */ /* ************************************************************************* */
static int static int
add_option_info(tvbuff_t *tvb, int pos, proto_tree *tree, proto_item *ti) add_option_info(tvbuff_t *tvb, int pos, proto_tree *tree, proto_item *ti)
{ {
guint8 tag, length, fcs_err = 0, encr = 0, seen_fcs_err = 0; guint8 tag, length, fcs_err = 0, encr = 0, seen_fcs_err = 0;
/* /*
* Read all option tags in an endless loop. If the packet is malformed this * Read all option tags in an endless loop. If the packet is malformed this
* loop might be a problem. * loop might be a problem.