diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-09-24 21:59:50 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-09-24 21:59:50 +0000 |
| commit | ee73d3baf310ce6694cff7d70b3d8ea0fe348e27 (patch) | |
| tree | 1b7d2bd792508c792a9844af260762e2c1e8dae6 /epan/dissectors/packet-q931.c | |
| parent | 084280760979df2c9c44502bdf2e5d4180604c44 (diff) | |
Packet-isup.c &packet-q931.[ch]:
In case of cause pointing out ie "faults" use the correct "ie value_string".
in packet-isup.c use packet-e164.c for country code translation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26264 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-q931.c')
| -rw-r--r-- | epan/dissectors/packet-q931.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index 2995bb13d8..8386746d35 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -1202,7 +1202,7 @@ static const value_string q931_rejection_reason_vals[] = { static void dissect_q931_cause_ie_unsafe(tvbuff_t *tvb, int offset, int len, - proto_tree *tree, int hf_cause_value, guint8 *cause_value) + proto_tree *tree, int hf_cause_value, guint8 *cause_value, const value_string *ie_vals) { guint8 octet; guint8 coding_standard; @@ -1303,14 +1303,14 @@ dissect_q931_cause_ie_unsafe(tvbuff_t *tvb, int offset, int len, case Q931_REJ_IE_MISSING: proto_tree_add_text(tree, tvb, offset, 1, "Missing information element: %s", - val_to_str(tvb_get_guint8(tvb, offset), q931_info_element_vals0, + val_to_str(tvb_get_guint8(tvb, offset), ie_vals, "Unknown (0x%02X)")); break; case Q931_REJ_IE_INSUFFICIENT: proto_tree_add_text(tree, tvb, offset, 1, "Insufficient information element: %s", - val_to_str(tvb_get_guint8(tvb, offset), q931_info_element_vals0, + val_to_str(tvb_get_guint8(tvb, offset), ie_vals, "Unknown (0x%02X)")); break; @@ -1330,7 +1330,7 @@ dissect_q931_cause_ie_unsafe(tvbuff_t *tvb, int offset, int len, do { proto_tree_add_text(tree, tvb, offset, 1, "Information element: %s", - val_to_str(tvb_get_guint8(tvb, offset), q931_info_element_vals0, + val_to_str(tvb_get_guint8(tvb, offset), ie_vals, "Unknown (0x%02X)")); offset += 1; len -= 1; @@ -1361,11 +1361,11 @@ dissect_q931_cause_ie_unsafe(tvbuff_t *tvb, int offset, int len, void dissect_q931_cause_ie(tvbuff_t *tvb, int offset, int len, - proto_tree *tree, int hf_cause_value, guint8 *cause_value) + proto_tree *tree, int hf_cause_value, guint8 *cause_value, const value_string *ie_vals) { gboolean have_valid_q931_pi_save = have_valid_q931_pi; have_valid_q931_pi = FALSE; - dissect_q931_cause_ie_unsafe(tvb, offset, len, tree, hf_cause_value, cause_value); + dissect_q931_cause_ie_unsafe(tvb, offset, len, tree, hf_cause_value, cause_value, ie_vals); have_valid_q931_pi = have_valid_q931_pi_save; } @@ -2828,7 +2828,7 @@ dissect_q931_IEs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root_tree, dissect_q931_cause_ie_unsafe(tvb, offset + 2, info_element_len, ie_tree, - hf_q931_cause_value, &dummy); + hf_q931_cause_value, &dummy, q931_info_element_vals0); break; case CS0 | Q931_IE_CALL_STATE: |