diff options
author | Bill Meier <wmeier@newsguy.com> | 2010-10-13 17:56:05 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2010-10-13 17:56:05 +0000 |
commit | 5ed532268fde6c20937fcdad9da9b9c7d8425244 (patch) | |
tree | 27a544bd28b3d844686985b4c8aefc8717c5b1a6 /epan | |
parent | 45da078b7dbad8a5793a1d899066871b6d67ee20 (diff) |
Use extended value string functions to access dce_error_vals (which has 4397 entries)
svn path=/trunk/; revision=34500
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-dcerpc-conv.c | 26 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc-dce122.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc-dce122.h | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc-dtsprovider.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc-fileexp.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc-fldb.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc-rs_pgo.c | 4 |
7 files changed, 33 insertions, 29 deletions
diff --git a/epan/dissectors/packet-dcerpc-conv.c b/epan/dissectors/packet-dcerpc-conv.c index 0643383a46..72b23be301 100644 --- a/epan/dissectors/packet-dcerpc-conv.c +++ b/epan/dissectors/packet-dcerpc-conv.c @@ -76,7 +76,7 @@ conv_dissect_who_are_you_rqst (tvbuff_t *tvb, int offset, actuid.Data1, actuid.Data2, actuid.Data3, actuid.Data4[0], actuid.Data4[1], actuid.Data4[2], actuid.Data4[3], actuid.Data4[4], actuid.Data4[5], actuid.Data4[6], actuid.Data4[7]); } - + return offset; } @@ -93,11 +93,11 @@ conv_dissect_who_are_you_resp (tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_conv_who_are_you_resp_seq, &seq); offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_conv_rc, &st); - + if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, "conv_who_are_you response seq:%u st:%s", - seq, val_to_str(st, dce_error_vals, "%u")); + col_add_fstr(pinfo->cinfo, COL_INFO, "conv_who_are_you response seq:%u st:%s", + seq, val_to_str_ext(st, &dce_error_vals_ext, "%u")); } return offset; @@ -125,7 +125,7 @@ conv_dissect_who_are_you2_rqst (tvbuff_t *tvb, int offset, actuid.Data1, actuid.Data2, actuid.Data3, actuid.Data4[0], actuid.Data4[1], actuid.Data4[2], actuid.Data4[3], actuid.Data4[4], actuid.Data4[5], actuid.Data4[6], actuid.Data4[7]); } - + return offset; } static int @@ -136,7 +136,7 @@ conv_dissect_who_are_you2_resp (tvbuff_t *tvb, int offset, /* * [out] unsigned32 *seq, * [out] uuid_t *cas_uuid, - * + * * [out] unsigned32 *st */ guint32 seq, st; @@ -147,11 +147,11 @@ conv_dissect_who_are_you2_resp (tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_conv_rc, &st); if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, - "conv_who_are_you2 response seq:%u st:%s cas:%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - seq, val_to_str(st, dce_error_vals, "%u"), + col_add_fstr(pinfo->cinfo, COL_INFO, + "conv_who_are_you2 response seq:%u st:%s cas:%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", + seq, val_to_str_ext(st, &dce_error_vals_ext, "%u"), cas_uuid.Data1, cas_uuid.Data2, cas_uuid.Data3, cas_uuid.Data4[0], cas_uuid.Data4[1], - cas_uuid.Data4[2], cas_uuid.Data4[3], cas_uuid.Data4[4], cas_uuid.Data4[5], cas_uuid.Data4[6], cas_uuid.Data4[7]); + cas_uuid.Data4[2], cas_uuid.Data4[3], cas_uuid.Data4[4], cas_uuid.Data4[5], cas_uuid.Data4[6], cas_uuid.Data4[7]); } return offset; @@ -159,9 +159,9 @@ conv_dissect_who_are_you2_resp (tvbuff_t *tvb, int offset, static dcerpc_sub_dissector conv_dissectors[] = { - { 0, "who_are_you", + { 0, "who_are_you", conv_dissect_who_are_you_rqst, conv_dissect_who_are_you_resp }, - { 1, "who_are_you2", + { 1, "who_are_you2", conv_dissect_who_are_you2_rqst, conv_dissect_who_are_you2_resp }, { 2, "are_you_there", NULL, NULL }, { 3, "who_are_you_auth", NULL, NULL }, @@ -176,7 +176,7 @@ proto_register_conv (void) { &hf_conv_opnum, { "Operation", "conv.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_conv_rc, - {"Status", "conv.status", FT_UINT32, BASE_DEC, VALS(dce_error_vals), 0x0, NULL, HFILL }}, + {"Status", "conv.status", FT_UINT32, BASE_DEC|BASE_EXT_STRING, &dce_error_vals_ext, 0x0, NULL, HFILL }}, { &hf_conv_who_are_you_rqst_actuid, {"Activity UID", "conv.who_are_you_rqst_actuid", FT_GUID, BASE_NONE, NULL, 0x0, "UUID", HFILL }}, diff --git a/epan/dissectors/packet-dcerpc-dce122.c b/epan/dissectors/packet-dcerpc-dce122.c index 2869eb68b1..b810ded200 100644 --- a/epan/dissectors/packet-dcerpc-dce122.c +++ b/epan/dissectors/packet-dcerpc-dce122.c @@ -27,7 +27,7 @@ #include <epan/value_string.h> #include "packet-dcerpc-dce122.h" -const value_string dce_error_vals[] = { +static const value_string dce_error_vals[] = { { 0, "SUCCESS", }, { 539918337, "event already in set" }, { 539918338, "event still part of some set" }, @@ -4426,3 +4426,7 @@ const value_string dce_error_vals[] = { { 704852032, "zlc_Init() returning .ld" }, { 0, NULL } }; + +#define array_length(x) (sizeof x / sizeof x[0]) + +value_string_ext dce_error_vals_ext = VALUE_STRING_EXT_INIT(dce_error_vals); diff --git a/epan/dissectors/packet-dcerpc-dce122.h b/epan/dissectors/packet-dcerpc-dce122.h index bad6cbc50f..49514b2b7a 100644 --- a/epan/dissectors/packet-dcerpc-dce122.h +++ b/epan/dissectors/packet-dcerpc-dce122.h @@ -27,6 +27,6 @@ #ifndef __PACKET_DCERPC__DCE122_H__ #define __PACKET_DCERPC__DCE122_H__ -extern const value_string dce_error_vals[]; +extern value_string_ext dce_error_vals_ext; #endif diff --git a/epan/dissectors/packet-dcerpc-dtsprovider.c b/epan/dissectors/packet-dcerpc-dtsprovider.c index 7ad1fb36d1..982227a5e1 100644 --- a/epan/dissectors/packet-dcerpc-dtsprovider.c +++ b/epan/dissectors/packet-dcerpc-dtsprovider.c @@ -65,8 +65,8 @@ proto_register_dtsprovider (void) { "Operation", "dtsprovider.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_dtsprovider_status, - { "Status", "dtsprovider.status", FT_UINT32, BASE_DEC, - VALS(dce_error_vals), 0x0, "Return code, status of executed command", HFILL }} + { "Status", "dtsprovider.status", FT_UINT32, BASE_DEC|BASE_EXT_STRING, + &dce_error_vals_ext, 0x0, "Return code, status of executed command", HFILL }} }; static gint *ett[] = { diff --git a/epan/dissectors/packet-dcerpc-fileexp.c b/epan/dissectors/packet-dcerpc-fileexp.c index d117eca8c8..3bb1c2330e 100644 --- a/epan/dissectors/packet-dcerpc-fileexp.c +++ b/epan/dissectors/packet-dcerpc-fileexp.c @@ -324,7 +324,7 @@ inode, volume, etc all will be garbage. guint32 st; \ const char *st_str; \ offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_error_st, &st); \ - st_str = val_to_str (st, dce_error_vals, "%u"); \ + st_str = val_to_str_ext (st, &dce_error_vals_ext, "%u"); \ if (st){ \ if (check_col (pinfo->cinfo, COL_INFO)) \ col_add_fstr (pinfo->cinfo, COL_INFO, "%s st:%s ", name, st_str); \ @@ -905,7 +905,7 @@ dissect_afsErrorStatus (tvbuff_t * tvb, int offset, offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_afserrorstatus_st, &st); - st_str = val_to_str (st, dce_error_vals, "%u"); + st_str = val_to_str_ext (st, &dce_error_vals_ext, "%u"); if (check_col (pinfo->cinfo, COL_INFO)) col_append_fstr (pinfo->cinfo, COL_INFO, " st:%s ", st_str); diff --git a/epan/dissectors/packet-dcerpc-fldb.c b/epan/dissectors/packet-dcerpc-fldb.c index 764e798222..9d132c7386 100644 --- a/epan/dissectors/packet-dcerpc-fldb.c +++ b/epan/dissectors/packet-dcerpc-fldb.c @@ -223,14 +223,14 @@ static const guint8 *st_str; #define MACRO_ST_CLEAR(name) \ offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_error_st, &st); \ - st_str = val_to_str (st, dce_error_vals, "%u"); \ - if (st){ \ -if (check_col (pinfo->cinfo, COL_INFO)) \ - col_add_fstr (pinfo->cinfo, COL_INFO, "%s st:%s ", name, st_str); \ - }else{ \ -if (check_col (pinfo->cinfo, COL_INFO)) \ - col_append_fstr (pinfo->cinfo, COL_INFO, " st:%s ", st_str); \ -} + st_str = val_to_str_ext (st, &dce_error_vals_ext, "%u"); \ + if (st){ \ + if (check_col (pinfo->cinfo, COL_INFO)) \ + col_add_fstr (pinfo->cinfo, COL_INFO, "%s st:%s ", name, st_str); \ + } else{ \ + if (check_col (pinfo->cinfo, COL_INFO)) \ + col_append_fstr (pinfo->cinfo, COL_INFO, " st:%s ", st_str); \ + } static int dissect_afsnetaddr (tvbuff_t * tvb, int offset, diff --git a/epan/dissectors/packet-dcerpc-rs_pgo.c b/epan/dissectors/packet-dcerpc-rs_pgo.c index 1316e9fdca..f653a97ef6 100644 --- a/epan/dissectors/packet-dcerpc-rs_pgo.c +++ b/epan/dissectors/packet-dcerpc-rs_pgo.c @@ -157,7 +157,7 @@ dissect_error_status_t (tvbuff_t * tvb, int offset, offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_error_status_t, &st); - st_str = val_to_str (st, dce_error_vals, "%u"); + st_str = val_to_str_ext (st, &dce_error_vals_ext, "%u"); if (check_col (pinfo->cinfo, COL_INFO)) col_append_fstr (pinfo->cinfo, COL_INFO, " st:%s ", st_str); @@ -977,7 +977,7 @@ dissect_rs_pgo_query_result_t (tvbuff_t * tvb, int offset, offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_rs_pgo_query_result_t, &st); - status = val_to_str (st, dce_error_vals, "%u"); + status = val_to_str_ext (st, &dce_error_vals_ext, "%u"); if (check_col (pinfo->cinfo, COL_INFO)) col_append_fstr (pinfo->cinfo, COL_INFO, " status:%s ", status); |