diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-04-27 15:17:46 +0200 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2017-04-27 18:49:32 +0000 |
commit | b9d3db608de194d6f0e8bfeb1f1cbe9c5d8c858b (patch) | |
tree | cdf5b175c34ebb52770ab3505ae7ddfdb5ad7426 /epan/dissectors/packet-ipdc.c | |
parent | 755bc5c506716b2e336a47edc818980cedd2cffc (diff) |
ipdc: fix conflicting entry in its value_string (and convert to value_string_ext)
Field 'Message code' (ipdc.message_code) has a conflicting entry in its value_string: 255 is at indices 3 (SS -> GW: MRJ: Message reject.) and 32 (GW -> SS: MRJ: Message reject.))
Field 'Message code' (ipdc.message_code) has a conflicting entry in its value_string: 17 is at indices 17 (SS -> GW: RCR: Release channel request) and 45 (GW -> SS: RCR: Release channel request))
Field 'Message code' (ipdc.message_code) has a conflicting entry in its value_string: 18 is at indices 18 (SS -> GW: ACR: Release channel complete) and 46 (GW -> SS: ACR: Release channel complete))
Field 'Message code' (ipdc.message_code) has a conflicting entry in its value_string: 125 is at indices 23 (SS -> GW: RTE: Request Test Echo) and 52 (GW -> SS: RTE: Request Test Echo))
Field 'Message code' (ipdc.message_code) has a conflicting entry in its value_string: 126 is at indices 24 (SS -> GW: ARTE: Response to Request Test Echo) and 53 (GW -> SS: ARTE: Response to Request Test Echo))
Field 'Message code' (ipdc.message_code) has a conflicting entry in its value_string: 121 is at indices 25 (SS -> GW: NATV: Native Mode Q.931 Signaling Transport) and 54 (GW -> SS: NATV: Native Mode Q.931 Signaling Transport))
Field 'Message code' (ipdc.message_code) has a conflicting entry in its value_string: 122 is at indices 26 (SS -> GW: TUNL: Tunneled Transport of signaling protocol data units) and 55 (GW -> SS: TUNL: Tunneled Transport of signaling protocol data units))
Field 'Message code' (ipdc.message_code) has a conflicting entry in its value_string: 122 is at indices 26 (SS -> GW: TUNL: Tunneled Transport of signaling protocol data units) and 55 (GW -> SS: TUNL: Tunneled Transport of signaling protocol data units))
Change-Id: I2d679f01ff9ddb6618ebd7212d1d7789045b434c
Reviewed-on: https://code.wireshark.org/review/21378
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ipdc.c')
-rw-r--r-- | epan/dissectors/packet-ipdc.c | 84 |
1 files changed, 39 insertions, 45 deletions
diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c index 66667c7c24..4e03269244 100644 --- a/epan/dissectors/packet-ipdc.c +++ b/epan/dissectors/packet-ipdc.c @@ -109,67 +109,61 @@ static const value_string channel_status_vals[] = { /* linear search will always match the first */ /* of the dups. */ static const value_string message_code_vals[] = { - { 0x0082, "SS -> GW: ASUP: Acknowledgment to NSUP" }, - { 0x0084, "SS -> GW: LNK: Link Active" }, - { 0x0087, "SS -> GW: RCGST: Request Congestion Status" }, - { 0x00FF, "SS -> GW: MRJ: Message reject." }, + { 0x0001, "SS -> GW: RCSI: Request inbound call setup" }, + { 0x0002, "GW -> SS: ACSI: Accept inbound call setup" }, + { 0x0003, "GW -> SS: CONI: Connect inbound call (answer)" }, + { 0x0005, "TD -> SS: RCSO: Request outbound call setup" }, + { 0x0006, "SS -> TD: ACSO: Accept outbound call setup" }, + { 0x0007, "SS -> TD: CONO: Outbound call connected" }, + { 0x0009, "SS -> GW: RCST: Request pass-through call setup (TDM connection between two channels)" }, + { 0x000A, "GW -> SS: ACST: Accept pass-through call" }, + { 0x0011, "RCR: Release channel request" }, + { 0x0012, "ACR: Release channel complete" }, + { 0x0013, "SS -> GW: RCCP: Request packet call setup" }, + { 0x0014, "GW -> SS: ACCP: Accept packet call setup" }, + { 0x0015, "SS -> GW: RMPC: Modify/Query request packet call" }, + { 0x0016, "GW -> SS: AMPC: Accept modify to packet call" }, { 0x0041, "SS -> GW: RMS: Request module status" }, + { 0x0042, "GW -> SS: NMS: Notify module status" }, { 0x0043, "SS -> GW: RLS: Request line status" }, + { 0x0044, "GW -> SS: NLS: Notify line status" }, { 0x0045, "SS -> GW: RCS: Request channel status" }, + { 0x0046, "GW -> SS: NCS: Notify channel status" }, + { 0x0047, "SS -> GW: RRS: Request RTP port Status" }, + { 0x0048, "SS -> GW: RARS: Request All RTP port Status" }, + { 0x0049, "GW -> SS: NRS: Notify RTP port Status" }, + { 0x004A, "GW -> SS: NARS: Notify All RTP port Status" }, { 0x0051, "SS -> GW: SMS: Set a module to a given state" }, { 0x0053, "SS -> GW: SLS: Set a line to a given state" }, { 0x0055, "SS -> GW: SCS: Set a group of channels to a given state" }, - { 0x0047, "SS -> GW: RRS: Request RTP port Status" }, - { 0x0048, "SS -> GW: RARS: Request All RTP port Status" }, - { 0x0091, "SS -> GW: RSI: Request system information" }, - { 0x0001, "SS -> GW: RCSI: Request inbound call setup" }, - { 0x0009, "SS -> GW: RCST: Request pass-through call setup (TDM connection between two channels)" }, - { 0x0013, "SS -> GW: RCCP: Request packet call setup" }, - { 0x0015, "SS -> GW: RMPC: Modify/Query request packet call" }, - { 0x0011, "SS -> GW: RCR: Release channel request" }, - { 0x0012, "SS -> GW: ACR: Release channel complete" }, + { 0x0056, "GW -> SS: RSCS: Response to SCS" }, { 0x0061, "SS -> GW: PCT: Prepare channel for continuity test" }, + { 0x0062, "GW -> SS: APCT: Response to PCT" }, { 0x0063, "SS -> GW: SCT: Start continuity test procedure with far end as loopback (Generate tone and check for received tone)" }, - { 0x0073, "SS -> GW: STN: Send tones" }, + { 0x0064, "GW -> SS: ASCT: Continuity test result" }, { 0x0071, "SS -> GW: LTN: Listen for tones" }, - { 0x007D, "SS -> GW: RTE: Request Test Echo" }, - { 0x007E, "SS -> GW: ARTE: Response to Request Test Echo" }, - { 0x0079, "SS -> GW: NATV: Native Mode Q.931 Signaling Transport" }, - { 0x007A, "SS -> GW: TUNL: Tunneled Transport of signaling protocol data units" }, + { 0x0072, "GW -> SS: ALTN: Response to Listen for tones" }, + { 0x0073, "SS -> GW: STN: Send tones" }, + { 0x0074, "GW -> SS: ASTN: Completion result of STN command" }, + { 0x0079, "NATV: Native Mode Q.931 Signaling Transport" }, + { 0x007A, "TUNL: Tunneled Transport of signaling protocol data units" }, + { 0x007D, "RTE: Request Test Echo" }, + { 0x007E, "ARTE: Response to Request Test Echo" }, { 0x0081, "GW -> SS: NSUP: Notify the soft switch that the GW is coming up" }, + { 0x0082, "SS -> GW: ASUP: Acknowledgment to NSUP" }, { 0x0083, "GW -> SS: NSDN: Indication that the GW is going down" }, + { 0x0084, "SS -> GW: LNK: Link Active" }, { 0x0085, "GW -> SS: ALNK: Acknowledgement to Link Active" }, { 0x0086, "GW -> SS: SLNK: Link Status" }, + { 0x0087, "SS -> GW: RCGST: Request Congestion Status" }, { 0x0088, "GW -> SS: CGST: Congestion Status" }, - { 0x00FF, "GW -> SS: MRJ: Message reject." }, - { 0x0042, "GW -> SS: NMS: Notify module status" }, - { 0x0044, "GW -> SS: NLS: Notify line status" }, - { 0x0046, "GW -> SS: NCS: Notify channel status" }, - { 0x0056, "GW -> SS: RSCS: Response to SCS" }, - { 0x0049, "GW -> SS: NRS: Notify RTP port Status" }, - { 0x004A, "GW -> SS: NARS: Notify All RTP port Status" }, + { 0x0091, "SS -> GW: RSI: Request system information" }, { 0x0092, "GW -> SS: NSI: Notify System Information" }, - { 0x0002, "GW -> SS: ACSI: Accept inbound call setup" }, - { 0x0003, "GW -> SS: CONI: Connect inbound call (answer)" }, - { 0x0014, "GW -> SS: ACCP: Accept packet call setup" }, - { 0x0016, "GW -> SS: AMPC: Accept modify to packet call" }, - { 0x000A, "GW -> SS: ACST: Accept pass-through call" }, - { 0x0011, "GW -> SS: RCR: Release channel request" }, - { 0x0012, "GW -> SS: ACR: Release channel complete" }, - { 0x0062, "GW -> SS: APCT: Response to PCT" }, - { 0x0064, "GW -> SS: ASCT: Continuity test result" }, - { 0x0074, "GW -> SS: ASTN: Completion result of STN command" }, - { 0x0072, "GW -> SS: ALTN: Response to Listen for tones" }, { 0x00F0, "GW -> SS: NTN: Notify ToNe" }, - { 0x007D, "GW -> SS: RTE: Request Test Echo" }, - { 0x007E, "GW -> SS: ARTE: Response to Request Test Echo" }, - { 0x0079, "GW -> SS: NATV: Native Mode Q.931 Signaling Transport" }, - { 0x007A, "GW -> SS: TUNL: Tunneled Transport of signaling protocol data units" }, - { 0x0005, "TD -> SS: RCSO: Request outbound call setup" }, - { 0x0006, "SS -> TD: ACSO: Accept outbound call setup" }, - { 0x0007, "SS -> TD: CONO: Outbound call connected" }, + { 0x00FF, "MRJ: Message reject." }, { 0, NULL } }; +static value_string_ext message_code_vals_ext = VALUE_STRING_EXT_INIT(message_code_vals); static const value_string tag_description[] = { { 0x01, "Protocol version" }, @@ -781,7 +775,7 @@ dissect_ipdc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d col_append_fstr(pinfo->cinfo, COL_INFO, "TID=%x %s ", trans_id, - val_to_str_const(message_code, message_code_vals, + val_to_str_ext_const(message_code, &message_code_vals_ext, TEXT_UNDEFINED)); @@ -993,7 +987,7 @@ proto_register_ipdc(void) { &hf_ipdc_message_code, { "Message code", "ipdc.message_code", - FT_UINT16, BASE_HEX, VALS(message_code_vals), 0x0, + FT_UINT16, BASE_HEX|BASE_EXT_STRING, &message_code_vals_ext, 0x0, NULL, HFILL } }, |