diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-02-28 23:16:15 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-02-28 23:16:15 +0000 |
| commit | 81d21e8c05bf5c13e2e31bc6ae8b7dc773ccc18c (patch) | |
| tree | c69d8ed22734a979e1c4300f5167ee64e998fc1b /packet-q931.c | |
| parent | f09b558dcf7d77e21cf4dbef04ffa1bed8daddd9 (diff) | |
"packet-isup.c" doesn't appear to need to include "packet-ip.h", so
don't do so.
Pick up Anders Broman's table of Q.850 cause values, and his change to
use "dissect_q931_cause_ie()" for cause indicators - but do it by
modifying the Q.931 dissector's "dissect_q931_cause_ie()" to take, as an
argument, the header field to use for the cause value, and export that
routine and have the ISUP dissector call it, rather than by duplicating
the cause IE dissector.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7225 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-q931.c')
| -rw-r--r-- | packet-q931.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/packet-q931.c b/packet-q931.c index 273d7e1c67..c8eb254cd9 100644 --- a/packet-q931.c +++ b/packet-q931.c @@ -2,7 +2,7 @@ * Routines for Q.931 frame disassembly * Guy Harris <guy@alum.mit.edu> * - * $Id: packet-q931.c,v 1.50 2003/02/28 22:43:56 guy Exp $ + * $Id: packet-q931.c,v 1.51 2003/02/28 23:16:15 guy Exp $ * * Modified by Andreas Sikkema for possible use with H.323 * @@ -1020,9 +1020,9 @@ const value_string q931_cause_code_vals[] = { { 0, NULL } }; -static void +void dissect_q931_cause_ie(tvbuff_t *tvb, int offset, int len, - proto_tree *tree) + proto_tree *tree, int hf_cause_value) { guint8 octet; guint8 coding_standard; @@ -1066,7 +1066,7 @@ dissect_q931_cause_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; octet = tvb_get_guint8(tvb, offset); - proto_tree_add_uint(tree, hf_q931_cause_value, tvb, 0, 1, octet & 0x7F); + proto_tree_add_uint(tree, hf_cause_value, tvb, 0, 1, octet & 0x7F); offset += 1; len -= 1; @@ -2346,7 +2346,8 @@ dissect_q931_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case Q931_IE_CAUSE: dissect_q931_cause_ie(tvb, offset + 2, info_element_len, - ie_tree); + ie_tree, + hf_q931_cause_value); break; case Q931_IE_CALL_STATE: |