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

Make various dissectors static if they can be, and get rid of any header 

files that no longer contain any information as a result of that change.

svn path=/trunk/; revision=1871
This commit is contained in:
Guy Harris 2000-04-16 22:59:37 +00:00
parent 9aa7670a4e
commit 83a275737e
9 changed files with 15 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal
#
# $Id: Makefile.am,v 1.187 2000/04/16 22:46:18 guy Exp $
# $Id: Makefile.am,v 1.188 2000/04/16 22:59:35 guy Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
@ -124,7 +124,6 @@ DISSECTOR_SOURCES = \
packet-mount.c \
packet-mount.h \
packet-mpls.c \
packet-mpls.h \
packet-nbipx.c \
packet-nbipx.h \
packet-nbns.c \
@ -155,7 +154,6 @@ DISSECTOR_SOURCES = \
packet-ppp.c \
packet-ppp.h \
packet-pppoe.c \
packet-pppoe.h \
packet-pptp.c \
packet-q2931.c \
packet-q2931.h \

4
packet-arp.c
View File

@ -1,7 +1,7 @@
/* packet-arp.c
* Routines for ARP packet disassembly
*
* $Id: packet-arp.c,v 1.27 2000/04/13 18:18:43 gram Exp $
* $Id: packet-arp.c,v 1.28 2000/04/16 22:59:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -548,7 +548,7 @@ dissect_atmarp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
}
}
void
static void
dissect_arp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
guint16 ar_hrd;

3
packet-arp.h
View File

@ -2,7 +2,7 @@
* Definitions of routines for ARP packet disassembly that are used
* elsewhere
*
* $Id: packet-arp.h,v 1.2 2000/02/15 21:01:57 gram Exp $
* $Id: packet-arp.h,v 1.3 2000/04/16 22:59:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -31,6 +31,5 @@ gchar *arphrdaddr_to_str(guint8 *ad, int ad_len, guint16 type);
gchar *arphrdtype_to_str(guint16 hwtype, const char *fmt);
void dissect_atm_nsap(const u_char *pd, int offset, int len, proto_tree *tree);
void dissect_arp(const u_char *, int, frame_data *, proto_tree *);
#endif /* packet-atm.h */

5
packet-mpls.c
View File

@ -3,7 +3,7 @@
*
* (c) Copyright Ashok Narayanan <ashokn@cisco.com>
*
* $Id: packet-mpls.c,v 1.4 2000/04/13 18:18:48 gram Exp $
* $Id: packet-mpls.c,v 1.5 2000/04/16 22:59:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -45,7 +45,6 @@
#include <glib.h>
#include "etypes.h"
#include "packet.h"
#include "packet-mpls.h"
#include "packet-ip.h"
static gint proto_mpls = -1;
@ -124,7 +123,7 @@ void decode_mpls_label(const unsigned char *start,
*ttl = start[3];
}
void
static void
dissect_mpls(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
guint32 label;

13
packet-mpls.h
View File

@ -1,13 +0,0 @@
/**********************************************************************
*
* packet-mpls.h
*
* (C) Ashok Narayanan <ashokn@cisco.com>
*
* $Id: packet-mpls.h,v 1.1 2000/03/09 18:31:51 ashokn Exp $
*
* For license details, see the COPYING file with this distribution
*
**********************************************************************/
void dissect_mpls(const u_char *, int, frame_data *, proto_tree *);

12
packet-pppoe.c
View File

@ -1,7 +1,7 @@
/* packet-arp.c
* Routines for ARP packet disassembly
*
* $Id: packet-pppoe.c,v 1.6 2000/04/13 18:18:48 gram Exp $
* $Id: packet-pppoe.c,v 1.7 2000/04/16 22:59:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -59,7 +59,7 @@ static gint ett_pppoed_tags = -1;
#define PPPOE_TAG_AC_ERR 0x0202
#define PPPOE_TAG_GENERIC_ERR 0x0203
gchar *
static gchar *
pppoecode_to_str(guint8 codetype, const char *fmt) {
static const value_string code_vals[] = {
{PPPOE_CODE_SESSION, "Session Data" },
@ -73,7 +73,7 @@ pppoecode_to_str(guint8 codetype, const char *fmt) {
return val_to_str(codetype, code_vals, fmt);
}
gchar *
static gchar *
pppoetag_to_str(guint16 tag_type, const char *fmt) {
static const value_string code_vals[] = {
{PPPOE_TAG_EOL, "End-Of-List" },
@ -92,7 +92,7 @@ pppoetag_to_str(guint16 tag_type, const char *fmt) {
}
void
static void
dissect_pppoe_tags(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, int payload_length) {
guint16 poe_tag;
@ -144,7 +144,7 @@ dissect_pppoe_tags(const u_char *pd, int offset, frame_data *fd, proto_tree *tre
}
}
void
static void
dissect_pppoed(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
guint8 pppoe_ver;
guint8 pppoe_type;
@ -188,7 +188,7 @@ dissect_pppoed(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
}
void
static void
dissect_pppoes(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
guint8 pppoe_ver;
guint8 pppoe_type;

27
packet-pppoe.h
View File

@ -1,27 +0,0 @@
/* packet-pppoe.h
*
* $Id: packet-pppoe.h,v 1.1 2000/02/15 21:02:54 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
void dissect_pppoed(const u_char *, int, frame_data *, proto_tree *);
void dissect_pppoes(const u_char *, int, frame_data *, proto_tree *);

4
packet-vlan.c
View File

@ -1,7 +1,7 @@
/* packet-vlan.c
* Routines for VLAN 802.1Q ethernet header disassembly
*
* $Id: packet-vlan.c,v 1.9 2000/04/13 18:18:52 gram Exp $
* $Id: packet-vlan.c,v 1.10 2000/04/16 22:59:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -68,7 +68,7 @@ capture_vlan(const u_char *pd, int offset, packet_counts *ld ) {
}
}
void
static void
dissect_vlan(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
proto_tree *ti, *vlan_tree = NULL;
guint16 tci,encap_proto;

3
packet-vlan.h
View File

@ -1,6 +1,6 @@
/* packet-vlan.h
*
* $Id: packet-vlan.h,v 1.1 2000/02/15 21:03:26 gram Exp $
* $Id: packet-vlan.h,v 1.2 2000/04/16 22:59:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -23,4 +23,3 @@
*/
void capture_vlan(const u_char *, int, packet_counts *);
void dissect_vlan(const u_char *, int, frame_data *, proto_tree *);