diff options
author | Guy Harris <guy@alum.mit.edu> | 2003-12-18 00:25:24 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2003-12-18 00:25:24 +0000 |
commit | cc500abd2178f3e5dc4164f0d44b3190e99f3d58 (patch) | |
tree | b84db22ec7e218e0aa2483a5a7474857872524f8 /packet-cpha.c | |
parent | fe3d05f73e9e936e8fb1ec6248df0d0f95b3a7b8 (diff) |
Use a value_string table for the Status field.
svn path=/trunk/; revision=9336
Diffstat (limited to 'packet-cpha.c')
-rw-r--r-- | packet-cpha.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/packet-cpha.c b/packet-cpha.c index 939f3f7902..c01e5e1dd0 100644 --- a/packet-cpha.c +++ b/packet-cpha.c @@ -2,7 +2,7 @@ * Routines for the Check Point High-Availability Protocol (CPHAP) * Copyright 2002, Yaniv Kaul <ykaul-at-netvision.net.il> * - * $Id: packet-cpha.c,v 1.8 2003/12/17 23:35:28 ulfl Exp $ + * $Id: packet-cpha.c,v 1.9 2003/12/18 00:25:24 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -158,12 +158,11 @@ static const char *state_str[NUM_STATES+1] = { "Active/Active-Attention" }; -#define NUM_STATUS 3 -static const char *status_str[NUM_STATUS+1] = { - "Unknown status", - "New policy arrived - no need to modify HA configuration", - "New policy arrived - need to modify HA configuration", - "Ready to change configuration" +static const value_string status_vals[] = { + { 1, "New policy arrived - no need to modify HA configuration" }, + { 2, "New policy arrived - need to modify HA configuration" }, + { 3, "Ready to change configuration" }, + { 0, NULL } }; #define NUM_HA_MODES 4 @@ -187,7 +186,6 @@ static void dissect_conf_reply(tvbuff_t *, int, proto_tree *); int is_report_ifs(guint16); static const char *report_code2str(guint16); static const char *ha_mode2str(guint16); -static const char *status2str(guint32); static const char *state2str(guint8); static int @@ -386,7 +384,7 @@ static void dissect_policy_change(tvbuff_t * tvb, int offset, proto_tree * tree) status = tvb_get_ntohl(tvb, offset); - proto_tree_add_uint_format(tree, hf_status, tvb, offset, sizeof(status), status, "Status %d (%s)", status, status2str(status)); + proto_tree_add_uint(tree, hf_status, tvb, offset, sizeof(status), status); offset += sizeof(guint32); } @@ -474,13 +472,6 @@ ha_mode2str(guint16 hamode) { } static const char * -status2str(guint32 status) { - if(status <= NUM_STATUS) - return status_str[status]; - return status_str[0]; -} - -static const char * state2str(guint8 state) { if(state <= NUM_STATES) return state_str[state]; @@ -552,7 +543,7 @@ proto_register_cpha(void) { &hf_out_assumed_up_num, { "Interfaces assumed up in the Outbound", "cphap.out_assume_up", FT_INT8, BASE_DEC, NULL, 0x0, "", HFILL}}, { &hf_status, - { "Status", "cphap.status", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}}, + { "Status", "cphap.status", FT_UINT32, BASE_DEC, VALS(status_vals), 0x0, "", HFILL}}, { &hf_ifn, { "Interface Number", "cpha.ifn", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}}, }; |