aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packet-cops.c4
-rw-r--r--packet-hsrp.c8
-rw-r--r--packet-ip.c6
-rw-r--r--packet-kerberos.c14
-rw-r--r--packet-l2tp.c3
-rw-r--r--packet-ldap.c7
-rw-r--r--packet-mip.c6
-rw-r--r--packet-ncp.c3
-rw-r--r--packet-nfs.c37
-rw-r--r--packet-ospf.c3
-rw-r--r--packet-rsvp.c18
-rw-r--r--packet-rx.c5
-rw-r--r--packet-smb.c11
-rw-r--r--packet-sna.c43
-rw-r--r--packet-snmp.c5
-rw-r--r--packet-srvloc.c4
-rw-r--r--packet-vrrp.c11
-rw-r--r--packet-wsp.c10
-rw-r--r--packet-wtp.c13
19 files changed, 139 insertions, 72 deletions
diff --git a/packet-cops.c b/packet-cops.c
index 154b73532b..93500682dc 100644
--- a/packet-cops.c
+++ b/packet-cops.c
@@ -4,7 +4,7 @@
*
* Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-cops.c,v 1.8 2001/01/03 06:55:27 guy Exp $
+ * $Id: packet-cops.c,v 1.9 2001/01/03 16:41:06 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -185,6 +185,7 @@ static const value_string cops_error_vals[] = {
{13, "Unknown COPS Object" },
{14, "Authentication Failure" },
{15, "Authentication Required" },
+ {0, NULL },
};
/* Report-Type from Report-Type object */
@@ -192,6 +193,7 @@ static const value_string cops_report_type_vals[] = {
{1, " Success : Decision was successful at the PEP" },
{2, " Failure : Decision could not be completed by PEP" },
{3, " Accounting: Accounting update for an installed state" },
+ {0, NULL },
};
/* Initialize the protocol and registered fields */
diff --git a/packet-hsrp.c b/packet-hsrp.c
index 4980566960..ad18bb48ad 100644
--- a/packet-hsrp.c
+++ b/packet-hsrp.c
@@ -4,7 +4,7 @@
*
* Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-hsrp.c,v 1.13 2001/01/03 06:55:28 guy Exp $
+ * $Id: packet-hsrp.c,v 1.14 2001/01/03 16:41:06 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -82,7 +82,8 @@ struct hsrp_packet { /* Multicast to 224.0.0.2, TTL 1, UDP, port 1985 *
static const value_string hsrp_opcode_vals[] = {
{HSRP_OPCODE_HELLO, "Hello"},
{HSRP_OPCODE_COUP, "Coup"},
- {HSRP_OPCODE_RESIGN, "Resign"}
+ {HSRP_OPCODE_RESIGN, "Resign"},
+ {0, NULL},
};
#define HSRP_STATE_INITIAL 0
@@ -97,7 +98,8 @@ static const value_string hsrp_state_vals[] = {
{HSRP_STATE_LISTEN, "Listen"},
{HSRP_STATE_SPEAK, "Speak"},
{HSRP_STATE_STANDBY, "Standby"},
- {HSRP_STATE_ACTIVE, "Active"}
+ {HSRP_STATE_ACTIVE, "Active"},
+ {0, NULL},
};
static void
diff --git a/packet-ip.c b/packet-ip.c
index be3d51c15b..78b5f4dd51 100644
--- a/packet-ip.c
+++ b/packet-ip.c
@@ -1,7 +1,7 @@
/* packet-ip.c
* Routines for IP and miscellaneous IP protocol packet disassembly
*
- * $Id: packet-ip.c,v 1.117 2001/01/03 07:53:43 guy Exp $
+ * $Id: packet-ip.c,v 1.118 2001/01/03 16:41:06 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -523,7 +523,9 @@ dissect_ipopt_ra(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
/* Router-Alert, as defined by RFC2113 */
int opt = tvb_get_ntohs(tvb, offset + 2);
static const value_string ra_opts[] = {
- {0, "Every router examines packet"} };
+ {0, "Every router examines packet"},
+ {0, NULL}
+ };
proto_tree_add_text(opt_tree, tvb, offset, optlen,
"%s: %s", optp->name, val_to_str(opt, ra_opts, "Unknown (%d)"));
diff --git a/packet-kerberos.c b/packet-kerberos.c
index 8fa584fcc3..011a1bdf31 100644
--- a/packet-kerberos.c
+++ b/packet-kerberos.c
@@ -3,7 +3,7 @@
* Wes Hardaker (c) 2000
* wjhardaker@ucdavis.edu
*
- * $Id: packet-kerberos.c,v 1.12 2001/01/03 06:55:29 guy Exp $
+ * $Id: packet-kerberos.c,v 1.13 2001/01/03 16:41:06 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -265,7 +265,8 @@ static const value_string krb5_error_codes[] = {
{ KRB5_ET_KRB5KRB_AP_ERR_BADSEQ, "KRB5KRB_AP_ERR_BADSEQ" },
{ KRB5_ET_KRB5KRB_AP_ERR_INAPP_CKSUM, "KRB5KRB_AP_ERR_INAPP_CKSUM" },
{ KRB5_ET_KRB5KRB_ERR_GENERIC, "KRB5KRB_ERR_GENERIC" },
- { KRB5_ET_KRB5KRB_ERR_FIELD_TOOLONG, "KRB5KRB_ERR_FIELD_TOOLONG" }
+ { KRB5_ET_KRB5KRB_ERR_FIELD_TOOLONG, "KRB5KRB_ERR_FIELD_TOOLONG" },
+ { 0, NULL }
};
@@ -276,6 +277,7 @@ static const value_string krb5_princ_types[] = {
{ KRB5_NT_SRV_HST , "Service and Host" },
{ KRB5_NT_SRV_XHST , "Service and Host Components" },
{ KRB5_NT_UID , "Unique ID" },
+ { 0 , NULL },
};
static const value_string krb5_preauthentication_types[] = {
@@ -293,6 +295,7 @@ static const value_string krb5_preauthentication_types[] = {
{ KRB5_PA_SAM_CHALLENGE , "PA-SAM-CHALLENGE" },
{ KRB5_PA_SAM_RESPONSE , "PA-SAM-RESPONSE" },
{ KRB5_PA_DASS , "PA-DASS" },
+ { 0 , NULL },
};
static const value_string krb5_encryption_types[] = {
@@ -307,6 +310,7 @@ static const value_string krb5_encryption_types[] = {
{ KRB5_ENCTYPE_DES3_CBC_SHA1 , "des3-cbc-sha1" },
{ KRB5_ENCTYPE_UNKNOWN , "unknown" },
{ KRB5_ENCTYPE_LOCAL_DES3_HMAC_SHA1 , "local-des3-hmac-sha1" },
+ { 0 , NULL },
};
static const value_string krb5_address_types[] = {
@@ -315,7 +319,8 @@ static const value_string krb5_address_types[] = {
{ KRB5_ADDR_XEROX, "XEROX"},
{ KRB5_ADDR_ISO, "ISO"},
{ KRB5_ADDR_DECNET, "DECNET"},
- { KRB5_ADDR_APPLETALK, "APPLETALK"}
+ { KRB5_ADDR_APPLETALK, "APPLETALK"},
+ { 0, NULL },
};
static const value_string krb5_msg_types[] = {
@@ -328,7 +333,8 @@ static const value_string krb5_msg_types[] = {
{ KRB5_MSG_SAFE, "KRB-SAFE" },
{ KRB5_MSG_PRIV, "KRB-PRIV" },
{ KRB5_MSG_CRED, "KRB-CRED" },
- { KRB5_MSG_ERROR, "KRB-ERROR" }
+ { KRB5_MSG_ERROR, "KRB-ERROR" },
+ { 0, NULL },
};
static int dissect_PrincipalName(char *title, ASN1_SCK *asn1p,
diff --git a/packet-l2tp.c b/packet-l2tp.c
index 57e25869e1..ff5541cf86 100644
--- a/packet-l2tp.c
+++ b/packet-l2tp.c
@@ -7,7 +7,7 @@
* Laurent Cazalet <laurent.cazalet@mailclub.net>
* Thomas Parvais <thomas.parvais@advalvas.be>
*
- * $Id: packet-l2tp.c,v 1.18 2001/01/03 06:55:29 guy Exp $
+ * $Id: packet-l2tp.c,v 1.19 2001/01/03 16:41:06 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -148,6 +148,7 @@ static const char *data_msg = "Data Message";
static const value_string l2tp_type_vals[] = {
{ 0, "Data Message" },
{ 1, "Control Message" },
+ { 0, NULL },
};
static const true_false_string l2tp_length_bit_truth =
diff --git a/packet-ldap.c b/packet-ldap.c
index 1c9f1d06a1..afe4bf0c4f 100644
--- a/packet-ldap.c
+++ b/packet-ldap.c
@@ -1,7 +1,7 @@
/* packet-ldap.c
* Routines for ldap packet dissection
*
- * $Id: packet-ldap.c,v 1.19 2001/01/03 06:55:29 guy Exp $
+ * $Id: packet-ldap.c,v 1.20 2001/01/03 16:41:06 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -133,6 +133,7 @@ static value_string msgTypes [] = {
{LDAP_RES_MODRDN, "Modify RDN Result"},
{LDAP_RES_COMPARE, "Compare Result"},
{LDAP_REQ_EXTENDED, "Extended Response"},
+ {0, NULL},
};
static int read_length(ASN1_SCK *a, proto_tree *tree, int hf_id, guint *len)
@@ -1035,6 +1036,7 @@ proto_register_ldap(void)
{69, "Objectclass modification prohibited"},
{71, "Affects multiple DSAs"},
{80, "Other"},
+ {0, NULL},
};
static value_string auth_types[] = {
@@ -1042,12 +1044,14 @@ proto_register_ldap(void)
{LDAP_AUTH_KRBV4LDAP, "Kerberos V4 to the LDAP server"},
{LDAP_AUTH_KRBV4DSA, "Kerberos V4 to the DSA"},
{LDAP_AUTH_SASL, "SASL"},
+ {0, NULL},
};
static value_string search_scope[] = {
{0x00, "Base"},
{0x01, "Single"},
{0x02, "Subtree"},
+ {0x00, NULL},
};
static value_string search_dereference[] = {
@@ -1055,6 +1059,7 @@ proto_register_ldap(void)
{0x01, "Searching"},
{0x02, "Base Object"},
{0x03, "Always"},
+ {0x00, NULL},
};
static hf_register_info hf[] = {
diff --git a/packet-mip.c b/packet-mip.c
index 30839ecc2a..56a473df46 100644
--- a/packet-mip.c
+++ b/packet-mip.c
@@ -2,7 +2,7 @@
* Routines for Mobile IP dissection
* Copyright 2000, Stefan Raab <Stefan.Raab@nextel.com>
*
- * $Id: packet-mip.c,v 1.10 2001/01/03 06:55:30 guy Exp $
+ * $Id: packet-mip.c,v 1.11 2001/01/03 16:41:06 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
@@ -101,7 +101,8 @@ struct mip_reply_packet{
static const value_string mip_types[] = {
{1, "Registration Request"},
- {3, "Registration Reply"}
+ {3, "Registration Reply"},
+ {0, NULL},
};
static const value_string mip_reply_codes[]= {
@@ -130,6 +131,7 @@ static const value_string mip_reply_codes[]= {
{134, "Registration Denied by HA, poorly formed request"},
{135, "Registration Denied by HA, too many simul bindings"},
{136, "Registration Denied by HA, unknown HA address"},
+ {0, NULL},
};
/* Code to actually dissect the packets */
diff --git a/packet-ncp.c b/packet-ncp.c
index b1f8b910e5..e204ea35c0 100644
--- a/packet-ncp.c
+++ b/packet-ncp.c
@@ -3,7 +3,7 @@
* Gilbert Ramirez <gram@xiexie.org>
* Modified to allow NCP over TCP/IP decodes by James Coe <jammer@cin.net>
*
- * $Id: packet-ncp.c,v 1.44 2001/01/03 07:53:43 guy Exp $
+ * $Id: packet-ncp.c,v 1.45 2001/01/03 16:41:06 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -86,6 +86,7 @@ struct ncp_ip_rqhdr {
static const value_string ncp_ip_signature[] = {
{ NCPIP_RQST, "Demand Transport (Request)" },
{ NCPIP_RPLY, "Transport is NCP (Reply)" },
+ { 0, NULL },
};
/* The information in this module comes from:
diff --git a/packet-nfs.c b/packet-nfs.c
index 30e0240ddc..27c925e7bd 100644
--- a/packet-nfs.c
+++ b/packet-nfs.c
@@ -3,7 +3,7 @@
* Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de>
* Copyright 2000, Mike Frisch <frisch@hummingbird.com> (NFSv4 decoding)
*
- * $Id: packet-nfs.c,v 1.40 2001/01/03 06:55:30 guy Exp $
+ * $Id: packet-nfs.c,v 1.41 2001/01/03 16:41:06 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -216,16 +216,16 @@ static gint ett_nfs_bitmap4 = -1;
/* file handle dissection */
+#define FHT_UNKNOWN 0
+#define FHT_SVR4 1
+#define FHT_LINUX_KNFSD_LE 2
+#define FHT_LINUX_NFSD_LE 3
const value_string names_fhtype[] =
{
-#define FHT_UNKNOWN 0
{ FHT_UNKNOWN, "unknown" },
-#define FHT_SVR4 1
{ FHT_SVR4, "System V R4" },
-#define FHT_LINUX_KNFSD_LE 2
{ FHT_LINUX_KNFSD_LE, "Linux knfsd (little-endian)" },
-#define FHT_LINUX_NFSD_LE 3
{ FHT_LINUX_NFSD_LE, "Linux user-land nfsd (little-endian)" },
{ 0, NULL }
};
@@ -3550,14 +3550,15 @@ dissect_nfs_open_claim_delegate_cur4(const u_char *pd, int offset,
return offset;
}
+#define CLAIM_NULL 0
+#define CLAIM_PREVIOUS 1
+#define CLAIM_DELEGATE_CUR 2
+#define CLAIM_DELEGATE_PREV 3
+
static const value_string names_claim_type4[] = {
-#define CLAIM_NULL 0
- { CLAIM_NULL, "CLAIM_NULL" },
-#define CLAIM_PREVIOUS 1
- { CLAIM_PREVIOUS, "CLAIM_PREVIOUS" },
-#define CLAIM_DELEGATE_CUR 2
+ { CLAIM_NULL, "CLAIM_NULL" },
+ { CLAIM_PREVIOUS, "CLAIM_PREVIOUS" },
{ CLAIM_DELEGATE_CUR, "CLAIM_DELEGATE_CUR" },
-#define CLAIM_DELEGATE_PREV 3
{ CLAIM_DELEGATE_PREV, "CLAIM_DELEGATE_PREV" },
{ 0, NULL }
};
@@ -3643,10 +3644,10 @@ dissect_nfs_createhow4(const u_char *pd, int offset, frame_data *fd,
return offset;
}
-static const value_string names_opentype4[] = {
#define OPEN4_NOCREATE 0
- { OPEN4_NOCREATE, "OPEN4_NOCREATE" },
#define OPEN4_CREATE 1
+static const value_string names_opentype4[] = {
+ { OPEN4_NOCREATE, "OPEN4_NOCREATE" },
{ OPEN4_CREATE, "OPEN4_CREATE" },
{ 0, NULL }
};
@@ -4230,10 +4231,10 @@ dissect_nfs_modified_limit4(const u_char *pd, int offset, frame_data *fd,
return dissect_rpc_uint32(pd, offset, fd, tree, "bytes_per_block");
}
-static const value_string names_limit_by4[] = {
#define NFS_LIMIT_SIZE 1
- { NFS_LIMIT_SIZE, "NFS_LIMIT_SIZE" },
#define NFS_LIMIT_BLOCKS 2
+static const value_string names_limit_by4[] = {
+ { NFS_LIMIT_SIZE, "NFS_LIMIT_SIZE" },
{ NFS_LIMIT_BLOCKS, "NFS_LIMIT_BLOCKS" },
{ 0, NULL }
};
@@ -4275,12 +4276,12 @@ dissect_nfs_open_write_delegation4(const u_char *pd, int offset,
return dissect_nfs_ace4(pd, offset, fd, tree, "permissions");
}
-static const value_string names_open_delegation_type4[] = {
#define OPEN_DELEGATE_NONE 0
- { OPEN_DELEGATE_NONE, "OPEN_DELEGATE_NONE" },
#define OPEN_DELEGATE_READ 1
- { OPEN_DELEGATE_READ, "OPEN_DELEGATE_READ" },
#define OPEN_DELEGATE_WRITE 2
+static const value_string names_open_delegation_type4[] = {
+ { OPEN_DELEGATE_NONE, "OPEN_DELEGATE_NONE" },
+ { OPEN_DELEGATE_READ, "OPEN_DELEGATE_READ" },
{ OPEN_DELEGATE_WRITE, "OPEN_DELEGATE_WRITE" },
{ 0, NULL }
};
diff --git a/packet-ospf.c b/packet-ospf.c
index e353956e25..eeb18e07be 100644
--- a/packet-ospf.c
+++ b/packet-ospf.c
@@ -2,7 +2,7 @@
* Routines for OSPF packet disassembly
* (c) Copyright Hannes R. Boehm <hannes@boehm.org>
*
- * $Id: packet-ospf.c,v 1.33 2001/01/03 06:55:30 guy Exp $
+ * $Id: packet-ospf.c,v 1.34 2001/01/03 16:41:07 gram Exp $
*
* At this time, this module is able to analyze OSPF
* packets as specified in RFC2328. MOSPF (RFC1584) and other
@@ -500,6 +500,7 @@ static const value_string mpls_link_stlv_str[] = {
{MPLS_LINK_MAX_RES_BW, "Maximum Reservable Bandwidth"},
{MPLS_LINK_UNRES_BW, "Unreserved Bandwidth"},
{MPLS_LINK_COLOR, "Resource Class/Color"},
+ {0, NULL},
};
/*
diff --git a/packet-rsvp.c b/packet-rsvp.c
index e277cff052..a0f0ac73ce 100644
--- a/packet-rsvp.c
+++ b/packet-rsvp.c
@@ -3,7 +3,7 @@
*
* (c) Copyright Ashok Narayanan <ashokn@cisco.com>
*
- * $Id: packet-rsvp.c,v 1.29 2001/01/03 06:55:31 guy Exp $
+ * $Id: packet-rsvp.c,v 1.30 2001/01/03 16:41:07 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -119,7 +119,8 @@ static value_string message_type_vals[] = {
{RSVP_MSG_PTEAR, "PATH TEAR Message"},
{RSVP_MSG_RTEAR, "RESV TEAR Message"},
{RSVP_MSG_CONFIRM, "CONFIRM Message"},
- {RSVP_MSG_RTEAR_CONFIRM, "RESV TEAR CONFIRM Message"}
+ {RSVP_MSG_RTEAR_CONFIRM, "RESV TEAR CONFIRM Message"},
+ {0, NULL}
};
/*
@@ -174,6 +175,7 @@ static value_string rsvp_class_vals[] = {
{RSVP_CLASS_EXPLICIT_ROUTE, "EXPLICIT ROUTE object"},
{RSVP_CLASS_RECORD_ROUTE, "RECORD ROUTE object"},
{RSVP_CLASS_SESSION_ATTRIBUTE, "SESSION ATTRIBUTE object"},
+ {0, NULL}
};
/*
@@ -211,7 +213,8 @@ static value_string rsvp_error_vals[] = {
{RSVP_ERROR_UNKNOWN_CLASS, "Unknown object class"},
{RSVP_ERROR_UNKNOWN_C_TYPE, "Unknown object C-type"},
{RSVP_ERROR_TRAFFIC, "Traffic Control Error"},
- {RSVP_ERROR_TRAFFIC_SYSTEM, "Traffic Control System Error"}
+ {RSVP_ERROR_TRAFFIC_SYSTEM, "Traffic Control System Error"},
+ {0, NULL}
};
/*
@@ -233,7 +236,8 @@ static value_string rsvp_error_vals[] = {
static value_string style_vals[] = {
{ RSVP_WF, "Wildcard Filter" },
{ RSVP_FF, "Fixed Filter" },
- { RSVP_SE, "Shared-Explicit" }
+ { RSVP_SE, "Shared-Explicit" },
+ { 0, NULL }
};
/*------------------------------*
@@ -407,12 +411,14 @@ static value_string qos_vals[] = {
{ QOS_CONTROLLED_LOAD, "Controlled-load QoS" },
{ QOS_GUARANTEED, "Guaranteed rate QoS" },
{ QOS_TSPEC, "Traffic specification" },
+ { 0, NULL }
};
static value_string svc_vals[] = {
{ 127, "Token bucket TSpec" },
{ 128, "Qualitative TSpec" },
- { 130, "Guaranteed-rate RSpec" }
+ { 130, "Guaranteed-rate RSpec" },
+ { 0, NULL }
};
enum rsvp_spec_types { INTSRV = 2 };
@@ -429,6 +435,7 @@ static value_string intsrv_services_str[] = {
{INTSRV_GTD, "Guaranteed"},
{INTSRV_CLOAD, "Controlled Load"},
{INTSRV_QUALITATIVE, "Qualitative"},
+ { 0, NULL }
};
enum intsrv_field_name {
@@ -543,6 +550,7 @@ static value_string adspec_params[] = {
{134, "End-to-end composed value for D"},
{135, "Since-last-reshaping point composed C"},
{136, "Since-last-reshaping point composed D"},
+ { 0, NULL }
};
/* -------------------- Stuff for MPLS/TE objects -------------------- */
diff --git a/packet-rx.c b/packet-rx.c
index 544ad2cd33..92c79339ac 100644
--- a/packet-rx.c
+++ b/packet-rx.c
@@ -4,7 +4,7 @@
* Based on routines from tcpdump patches by
* Ken Hornstein <kenh@cmf.nrl.navy.mil>
*
- * $Id: packet-rx.c,v 1.16 2001/01/03 06:55:31 guy Exp $
+ * $Id: packet-rx.c,v 1.17 2001/01/03 16:41:07 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -71,7 +71,8 @@ static const value_string rx_flags[] = {
{ RX_REQUEST_ACK, "req-ack" },
{ RX_LAST_PACKET, "last-pckt" },
{ RX_MORE_PACKETS, "more-pckts" },
- { RX_FREE_PACKET, "free-pckt" }
+ { RX_FREE_PACKET, "free-pckt" },
+ { 0, NULL }
};
static int proto_rx = -1;
diff --git a/packet-smb.c b/packet-smb.c
index e6a4ec43bc..b8e34f41af 100644
--- a/packet-smb.c
+++ b/packet-smb.c
@@ -2,7 +2,7 @@
* Routines for smb packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-smb.c,v 1.77 2001/01/03 06:55:32 guy Exp $
+ * $Id: packet-smb.c,v 1.78 2001/01/03 16:41:07 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -421,6 +421,7 @@ static const value_string smb_cmd_vals[] = {
{ 0xFD, "unknown-0xFD" },
{ 0xFE, "SMBinvalid" },
{ 0xFF, "unknown-0xFF" },
+ { 0x00, NULL },
};
char *SMB_names[256] = {
@@ -10447,7 +10448,7 @@ static const value_string errcls_types[] = {
{ SMB_ERRSRV, "Server Error"},
{ SMB_ERRHRD, "Hardware Error"},
{ SMB_ERRCMD, "Command Error - Not an SMB format command"},
- { 0, 0}
+ { 0, NULL }
};
char *decode_smb_name(unsigned char cmd)
@@ -10491,7 +10492,7 @@ static const value_string DOS_errors[] = {
{SMBE_notify_buf_small, "Buffer too small to return change notify."},
{SMBE_unknownipc, "Unknown IPC Operation"},
{SMBE_noipc, "Don't support ipc"},
- {0, 0}
+ {0, NULL}
};
/* Error codes for the ERRSRV class */
@@ -10529,7 +10530,7 @@ static const value_string SRV_errors[] = {
{SMBE_contMPX, "Resume MPX mode"},
{SMBE_badPW, "Bad Password???"},
{SMBE_nosupport, "Operation not supported"},
- { 0, 0}
+ { 0, NULL}
};
/* Error codes for the ERRHRD class */
@@ -10554,7 +10555,7 @@ static const value_string HRD_errors[] = {
{SMBE_FCBunavail, "FCB unavailable???"},
{SMBE_sharebufexc, "Share buffer excluded???"},
{SMBE_diskfull, "Disk full???"},
- {0, 0}
+ {0, NULL}
};
char *decode_smb_error(guint8 errcls, guint16 errcode)
diff --git a/packet-sna.c b/packet-sna.c
index 8d0910b7fb..0f3b089a99 100644
--- a/packet-sna.c
+++ b/packet-sna.c
@@ -2,7 +2,7 @@
* Routines for SNA
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-sna.c,v 1.20 2001/01/03 06:55:32 guy Exp $
+ * $Id: packet-sna.c,v 1.21 2001/01/03 16:41:07 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -111,7 +111,7 @@ static int hf_sna_rh_csi = -1;
static int hf_sna_rh_edi = -1;
static int hf_sna_rh_pdi = -1;
static int hf_sna_rh_cebi = -1;
-static int hf_sna_ru = -1;
+/*static int hf_sna_ru = -1;*/
static gint ett_sna = -1;
static gint ett_sna_th = -1;
@@ -145,13 +145,15 @@ static const value_string sna_th_mpf_vals[] = {
/* Expedited Flow Indicator */
static const value_string sna_th_efi_vals[] = {
{ 0, "Normal Flow" },
- { 1, "Expedited Flow" }
+ { 1, "Expedited Flow" },
+ { 0x0, NULL }
};
/* Request/Response Indicator */
static const value_string sna_rh_rri_vals[] = {
{ 0, "Request" },
- { 1, "Response" }
+ { 1, "Response" },
+ { 0x0, NULL }
};
/* Request/Response Unit Category */
@@ -160,6 +162,7 @@ static const value_string sna_rh_ru_category_vals[] = {
{ 0x01, "Network Control (NC)" },
{ 0x10, "Data Flow Control (DFC)" },
{ 0x11, "Session Control (SC)" },
+ { 0x0, NULL }
};
/* Format Indicator */
@@ -197,31 +200,36 @@ static const true_false_string sna_rh_qri_truth =
/* Code Selection Indicator */
static const value_string sna_rh_csi_vals[] = {
{ 0, "EBCDIC" },
- { 1, "ASCII" }
+ { 1, "ASCII" },
+ { 0x0, NULL }
};
/* TG Sweep */
static const value_string sna_th_tg_sweep_vals[] = {
{ 0, "This PIU may overtake any PU ahead of it." },
- { 1, "This PIU does not ovetake any PIU ahead of it." }
+ { 1, "This PIU does not ovetake any PIU ahead of it." },
+ { 0x0, NULL }
};
/* ER_VR_SUPP_IND */
static const value_string sna_th_er_vr_supp_ind_vals[] = {
{ 0, "Each node supports ER and VR protocols" },
- { 1, "Includes at least one node that does not support ER and VR protocols" }
+ { 1, "Includes at least one node that does not support ER and VR protocols" },
+ { 0x0, NULL }
};
/* VR_PAC_CNT_IND */
static const value_string sna_th_vr_pac_cnt_ind_vals[] = {
{ 0, "Pacing count on the VR has not reached 0" },
- { 1, "Pacing count on the VR has reached 0" }
+ { 1, "Pacing count on the VR has reached 0" },
+ { 0x0, NULL }
};
/* NTWK_PRTY */
static const value_string sna_th_ntwk_prty_vals[] = {
{ 0, "PIU flows at a lower priority" },
- { 1, "PIU flows at network priority (highest transmission priority)" }
+ { 1, "PIU flows at network priority (highest transmission priority)" },
+ { 0x0, NULL }
};
/* TGSF */
@@ -229,7 +237,8 @@ static const value_string sna_th_tgsf_vals[] = {
{ 0x00, "Not segmented" },
{ 0x01, "Last segment" },
{ 0x10, "First segment" },
- { 0x11, "Middle segment" }
+ { 0x11, "Middle segment" },
+ { 0x0, NULL }
};
/* PIUBF */
@@ -237,13 +246,15 @@ static const value_string sna_th_piubf_vals[] = {
{ 0x00, "Single PIU frame" },
{ 0x01, "Last PIU of a multiple PIU frame" },
{ 0x10, "First PIU of a multiple PIU frame" },
- { 0x11, "Middle PIU of a multiple PIU frame" }
+ { 0x11, "Middle PIU of a multiple PIU frame" },
+ { 0x0, NULL }
};
/* NLPOI */
static const value_string sna_th_nlpoi_vals[] = {
{ 0x0, "NLP starts within this FID4 TH" },
{ 0x1, "NLP byte 0 starts after RH byte 0 following NLP C/P pad" },
+ { 0x0, NULL }
};
/* TPF */
@@ -251,12 +262,14 @@ static const value_string sna_th_tpf_vals[] = {
{ 0x00, "Low Priority" },
{ 0x01, "Medium Priority" },
{ 0x10, "High Priority" },
+ { 0x0, NULL }
};
/* VR_CWI */
static const value_string sna_th_vr_cwi_vals[] = {
{ 0x0, "Increment window size" },
{ 0x1, "Decrement window size" },
+ { 0x0, NULL }
};
/* TG_NONFIFO_IND */
@@ -268,6 +281,7 @@ static const value_string sna_th_vr_sqti_vals[] = {
{ 0x00, "Non-sequenced, Non-supervisory" },
{ 0x01, "Non-sequenced, Supervisory" },
{ 0x10, "Singly-sequenced" },
+ { 0x0, NULL }
};
/* VRPRQ */
@@ -286,6 +300,7 @@ static const true_false_string sna_th_vrprs_truth = {
static const value_string sna_th_vr_cwri_vals[] = {
{ 0, "Increment window size by 1" },
{ 1, "Decrement window size by 1" },
+ { 0x0, NULL }
};
/* VR_RWI */
@@ -1168,7 +1183,7 @@ proto_register_sna(void)
"" }},
{ &hf_sna_rh_csi,
- { "Code Selection Indicator", "sna.rh.csi", FT_BOOLEAN, 8, VALS(sna_rh_csi_vals), 0x08,
+ { "Code Selection Indicator", "sna.rh.csi", FT_UINT8, BASE_DEC, VALS(sna_rh_csi_vals), 0x08,
"Specifies the encoding used for the associated FMD RU." }},
{ &hf_sna_rh_edi,
@@ -1186,9 +1201,9 @@ proto_register_sna(void)
"Used to indicate the beginning or end of a group of exchanged "
"requests and responses called a bracket. Only used on LU-LU sessions." }},
- { &hf_sna_ru,
+/* { &hf_sna_ru,
{ "Request/Response Unit", "sna.ru", FT_NONE, BASE_NONE, NULL, 0x0,
- ""}},
+ ""}},*/
};
static gint *ett[] = {
&ett_sna,
diff --git a/packet-snmp.c b/packet-snmp.c
index 5e6c9d5aa4..9ec3ba38e1 100644
--- a/packet-snmp.c
+++ b/packet-snmp.c
@@ -2,7 +2,7 @@
* Routines for SNMP (simple network management protocol)
* D.Jorand (c) 1998
*
- * $Id: packet-snmp.c,v 1.55 2001/01/03 06:55:33 guy Exp $
+ * $Id: packet-snmp.c,v 1.56 2001/01/03 16:41:07 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -324,7 +324,8 @@ static const value_string smux_prio[] = {
static const value_string smux_sout[] = {
{ SMUX_SOUT_COMMIT, "Commit" },
- { SMUX_SOUT_ROLLBACK, "Rollback" }
+ { SMUX_SOUT_ROLLBACK, "Rollback" },
+ { 0, NULL }
};
/* Error status values */
diff --git a/packet-srvloc.c b/packet-srvloc.c
index fcfdd4b974..e61b47c44c 100644
--- a/packet-srvloc.c
+++ b/packet-srvloc.c
@@ -6,7 +6,7 @@
* In particular I have not had an opportunity to see how it
* responds to SRVLOC over TCP.
*
- * $Id: packet-srvloc.c,v 1.17 2001/01/03 06:55:33 guy Exp $
+ * $Id: packet-srvloc.c,v 1.18 2001/01/03 16:41:07 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -107,6 +107,7 @@ static const value_string srvloc_functions[] = {
{ DAADVERT, "DA Advertisement" },
{ SRVTYPERQST, "Service Type Request" },
{ SRVTYPERPLY, "Service Type Reply" },
+ { 0, NULL }
};
/* List to resolve flag values to names */
@@ -142,6 +143,7 @@ static const value_string srvloc_errs[] = {
{ CHRSET_NOT_UND, "Character set not understood" },
{ AUTH_ABSENT, "Authentication absent" },
{ AUTH_FAILED, "Authentication failed" },
+ { 0, NULL }
};
static int
diff --git a/packet-vrrp.c b/packet-vrrp.c
index 3586ad1e9f..fcecdb0b71 100644
--- a/packet-vrrp.c
+++ b/packet-vrrp.c
@@ -4,7 +4,7 @@
*
* Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-vrrp.c,v 1.10 2001/01/03 06:55:34 guy Exp $
+ * $Id: packet-vrrp.c,v 1.11 2001/01/03 16:41:07 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -69,7 +69,8 @@ struct vrrp_header {
#define VRRP_TYPE_ADVERTISEMENT 1
static const value_string vrrp_type_vals[] = {
- {VRRP_TYPE_ADVERTISEMENT, "Advertisement"}
+ {VRRP_TYPE_ADVERTISEMENT, "Advertisement"},
+ {0, NULL}
};
#define VRRP_AUTH_TYPE_NONE 0
@@ -78,7 +79,8 @@ static const value_string vrrp_type_vals[] = {
static const value_string vrrp_auth_vals[] = {
{VRRP_AUTH_TYPE_NONE, "No Authentication"},
{VRRP_AUTH_TYPE_SIMPLE_TEXT, "Simple Text Authentication"},
- {VRRP_AUTH_TYPE_IP_AUTH_HDR, "IP Authentication Header"}
+ {VRRP_AUTH_TYPE_IP_AUTH_HDR, "IP Authentication Header"},
+ {0, NULL}
};
#define VRRP_PRIORITY_MASTER_STOPPING 0
@@ -88,7 +90,8 @@ static const value_string vrrp_auth_vals[] = {
static const value_string vrrp_prio_vals[] = {
{VRRP_PRIORITY_MASTER_STOPPING, "Current Master has stopped participating in VRRP"},
{VRRP_PRIORITY_DEFAULT, "Default priority for a backup VRRP router"},
- {VRRP_PRIORITY_OWNER, "This VRRP router owns the virtual router's IP address(es)"}
+ {VRRP_PRIORITY_OWNER, "This VRRP router owns the virtual router's IP address(es)"},
+ {0, NULL }
};
diff --git a/packet-wsp.c b/packet-wsp.c
index e35751599c..d5edc914c4 100644
--- a/packet-wsp.c
+++ b/packet-wsp.c
@@ -3,7 +3,7 @@
*
* Routines to dissect WSP component of WAP traffic.
*
- * $Id: packet-wsp.c,v 1.7 2001/01/03 08:42:48 guy Exp $
+ * $Id: packet-wsp.c,v 1.8 2001/01/03 16:41:07 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -133,6 +133,8 @@ static const value_string vals_pdu_type[] = {
/* 0x70 - 0x7F Extended method (Post PDU) */
/* 0x80 - 0xFF Reserved */
+ { 0x00, NULL }
+
};
static const value_string vals_status[] = {
@@ -179,6 +181,7 @@ static const value_string vals_status[] = {
{ 0x63, "Service Unavailable" },
{ 0x64, "Gateway Timeout" },
{ 0x65, "HTTP Version Not Supported" },
+ { 0x00, NULL }
};
static const value_string vals_content_types[] = {
@@ -235,6 +238,7 @@ static const value_string vals_content_types[] = {
{ 0x32, "application/vnd.wap.coc" },
{ 0x33, "application/vnd.wap.multipart.related" },
{ 0x34, "application/vnd.wap.sia" },
+ { 0x00, NULL }
};
static const value_string vals_character_sets[] = {
@@ -252,15 +256,18 @@ static const value_string vals_character_sets[] = {
{ 0x006A, "utf-8" },
{ 0x03E8, "iso-10646-ucs-2" },
{ 0x07EA, "big5" },
+ { 0x00, NULL }
};
static const value_string vals_languages[] = {
{ 0x19, "English (en)" },
+ { 0x00, NULL }
};
static const value_string vals_accept_ranges[] = {
{ 0x80, "None" },
{ 0x81, "Bytes" },
+ { 0x00, NULL }
};
static const value_string vals_cache_control[] = {
@@ -275,6 +282,7 @@ static const value_string vals_cache_control[] = {
{ 0x88, "No-transform" },
{ 0x89, "Must-revalidate" },
{ 0x8A, "Proxy-revalidate" },
+ { 0x00, NULL }
};
/*
diff --git a/packet-wtp.c b/packet-wtp.c
index a8c1dfb1cd..f578d0d671 100644
--- a/packet-wtp.c
+++ b/packet-wtp.c
@@ -3,7 +3,7 @@
*
* Routines to dissect WTP component of WAP traffic.
*
- * $Id: packet-wtp.c,v 1.7 2001/01/03 08:42:48 guy Exp $
+ * $Id: packet-wtp.c,v 1.8 2001/01/03 16:41:08 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -93,7 +93,8 @@ static const value_string vals_pdu_type[] = {
{ 4, "Abort" },
{ 5, "Segmented Invoke" },
{ 6, "Segmented Result" },
- { 6, "Negative Ack" },
+ { 7, "Negative Ack" },
+ { 0, NULL }
};
static const value_string vals_transmission_trailer[] = {
@@ -101,6 +102,7 @@ static const value_string vals_transmission_trailer[] = {
{ 1, "Last packet of message" },
{ 2, "Last packet of group" },
{ 3, "Re-assembly not supported" },
+ { 0, NULL }
};
static const value_string vals_version[] = {
@@ -108,11 +110,13 @@ static const value_string vals_version[] = {
{ 1, "Undefined" },
{ 2, "Undefined" },
{ 3, "Undefined" },
+ { 0, NULL }
};
static const value_string vals_abort_type[] = {
{ 0, "Provider" },
- { 1, "User (WSP)" }
+ { 1, "User (WSP)" },
+ { 0, NULL }
};
static const value_string vals_abort_reason_provider[] = {
@@ -125,7 +129,8 @@ static const value_string vals_abort_reason_provider[] = {
{ 0x06, "WTP Version Zero" },
{ 0x07, "Capacity Temporarily Exceeded" },
{ 0x08, "No Response" },
- { 0x09, "Message Too Large" }
+ { 0x09, "Message Too Large" },
+ { 0x00, NULL }
};
/* File scoped variables for the protocol and registered fields */
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-24 20:39:39 +0000