fix Bug 1406:

it looks like 1 byte parameters are ber encoded integers, not raw data.

svn path=/trunk/; revision=20943

1 files changed, 34 insertions, 38 deletions

diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c
index 496bb92fa1..760b24ec86 100644
--- a/epan/dissectors/packet-h248_annex_c.c
+++ b/epan/dissectors/packet-h248_annex_c.c
@@ -791,10 +791,6 @@ static void dissect_h248_annexc_vpvc(proto_tree* tree, tvbuff_t* tvb, packet_inf
 	proto_tree_add_item(pt,hf_h248_pkg_annexc_vc,tvb,2,2,FALSE);
 }
 
-static void dissect_byte_param(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo _U_, int hfid, h248_curr_info_t* h248_info _U_, void* unused _U_) {
-	proto_tree_add_item(tree,hfid,tvb,0,1,FALSE);
-}
-
 static void dissect_h248_annexc_USI(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, int hfid, h248_curr_info_t* h248_info _U_, void* implicit_p) {
 	tvbuff_t* new_tvb = NULL;
 	dissect_ber_octet_string(implicit_p ? *((gboolean*)implicit_p) : FALSE, pinfo, tree, tvb, 0, hfid, &new_tvb);
@@ -832,11 +828,11 @@ static h248_pkg_param_t h248_annexc_package_properties[] = {
 	{ 0x4001, &hf_h248_pkg_annexc_aesa, h248_param_item, &twenty },
 	{ 0x4002, &hf_h248_pkg_annexc_vp, dissect_h248_annexc_vpvc, NULL },
 	{ 0x4003, &hf_h248_pkg_annexc_sc, h248_param_ber_integer, NULL },
-	{ 0x4004, &hf_h248_pkg_annexc_bcob, dissect_byte_param, NULL },
-	{ 0x4005, &hf_h248_pkg_annexc_bbtc, dissect_byte_param, NULL },
+	{ 0x4004, &hf_h248_pkg_annexc_bcob, h248_param_ber_integer, NULL },
+	{ 0x4005, &hf_h248_pkg_annexc_bbtc, h248_param_ber_integer, NULL },
 	{ 0x4006, &hf_h248_pkg_annexc_atc, h248_param_ber_integer, NULL },
-	{ 0x4007, &hf_h248_pkg_annexc_stc, dissect_byte_param, NULL },
-	{ 0x4008, &hf_h248_pkg_annexc_uppc, dissect_byte_param, NULL },
+	{ 0x4007, &hf_h248_pkg_annexc_stc, h248_param_ber_integer, NULL },
+	{ 0x4008, &hf_h248_pkg_annexc_uppc, h248_param_ber_integer, NULL },
 	{ 0x4009, &hf_h248_pkg_annexc_pcr0, h248_param_item, &three },
 	{ 0x400a, &hf_h248_pkg_annexc_scr0, h248_param_item, &three },
 	{ 0x400b, &hf_h248_pkg_annexc_mbs0, h248_param_item, &three },
@@ -850,11 +846,11 @@ static h248_pkg_param_t h248_annexc_package_properties[] = {
 	{ 0x4013, &hf_h248_pkg_annexc_c2pcdv, h248_param_item, &three },
 	{ 0x4014, &hf_h248_pkg_annexc_appcdv, h248_param_item, &three },
 	{ 0x4015, &hf_h248_pkg_annexc_cppcdv, h248_param_item, &three },
-	{ 0x4016, &hf_h248_pkg_annexc_aclr, dissect_byte_param, NULL },
+	{ 0x4016, &hf_h248_pkg_annexc_aclr, h248_param_ber_integer, NULL },
 	{ 0x4017, &hf_h248_pkg_annexc_meetd, h248_param_item, &two },
 	{ 0x4018, &hf_h248_pkg_annexc_ceetd, h248_param_item, &two },
 	{ 0x4019, &hf_h248_pkg_annexc_QosClass, h248_param_ber_integer, NULL },
-	{ 0x401A, &hf_h248_pkg_annexc_AALtype, dissect_byte_param, NULL },
+	{ 0x401A, &hf_h248_pkg_annexc_AALtype, h248_param_ber_integer, NULL },
 
 	{ 0x5001, &hf_h248_pkg_annexc_dlci, h248_param_ber_integer, NULL },
 	{ 0x5002, &hf_h248_pkg_annexc_cid, h248_param_ber_integer, NULL },
@@ -872,28 +868,28 @@ static h248_pkg_param_t h248_annexc_package_properties[] = {
 	{ 0x7004, &hf_h248_pkg_annexc_sut, h248_param_item, NULL }, 
 	{ 0x7005, &hf_h248_pkg_annexc_tci, h248_param_ber_boolean, NULL }, 
 	{ 0x7006, &hf_h248_pkg_annexc_timer_cu, h248_param_item, &four }, 
-	{ 0x7007, &hf_h248_pkg_annexc_maxcpssdu, dissect_byte_param, NULL }, 
-	{ 0x7008, &hf_h248_pkg_annexc_cid, dissect_byte_param, NULL }, 
+	{ 0x7007, &hf_h248_pkg_annexc_maxcpssdu, h248_param_ber_integer, NULL }, 
+	{ 0x7008, &hf_h248_pkg_annexc_cid, h248_param_ber_integer, NULL }, 
 	
-	{ 0x8001, &hf_h248_pkg_annexc_aal1st, dissect_byte_param, NULL },
-	{ 0x8002, &hf_h248_pkg_annexc_cbrr, dissect_byte_param, NULL },
-	{ 0x8003, &hf_h248_pkg_annexc_scri, dissect_byte_param, NULL }, 
-	{ 0x8004, &hf_h248_pkg_annexc_ecm, dissect_byte_param, NULL }, 
+	{ 0x8001, &hf_h248_pkg_annexc_aal1st, h248_param_ber_integer, NULL },
+	{ 0x8002, &hf_h248_pkg_annexc_cbrr, h248_param_ber_integer, NULL },
+	{ 0x8003, &hf_h248_pkg_annexc_scri, h248_param_ber_integer, NULL }, 
+	{ 0x8004, &hf_h248_pkg_annexc_ecm, h248_param_ber_integer, NULL }, 
 	{ 0x8005, &hf_h248_pkg_annexc_sdbt, h248_param_item, &two }, 
-	{ 0x8006, &hf_h248_pkg_annexc_pfci, dissect_byte_param, NULL }, 
-
-	{ 0x9001, &hf_h248_pkg_annexc_tmr, dissect_byte_param, NULL },
-	{ 0x9002, &hf_h248_pkg_annexc_tmrsr, dissect_byte_param, NULL },
-	{ 0x9003, &hf_h248_pkg_annexc_contcheck, dissect_byte_param, NULL },
-	{ 0x9004, &hf_h248_pkg_annexc_itc, dissect_byte_param, NULL },
-	{ 0x9005, &hf_h248_pkg_annexc_transmode, dissect_byte_param, NULL },
-	{ 0x9006, &hf_h248_pkg_annexc_transrate, dissect_byte_param, NULL },
-	{ 0x9007, &hf_h248_pkg_annexc_mult, dissect_byte_param, NULL },
+	{ 0x8006, &hf_h248_pkg_annexc_pfci, h248_param_ber_integer, NULL }, 
+
+	{ 0x9001, &hf_h248_pkg_annexc_tmr, h248_param_ber_integer, NULL },
+	{ 0x9002, &hf_h248_pkg_annexc_tmrsr, h248_param_ber_integer, NULL },
+	{ 0x9003, &hf_h248_pkg_annexc_contcheck, h248_param_ber_integer, NULL },
+	{ 0x9004, &hf_h248_pkg_annexc_itc, h248_param_ber_integer, NULL },
+	{ 0x9005, &hf_h248_pkg_annexc_transmode, h248_param_ber_integer, NULL },
+	{ 0x9006, &hf_h248_pkg_annexc_transrate, h248_param_ber_integer, NULL },
+	{ 0x9007, &hf_h248_pkg_annexc_mult, h248_param_ber_integer, NULL },
 	{ 0x9008, &hf_h248_pkg_annexc_USI, dissect_h248_annexc_USI, NULL },
-	{ 0x9009, &hf_h248_pkg_annexc_syncasync, dissect_byte_param, NULL },
-	{ 0x900A, &hf_h248_pkg_annexc_negotiation, dissect_byte_param, NULL },
-	{ 0x900B, &hf_h248_pkg_annexc_userrate, dissect_byte_param, NULL },
-	{ 0x900C, &hf_h248_pkg_annexc_intrate, dissect_byte_param, NULL },
+	{ 0x9009, &hf_h248_pkg_annexc_syncasync, h248_param_ber_integer, NULL },
+	{ 0x900A, &hf_h248_pkg_annexc_negotiation, h248_param_ber_integer, NULL },
+	{ 0x900B, &hf_h248_pkg_annexc_userrate, h248_param_ber_integer, NULL },
+	{ 0x900C, &hf_h248_pkg_annexc_intrate, h248_param_ber_integer, NULL },
 	{ 0x900D, &hf_h248_pkg_annexc_nictx, h248_param_ber_boolean, NULL },
 	{ 0x900E, &hf_h248_pkg_annexc_nicrx, h248_param_ber_boolean, NULL },
 	{ 0x900F, &hf_h248_pkg_annexc_flowconttx, h248_param_ber_boolean, NULL },
@@ -904,18 +900,18 @@ static h248_pkg_param_t h248_annexc_package_properties[] = {
 	{ 0x9014, &hf_h248_pkg_annexc_llidnegot, h248_param_ber_boolean, NULL },
 	{ 0x9015, &hf_h248_pkg_annexc_assign, h248_param_ber_boolean, NULL },
 	{ 0x9016, &hf_h248_pkg_annexc_inbandneg, h248_param_ber_boolean, NULL },
-	{ 0x9017, &hf_h248_pkg_annexc_stopbits, dissect_byte_param, NULL },
-	{ 0x9018, &hf_h248_pkg_annexc_databits, dissect_byte_param, NULL },
-	{ 0x9019, &hf_h248_pkg_annexc_parity, dissect_byte_param, NULL },
-	{ 0x901a, &hf_h248_pkg_annexc_duplexmode, dissect_byte_param, NULL },
-	{ 0x901b, &hf_h248_pkg_annexc_modem, dissect_byte_param, NULL },
-	{ 0x901c, &hf_h248_pkg_annexc_layer2prot, dissect_byte_param, NULL },
-	{ 0x901d, &hf_h248_pkg_annexc_layer3prot, dissect_byte_param, NULL },
-	{ 0x901e, &hf_h248_pkg_annexc_addlayer3prot, dissect_byte_param, NULL },
+	{ 0x9017, &hf_h248_pkg_annexc_stopbits, h248_param_ber_integer, NULL },
+	{ 0x9018, &hf_h248_pkg_annexc_databits, h248_param_ber_integer, NULL },
+	{ 0x9019, &hf_h248_pkg_annexc_parity, h248_param_ber_integer, NULL },
+	{ 0x901a, &hf_h248_pkg_annexc_duplexmode, h248_param_ber_integer, NULL },
+	{ 0x901b, &hf_h248_pkg_annexc_modem, h248_param_ber_integer, NULL },
+	{ 0x901c, &hf_h248_pkg_annexc_layer2prot, h248_param_ber_integer, NULL },
+	{ 0x901d, &hf_h248_pkg_annexc_layer3prot, h248_param_ber_integer, NULL },
+	{ 0x901e, &hf_h248_pkg_annexc_addlayer3prot, h248_param_ber_integer, NULL },
 	{ 0x901f, &hf_h248_pkg_annexc_dialedn, h248_param_item, &thirty },
 	{ 0x9020, &hf_h248_pkg_annexc_dialingn, h248_param_item, &thirty },
 	{ 0x9021, &hf_h248_pkg_annexc_echoci, h248_param_ber_integer, NULL },
-	{ 0x9022, &hf_h248_pkg_annexc_nci, dissect_byte_param, NULL },
+	{ 0x9022, &hf_h248_pkg_annexc_nci, h248_param_ber_integer, NULL },
 	{ 0x9023, &hf_h248_pkg_annexc_USI, dissect_h248_annexc_USI, NULL },
 	
 	{ 0xA001, &hf_h248_pkg_annexc_fmsdu, h248_param_item, &four },