Implement TLV-E and LV-E type IE dissection (2 byte length value).

svn path=/trunk/; revision=27100

1 files changed, 15 insertions, 15 deletions

diff --git a/epan/dissectors/packet-gsm_bsslap.c b/epan/dissectors/packet-gsm_bsslap.c
index 5bd3b43cde..5f00b92534 100644
--- a/epan/dissectors/packet-gsm_bsslap.c
+++ b/epan/dissectors/packet-gsm_bsslap.c
@@ -170,7 +170,7 @@ gint ett_gsm_bsslap_elem[NUM_GSM_BSSLAP_ELEM];
 /*
  * 5.2 Timing Advance IE
  */
-static guint8
+static guint16
 de_ta(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_)
 {
 	guint32	curr_offset;
@@ -185,7 +185,7 @@ de_ta(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add
  * 5.12 Measurement Report IE
  */
 #if 0
-static guint8
+static guint16
 de_meas_rep(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_)
 {
 	guint32	curr_offset;
@@ -214,7 +214,7 @@ static const value_string gsm_bsslap_cause_vals[] = {
 	{ 0,	NULL }
 };
 
-static guint8
+static guint16
 de_bsslap_cause(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_)
 {
 	guint32	curr_offset;
@@ -232,7 +232,7 @@ static const true_false_string gsm_bsslap_rrlp_flg_vals = {
 	"Not a Positioning Command or final response." ,
 	"Position Command (SMLC to BSC) or final response (BSC to SMLC)"
 };
-static guint8
+static guint16
 de_rrlp_flg(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_)
 {
 	guint32	curr_offset;
@@ -243,7 +243,7 @@ de_rrlp_flg(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gcha
 
 	return(curr_offset - offset);
 }
-static guint8
+static guint16
 de_rrlp_ie(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_)
 {
    guint32 curr_offset;
@@ -280,7 +280,7 @@ const value_string gsm_a_bsslap_cell_id_disc_vals[] = {
 
 
 
-static guint8
+static guint16
 de_cell_id_list(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_)
 {
 	guint32	curr_offset;
@@ -340,7 +340,7 @@ de_cell_id_list(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gcha
  * ENHANCED MEASUREMENT REPORT message in 3GPP TS 44.018 (excluding the fields:
  * "RR short PD", "Message type" and "Short layer 2 header")...
  */
-static guint8
+static guint16
 de_enh_meas_rep(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_)
 {
 	guint32	curr_offset;
@@ -354,7 +354,7 @@ de_enh_meas_rep(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gcha
 /*
  * 5.19 Location Area Code IE
  */
-static guint8
+static guint16
 de_lac(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_)
 {
 	guint32	curr_offset;
@@ -368,7 +368,7 @@ de_lac(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *ad
 /*
  * 5.21 MS Power IE
  */
-static guint8
+static guint16
 de_ms_pow(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_)
 {
 	guint32	curr_offset;
@@ -383,7 +383,7 @@ de_ms_pow(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar
 /* 
  * 5.22 Delta Timer IE
  */
-static guint8
+static guint16
 de_delta_time(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_)
 {
 	guint32	curr_offset;
@@ -401,7 +401,7 @@ de_delta_time(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gc
 /*
  * 5.24 Encryption Key
  */
-static guint8
+static guint16
 de_blap_enc_key(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_)
 {
 	guint32	curr_offset;
@@ -427,7 +427,7 @@ de_blap_enc_key(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_,
 /*
  * 5.28 Polling Repetition IE
  */
-static guint8
+static guint16
 de_poll_rep(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_)
 {
 	guint32	curr_offset;
@@ -444,7 +444,7 @@ de_poll_rep(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gcha
  * described in TS 44.018 (CCCH) or TS 44.060 (PCCCH) plus
  * padding bits (binary 0) as required to achieve 4 complete octets
  */
-static guint8
+static guint16
 de_pkt_ch_desc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_)
 {
 	guint32	curr_offset;
@@ -463,7 +463,7 @@ de_pkt_ch_desc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar
  * The Temporary Flow Identity field identifies an uplink Temporary Block Flow (TBF). 
  * This field is encoded as a binary number. Range 0 to 31
  */
-static guint8
+static guint16
 de_tfi(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_)
 {
 	guint32	curr_offset;
@@ -523,7 +523,7 @@ bsslap_elem_idx_t;
 */
 elem_fcn bsslap_elem_fcn[];
 
-guint8 (*bsslap_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add_string, int string_len) = {
+guint16 (*bsslap_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add_string, int string_len) = {
 	/* BSS LAP Elements 5 */
 	NULL,	/* Reserved */
 	de_ta,	/* Timing Advance */