diff options
author | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-01-03 16:41:08 +0000 |
---|---|---|
committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-01-03 16:41:08 +0000 |
commit | 5b7f184296c4e10f933d0448f40d267fb1b583f7 (patch) | |
tree | e67e6a292cf66edf79431f30778f239fc9468f4e /packet-vrrp.c | |
parent | b151ddecbb6800271e1cc2b8b0d2bb355dadbe89 (diff) |
Ensure that all value_string arrays end in {0, NULL}. Dissectors got away
with not terminating their arrays because they knew the limits of the
value used to look up strings in the value_string array, but the
dfilter_expr_dlg does not know these limits and must rely on the terminating
{0, NULL} record.
Also, in SNA fixed a bug in which a field should have been defined as FT_UINT8
but was defined as FT_BOOLEAN.
In WTP, fixed a value string which had duplicate keys.
svn path=/trunk/; revision=2817
Diffstat (limited to 'packet-vrrp.c')
-rw-r--r-- | packet-vrrp.c | 11 |
1 files changed, 7 insertions, 4 deletions
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 } }; |