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

From Joerg Mayer: make a pile of stuff not used outside one source file 

static, and add a new "packet-data.h" to declare "proto_data".

Display escape sequences in octal in the IAPP dissector, as is now done
in the RADIUS dissector.

svn path=/trunk/; revision=5441
This commit is contained in:
Guy Harris 2002-05-10 23:20:38 +00:00
parent 42c395b0e2
commit ae88c45ef0
16 changed files with 74 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -89,6 +89,7 @@ Joerg Mayer <jmayer[AT]loplof.de> {
unused in GCC, and as nothing for other compilers
Add _U_ to unused arguments, and turn off "-Wno-unused"
.cvsignore fixes
Make a pile of stuff not used outside one source file static
}
Martin Maciaszek <fastjack[AT]i-s-o.net> {

3
Makefile.am
View File

@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal
#
# $Id: Makefile.am,v 1.428 2002/05/09 23:50:24 gram Exp $
# $Id: Makefile.am,v 1.429 2002/05/10 23:20:37 guy Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
@ -359,6 +359,7 @@ noinst_HEADERS = \
packet-bootparams.h \
packet-chdlc.h \
packet-clip.h \
packet-data.h \
packet-dccp.h \
packet-dcerpc.h \
packet-dcerpc-dfs.h \

10
packet-afs.c
View File

@ -8,7 +8,7 @@
* Portions based on information/specs retrieved from the OpenAFS sources at
* www.openafs.org, Copyright IBM.
*
* $Id: packet-afs.c,v 1.45 2002/05/06 01:25:45 guy Exp $
* $Id: packet-afs.c,v 1.46 2002/05/10 23:20:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -62,7 +62,7 @@
(opcode >= VOTE_LOW && opcode <= VOTE_HIGH) || \
(opcode >= DISK_LOW && opcode <= DISK_HIGH))
int afs_packet_init_count = 100;
static int afs_packet_init_count = 100;
struct afs_request_key {
guint32 conversation, callnumber;
@ -73,9 +73,9 @@ struct afs_request_val {
guint32 opcode;
};
GHashTable *afs_request_hash = NULL;
GMemChunk *afs_request_keys = NULL;
GMemChunk *afs_request_vals = NULL;
static GHashTable *afs_request_hash = NULL;
static GMemChunk *afs_request_keys = NULL;
static GMemChunk *afs_request_vals = NULL;

4
packet-atalk.c
View File

@ -2,7 +2,7 @@
* Routines for AppleTalk packet disassembly: LLAP, DDP, NBP, ATP, ASP,
* RTMP.
*
* $Id: packet-atalk.c,v 1.71 2002/05/08 23:46:33 guy Exp $
* $Id: packet-atalk.c,v 1.72 2002/05/10 23:20:37 guy Exp $
*
* Simon Wilkinson <sxw@dcs.ed.ac.uk>
*
@ -433,7 +433,7 @@ const value_string asp_error_vals[] = {
*
* Are these always in the Mac extended character set?
*/
int dissect_pascal_string(tvbuff_t *tvb, int offset, proto_tree *tree,
static int dissect_pascal_string(tvbuff_t *tvb, int offset, proto_tree *tree,
int hf_index)
{
int len;

4
packet-cops.c
View File

@ -4,7 +4,7 @@
*
* Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi>
*
* $Id: packet-cops.c,v 1.30 2002/05/05 00:16:32 guy Exp $
* $Id: packet-cops.c,v 1.31 2002/05/10 23:20:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -868,7 +868,7 @@ static int dissect_cops_object_data(tvbuff_t *tvb, guint32 offset, proto_tree *t
/*convert hex to binary string (1010....)*/
gchar* xtobstr(guint8 *hex, guint len) {
static gchar* xtobstr(guint8 *hex, guint len) {
guint i=0,j=0,k=0, bit=0;
gchar *binstr=NULL;

3
packet-data.c
View File

@ -2,7 +2,7 @@
* Routines for raw data (default case)
* Gilbert Ramirez <gram@alumni.rice.edu>
*
* $Id: packet-data.c,v 1.28 2002/04/04 05:16:14 guy Exp $
* $Id: packet-data.c,v 1.29 2002/05/10 23:20:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -33,6 +33,7 @@
#include <glib.h>
#include <epan/packet.h>
#include "packet-data.h"
/* proto_data cannot be static because it's referenced in the
* print routines

29
packet-data.h Normal file
View File

@ -0,0 +1,29 @@
/* packet-data.h
*
* $Id: packet-data.h,v 1.1 2002/05/10 23:20:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* 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.
*/
#ifndef __PACKET_DATA_H__
#define __PACKET_DATA_H__
extern int proto_data;
#endif /* __PACKET_DATA_H__ */

4
packet-dcerpc-netlogon.c
View File

@ -3,7 +3,7 @@
* Copyright 2001, Tim Potter <tpot@samba.org>
* 2002 structure and command dissectors by Ronnie Sahlberg
*
* $Id: packet-dcerpc-netlogon.c,v 1.20 2002/05/04 10:41:16 guy Exp $
* $Id: packet-dcerpc-netlogon.c,v 1.21 2002/05/10 23:20:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -238,7 +238,7 @@ netlogon_dissect_pointer_STRING(tvbuff_t *tvb, int offset,
return offset;
}
int
static int
netlogon_dissect_UNICODE_STRING(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *parent_tree,
char *drep, int type, int hf_index, int levels)

4
packet-diameter.c
View File

@ -1,7 +1,7 @@
/* packet-diameter.c
* Routines for Diameter packet disassembly
*
* $Id: packet-diameter.c,v 1.47 2002/05/02 19:32:19 guy Exp $
* $Id: packet-diameter.c,v 1.48 2002/05/10 23:20:38 guy Exp $
*
* Copyright (c) 2001 by David Frascone <dave@frascone.com>
*
@ -881,7 +881,7 @@ diameter_app_to_str(guint32 vendorId) {
} /*diameter_app_to_str */
/* return an avp type, based on the code */
diameterDataType
static diameterDataType
diameter_avp_get_type(guint32 avpCode, guint32 vendorId){
avpInfo *probe;
gchar *vendorName=NULL;

6
packet-dsi.c
View File

@ -2,7 +2,7 @@
* Routines for dsi packet dissection
* Copyright 2001, Randy McEoin <rmceoin@pe.com>
*
* $Id: packet-dsi.c,v 1.20 2002/05/08 23:46:34 guy Exp $
* $Id: packet-dsi.c,v 1.21 2002/05/10 23:20:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -95,7 +95,7 @@ static gint ett_dsi_open = -1;
static gint ett_dsi_attn = -1;
static gint ett_dsi_attn_flag = -1;
const value_string dsi_attn_flag_vals[] = {
static const value_string dsi_attn_flag_vals[] = {
{0x0, "Reserved" }, /* 0000 */
{0x1, "Reserved" }, /* 0001 */
{0x2, "Server message" }, /* 0010 */
@ -107,7 +107,7 @@ const value_string dsi_attn_flag_vals[] = {
{0x11,"Server is shutting down, message,no reconnect"}, /* 1011 */
{0, NULL } };
const value_string dsi_open_type_vals[] = {
static const value_string dsi_open_type_vals[] = {
{0, "Server quantum" },
{1, "Attention quantum" },
{0, NULL } };

8
packet-dvmrp.c
View File

@ -1,7 +1,7 @@
/* packet-dvmrp.c 2001 Ronnie Sahlberg <See AUTHORS for email>
* Routines for IGMP/DVMRP packet disassembly
*
* $Id: packet-dvmrp.c,v 1.10 2002/05/02 09:34:33 guy Exp $
* $Id: packet-dvmrp.c,v 1.11 2002/05/10 23:20:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -221,7 +221,7 @@ static const true_false_string tfs_cap_netmask = {
"NOT Netmask capable"
};
int
static int
dissect_v3_report(tvbuff_t *tvb, proto_tree *parent_tree, int offset)
{
guint8 m0,m1,m2,m3;
@ -306,7 +306,7 @@ dissect_v3_report(tvbuff_t *tvb, proto_tree *parent_tree, int offset)
return offset;
}
int
static int
dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset)
{
guint8 code,count;
@ -446,7 +446,7 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int
}
int
static int
dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset)
{
guint8 code;

20
packet-gtp.c
View File

@ -4,7 +4,7 @@
* Copyright 2001, Michal Melerowicz <michal.melerowicz@nokia.com>
* Nicolas Balkota <balkota@mac.com>
*
* $Id: packet-gtp.c,v 1.27 2002/05/02 11:05:44 guy Exp $
* $Id: packet-gtp.c,v 1.28 2002/05/10 23:20:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -1465,7 +1465,7 @@ typedef struct {
guint32 teid;
} _gtpv1_hdr;
struct gcdr_ { /* GCDR 118B */
static struct gcdr_ { /* GCDR 118B */
guint8 imsi[8];
guint32 ggsnaddr;
guint32 chrgid;
@ -1496,7 +1496,7 @@ typedef struct change_ {
guint8 qos_neg[3];
} change_t;
struct _scdr { /* SCDR 277B */
static struct _scdr { /* SCDR 277B */
guint16 len;
guint8 netini;
guint8 anon;
@ -1541,7 +1541,7 @@ typedef struct mmchange_ {
guint8 omit[8];
} mmchange_t;
struct _mcdr { /* MCDR 147B */
static struct _mcdr { /* MCDR 147B */
guint16 len;
guint8 imsilen;
guint8 imsi[8];
@ -1572,7 +1572,7 @@ struct _mcdr { /* MCDR 147B */
guint32 seqno;
} mcdr;
struct _socdr { /* SOCDR 80B */
static struct _socdr { /* SOCDR 80B */
guint16 len;
guint8 imsilen;
guint8 imsi[8];
@ -1595,7 +1595,7 @@ struct _socdr { /* SOCDR 80B */
} socdr;
struct _stcdr { /* STCDR 79B */
static struct _stcdr { /* STCDR 79B */
guint16 len;
guint8 imsilen;
guint8 imsi[8];
@ -1616,8 +1616,8 @@ struct _stcdr { /* STCDR 79B */
guint16 smsres;
} stcdr;
guint8 gtp_version = 0;
char *yesno[] = { "False", "True" };
static guint8 gtp_version = 0;
static char *yesno[] = { "False", "True" };
static void
col_append_str_gtp(column_info *cinfo, gint el, gchar *proto_name) {
@ -1693,7 +1693,7 @@ msisdn_to_str(const guint8 *ad, int len) {
return (gchar *)&str[0];
}
gchar *
static gchar *
time_int_to_str (guint32 time)
{
@ -1705,7 +1705,7 @@ time_int_to_str (guint32 time)
return abs_time_to_str (&nstime);
}
gchar *
static gchar *
rel_time_int_to_str (guint32 time)
{

4
packet-hclnfsd.c
View File

@ -2,7 +2,7 @@
* Routines for hclnfsd (Hummingbird NFS Daemon) dissection
* Copyright 2001, Mike Frisch <frisch@hummingbird.com>
*
* $Id: packet-hclnfsd.c,v 1.13 2002/04/25 21:29:13 guy Exp $
* $Id: packet-hclnfsd.c,v 1.14 2002/05/10 23:20:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -150,7 +150,7 @@ static const value_string names_request_type[] = {
{ 0, NULL }
};
void
static void
hclnfsd_decode_obscure(char *ident, int ident_len)
{
int j, x, y;

7
packet-iapp.c
View File

@ -2,7 +2,7 @@
* Routines for IAPP dissection
* Copyright 2002, Alfred Arnold <aarnold@elsa.de>
*
* $Id: packet-iapp.c,v 1.2 2002/04/29 08:20:08 guy Exp $
* $Id: packet-iapp.c,v 1.3 2002/05/10 23:20:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -198,7 +198,8 @@ static value_string iapp_auth_type_vals[] = {
static gchar textbuffer[2000];
gchar *iaconvertbufftostr(gchar *dest, tvbuff_t *tvb, int offset, int length)
static gchar*
iaconvertbufftostr(gchar *dest, tvbuff_t *tvb, int offset, int length)
{
/*converts the raw buffer into printable text */
guint32 i;
@ -217,7 +218,7 @@ gchar *iaconvertbufftostr(gchar *dest, tvbuff_t *tvb, int offset, int length)
}
else
{
sprintf(&(dest[totlen]), "\\%03u", pd[i]);
sprintf(&(dest[totlen]), "\\%03o", pd[i]);
totlen=totlen+strlen(&(dest[totlen]));
}
}

4
packet-ipsec.c
View File

@ -1,7 +1,7 @@
/* packet-ipsec.c
* Routines for IPsec/IPComp packet disassembly
*
* $Id: packet-ipsec.c,v 1.38 2002/01/24 09:20:48 guy Exp $
* $Id: packet-ipsec.c,v 1.39 2002/05/10 23:20:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -46,7 +46,7 @@
#include "prefs.h"
/* Place AH payload in sub tree */
gboolean g_ah_payload_in_subtree = FALSE;
static gboolean g_ah_payload_in_subtree = FALSE;
static int proto_ah = -1;
static int hf_ah_spi = -1;

6
print.c
View File

@ -1,7 +1,7 @@
/* print.c
* Routines for printing packet analysis trees.
*
* $Id: print.c,v 1.45 2002/04/02 05:07:36 guy Exp $
* $Id: print.c,v 1.46 2002/05/10 23:20:38 guy Exp $
*
* Gilbert Ramirez <gram@alumni.rice.edu>
*
@ -40,6 +40,7 @@
#include "ps.h"
#include "util.h"
#include <epan/tvbuff.h>
#include "packet-data.h"
static void proto_tree_print_node_text(GNode *node, gpointer data);
static void proto_tree_print_node_ps(GNode *node, gpointer data);
@ -50,9 +51,6 @@ static void print_hex_data_text(FILE *fh, register const u_char *cp,
static void print_hex_data_ps(FILE *fh, register const u_char *cp,
register u_int length, char_enc encoding);
extern int proto_data; /* in packet-data.c */
typedef struct {
int level;
FILE *fh;