diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-10-28 18:08:52 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-10-28 18:08:52 +0000 |
| commit | 67406fcfd2a3f73a9f0c2440e355df5e38728a7b (patch) | |
| tree | f868288030f01b4c56adcb3d4502c79174bdbf32 /packet-ansi_a.c | |
| parent | 836f12e2071a3e10d789b024728d83c67ce9a47c (diff) | |
From Michael Lum: fixed BCD decoding of filler nibble and fixed some
minor bugs.
svn path=/trunk/; revision=8803
Diffstat (limited to 'packet-ansi_a.c')
| -rw-r--r-- | packet-ansi_a.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/packet-ansi_a.c b/packet-ansi_a.c index 0909cb52c3..6b5f8fc52d 100644 --- a/packet-ansi_a.c +++ b/packet-ansi_a.c @@ -10,7 +10,7 @@ * 2000 Access Network Interfaces * 3GPP2 A.S0001-1 TIA/EIA-2001 * - * $Id: packet-ansi_a.c,v 1.1 2003/10/22 20:59:01 guy Exp $ + * $Id: packet-ansi_a.c,v 1.2 2003/10/28 18:08:51 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -434,18 +434,16 @@ my_dgt_tbcd_unpack( /* * unpack first value in byte */ - i = *in; - i &= 0x0F; - *out++ = dgt->out[i]; + i = *in++; + *out++ = dgt->out[i & 0x0f]; cnt++; /* * unpack second value in byte */ - i = *in++; i >>= 4; - if (i == 0xff) /* odd number bytes - hit filler */ + if (i == 0x0f) /* odd number bytes - hit filler */ break; *out++ = dgt->out[i]; @@ -606,7 +604,7 @@ elem_chan_type(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar case 0: str = "No Alert"; break; case 1: str = "Speech"; break; case 2: str = "Data"; data = TRUE; break; - case 3: str = "Signaling"; + case 3: str = "Signaling"; break; default: str = "Unknown"; break; @@ -2007,7 +2005,6 @@ elem_cell_id_list(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gc guint32 curr_offset; gchar *str = NULL; - add_string = add_string; curr_offset = offset; oct = tvb_get_guint8(tvb, curr_offset); |