osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Michael Lum: fixed BCD decoding of filler nibble and fixed some 

minor bugs.

svn path=/trunk/; revision=8803
This commit is contained in:
Guy Harris 2003-10-28 18:08:52 +00:00
parent 836f12e207
commit 67406fcfd2
3 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packet-ansi_a.c
View File

@ -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);

10
packet-ansi_map.c
View File

@ -79,7 +79,7 @@
* UIM
* 3GPP2 N.S0003
*
* $Id: packet-ansi_map.c,v 1.4 2003/10/16 18:14:32 guy Exp $
* $Id: packet-ansi_map.c,v 1.5 2003/10/28 18:08:52 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -713,18 +713,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];

28
packet-bssap.c
View File

@ -7,7 +7,7 @@
* Copyright 2003, Michael Lum <mlum [AT] telostech.com>
* In association with Telos Technology Inc.
*
* $Id: packet-bssap.c,v 1.2 2003/10/24 00:38:34 guy Exp $
* $Id: packet-bssap.c,v 1.3 2003/10/28 18:08:52 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -90,6 +90,7 @@ static const value_string bsap_pdu_type_acro_values[] = {
#define DATA_LENGTH 1
#define CC_MASK 0xc0
#define SPARE_MASK 0x38
#define SAPI_MASK 0x07
static const value_string bssap_cc_values[] = {
@ -118,6 +119,8 @@ static int hf_bssap_pdu_type = -1;
static int hf_bsap_pdu_type = -1;
static int hf_bssap_dlci_cc = -1;
static int hf_bsap_dlci_cc = -1;
static int hf_bssap_dlci_spare = -1;
static int hf_bsap_dlci_rsvd = -1;
static int hf_bssap_dlci_sapi = -1;
static int hf_bsap_dlci_sapi = -1;
static int hf_bssap_length = -1;
@ -190,7 +193,7 @@ dissect_bssap_dlci_param(tvbuff_t *tvb, proto_tree *tree, guint8 length)
{
proto_item *dlci_item = 0;
proto_tree *dlci_tree = 0;
guint8 cc, sapi;
guint8 oct;
dlci_item =
proto_tree_add_text(tree, tvb, 0, length,
@ -198,18 +201,19 @@ dissect_bssap_dlci_param(tvbuff_t *tvb, proto_tree *tree, guint8 length)
dlci_tree = proto_item_add_subtree(dlci_item, ett_bssap_dlci);
cc = tvb_get_guint8(tvb, 0) & CC_MASK;
sapi = tvb_get_guint8(tvb, 0) & SAPI_MASK;
oct = tvb_get_guint8(tvb, 0);
if (bssap_or_bsap_global == BSSAP)
{
proto_tree_add_uint(dlci_tree, hf_bssap_dlci_cc, tvb, 0, length, cc);
proto_tree_add_uint(dlci_tree, hf_bssap_dlci_sapi, tvb, 0, length, sapi);
proto_tree_add_uint(dlci_tree, hf_bssap_dlci_cc, tvb, 0, length, oct);
proto_tree_add_uint(dlci_tree, hf_bssap_dlci_spare, tvb, 0, length, oct);
proto_tree_add_uint(dlci_tree, hf_bssap_dlci_sapi, tvb, 0, length, oct);
}
else
{
proto_tree_add_uint(dlci_tree, hf_bsap_dlci_cc, tvb, 0, length, cc);
proto_tree_add_uint(dlci_tree, hf_bsap_dlci_sapi, tvb, 0, length, sapi);
proto_tree_add_uint(dlci_tree, hf_bsap_dlci_cc, tvb, 0, length, oct);
proto_tree_add_uint(dlci_tree, hf_bsap_dlci_rsvd, tvb, 0, length, oct);
proto_tree_add_uint(dlci_tree, hf_bsap_dlci_sapi, tvb, 0, length, oct);
}
}
@ -418,6 +422,14 @@ proto_register_bssap(void)
{ "Control Channel", "bsap.dlci.cc",
FT_UINT8, BASE_HEX, VALS(bsap_cc_values), CC_MASK,
"", HFILL}},
{ &hf_bssap_dlci_spare,
{ "Spare", "bssap.dlci.spare",
FT_UINT8, BASE_HEX, NULL, SPARE_MASK,
"", HFILL}},
{ &hf_bsap_dlci_rsvd,
{ "Reserved", "bsap.dlci.rsvd",
FT_UINT8, BASE_HEX, NULL, SPARE_MASK,
"", HFILL}},
{ &hf_bssap_dlci_sapi,
{ "SAPI", "bssap.dlci.sapi",
FT_UINT8, BASE_HEX, VALS(bssap_sapi_values), SAPI_MASK,