diff options
author | Guy Harris <guy@alum.mit.edu> | 2004-03-06 10:46:38 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2004-03-06 10:46:38 +0000 |
commit | ea5b621e966285d157d7667e88ad9835ba5b88db (patch) | |
tree | c5a66d2cfad68666912f098d8e1278f92dd43bd3 /packet-q933.c | |
parent | 99ca20fc3c8faa24e74b677d7f41ddd5b234442b (diff) | |
download | wireshark-ea5b621e966285d157d7667e88ad9835ba5b88db.tar.gz wireshark-ea5b621e966285d157d7667e88ad9835ba5b88db.tar.bz2 wireshark-ea5b621e966285d157d7667e88ad9835ba5b88db.zip |
Propagate to the Q.933 dissector Tomas Kukosa's change to have 3, not 4,
bits of codeset in an IE (that's how many bits of codeset there are).
Make the "q933_info_element_vals[]" array have NUM_INFO_ELEMENT_VALS
members and define NUM_INFO_ELEMENT_VALS be (Q933_IE_SHIFT_CODESET+1),
as that array should have the number of codesets worth of elements.
svn path=/trunk/; revision=10332
Diffstat (limited to 'packet-q933.c')
-rw-r--r-- | packet-q933.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packet-q933.c b/packet-q933.c index 85e57b9681..d2ce596ac7 100644 --- a/packet-q933.c +++ b/packet-q933.c @@ -2,7 +2,7 @@ * Routines for Q.933 frame disassembly * Guy Harris <guy@alum.mit.edu> * - * $Id: packet-q933.c,v 1.6 2004/03/06 10:29:51 guy Exp $ + * $Id: packet-q933.c,v 1.7 2004/03/06 10:46:38 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -122,7 +122,7 @@ static const true_false_string tfs_call_ref_flag = { #define Q933_IE_SHIFT 0x90 #define Q933_IE_SHIFT_NON_LOCKING 0x08 /* non-locking shift */ -#define Q933_IE_SHIFT_CODESET 0x0F /* codeset */ +#define Q933_IE_SHIFT_CODESET 0x07 /* codeset */ #define Q933_IE_REPEAT_INDICATOR 0xD0 @@ -237,7 +237,8 @@ static const value_string q933_info_element_vals7[] = { }; /* Codeset array */ -static const value_string *q933_info_element_vals[] = { +#define NUM_INFO_ELEMENT_VALS (Q933_IE_SHIFT_CODESET+1) +static const value_string *q933_info_element_vals[NUM_INFO_ELEMENT_VALS] = { q933_info_element_vals0, q933_info_element_vals1, q933_info_element_vals2, |