fix Bug 1407

as per bug 1406 actual values aren't raw bytes, they are BER encoded octet strings.



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20944 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 25 insertions, 25 deletions

diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c
index 760b24ec86..dd640dd5b3 100644
--- a/epan/dissectors/packet-h248_annex_c.c
+++ b/epan/dissectors/packet-h248_annex_c.c
@@ -825,7 +825,7 @@ static h248_pkg_param_t h248_annexc_package_properties[] = {
 	{ 0x3002, &hf_h248_pkg_annexc_BIR, dissect_h248_annexc_BIR, NULL },
 	{ 0x3003, &hf_h248_pkg_annexc_NSAP, dissect_h248_annexc_NSAP, NULL },
 	
-	{ 0x4001, &hf_h248_pkg_annexc_aesa, h248_param_item, &twenty },
+	{ 0x4001, &hf_h248_pkg_annexc_aesa, h248_param_ber_octetstring, NULL },
 	{ 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, h248_param_ber_integer, NULL },
@@ -833,22 +833,22 @@ static h248_pkg_param_t h248_annexc_package_properties[] = {
 	{ 0x4006, &hf_h248_pkg_annexc_atc, h248_param_ber_integer, 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 },
-	{ 0x400c, &hf_h248_pkg_annexc_pcr1, h248_param_item, &three },
-	{ 0x400d, &hf_h248_pkg_annexc_scr1, h248_param_item, &three },
-	{ 0x400e, &hf_h248_pkg_annexc_mbs1, h248_param_item, &three },
+	{ 0x4009, &hf_h248_pkg_annexc_pcr0, h248_param_ber_octetstring, NULL },
+	{ 0x400a, &hf_h248_pkg_annexc_scr0, h248_param_ber_octetstring, NULL },
+	{ 0x400b, &hf_h248_pkg_annexc_mbs0, h248_param_ber_octetstring, NULL },
+	{ 0x400c, &hf_h248_pkg_annexc_pcr1, h248_param_ber_octetstring, NULL },
+	{ 0x400d, &hf_h248_pkg_annexc_scr1, h248_param_ber_octetstring, NULL },
+	{ 0x400e, &hf_h248_pkg_annexc_mbs1, h248_param_ber_octetstring, NULL },
 	{ 0x400f, &hf_h248_pkg_annexc_bei, h248_param_ber_boolean, NULL },
 	{ 0x4010, &hf_h248_pkg_annexc_ti, h248_param_ber_boolean, NULL },
 	{ 0x4011, &hf_h248_pkg_annexc_fd, h248_param_ber_boolean, NULL },
-	{ 0x4012, &hf_h248_pkg_annexc_a2pcdv, h248_param_item, &three },
-	{ 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 },
+	{ 0x4012, &hf_h248_pkg_annexc_a2pcdv, h248_param_ber_octetstring, NULL },
+	{ 0x4013, &hf_h248_pkg_annexc_c2pcdv, h248_param_ber_octetstring, NULL },
+	{ 0x4014, &hf_h248_pkg_annexc_appcdv, h248_param_ber_octetstring, NULL },
+	{ 0x4015, &hf_h248_pkg_annexc_cppcdv, h248_param_ber_octetstring, 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 },
+	{ 0x4017, &hf_h248_pkg_annexc_meetd, h248_param_ber_octetstring,NULL },
+	{ 0x4018, &hf_h248_pkg_annexc_ceetd, h248_param_ber_octetstring,NULL },
 	{ 0x4019, &hf_h248_pkg_annexc_QosClass, h248_param_ber_integer, NULL },
 	{ 0x401A, &hf_h248_pkg_annexc_AALtype, h248_param_ber_integer, NULL },
 
@@ -857,17 +857,17 @@ static h248_pkg_param_t h248_annexc_package_properties[] = {
 	{ 0x5003, &hf_h248_pkg_annexc_sid, h248_param_ber_integer, NULL },
 	{ 0x5004, &hf_h248_pkg_annexc_ppt, h248_param_ber_integer, NULL },
 	
-	{ 0x6001, &hf_h248_pkg_annexc_ipv4, h248_param_item, &four },
-	{ 0x6002, &hf_h248_pkg_annexc_ipv6, h248_param_item, &sixteen },
+	{ 0x6001, &hf_h248_pkg_annexc_ipv4, h248_param_ber_octetstring, NULL },
+	{ 0x6002, &hf_h248_pkg_annexc_ipv6, h248_param_ber_octetstring,NULL },
 	{ 0x6003, &hf_h248_pkg_annexc_port, h248_param_ber_integer, NULL },
 	{ 0x6004, &hf_h248_pkg_annexc_porttype, h248_param_ber_integer, NULL },
 	
-	{ 0x7001, &hf_h248_pkg_annexc_aesa, h248_param_item, &twenty },
-	{ 0x7002, &hf_h248_pkg_annexc_alc, h248_param_item, &twelve }, /* from ALCAP */
-	{ 0x7003, &hf_h248_pkg_annexc_sscs, h248_param_item, NULL }, 
-	{ 0x7004, &hf_h248_pkg_annexc_sut, h248_param_item, NULL }, 
+	{ 0x7001, &hf_h248_pkg_annexc_aesa, h248_param_ber_octetstring, NULL },
+	{ 0x7002, &hf_h248_pkg_annexc_alc, h248_param_ber_octetstring,NULL }, /* from ALCAP */
+	{ 0x7003, &hf_h248_pkg_annexc_sscs, h248_param_ber_octetstring, NULL }, 
+	{ 0x7004, &hf_h248_pkg_annexc_sut, h248_param_ber_octetstring, NULL }, 
 	{ 0x7005, &hf_h248_pkg_annexc_tci, h248_param_ber_boolean, NULL }, 
-	{ 0x7006, &hf_h248_pkg_annexc_timer_cu, h248_param_item, &four }, 
+	{ 0x7006, &hf_h248_pkg_annexc_timer_cu, h248_param_ber_octetstring, NULL }, 
 	{ 0x7007, &hf_h248_pkg_annexc_maxcpssdu, h248_param_ber_integer, NULL }, 
 	{ 0x7008, &hf_h248_pkg_annexc_cid, h248_param_ber_integer, NULL }, 
 	
@@ -875,7 +875,7 @@ static h248_pkg_param_t h248_annexc_package_properties[] = {
 	{ 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 }, 
+	{ 0x8005, &hf_h248_pkg_annexc_sdbt, h248_param_ber_octetstring,NULL }, 
 	{ 0x8006, &hf_h248_pkg_annexc_pfci, h248_param_ber_integer, NULL }, 
 
 	{ 0x9001, &hf_h248_pkg_annexc_tmr, h248_param_ber_integer, NULL },
@@ -908,14 +908,14 @@ static h248_pkg_param_t h248_annexc_package_properties[] = {
 	{ 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 },
+	{ 0x901f, &hf_h248_pkg_annexc_dialedn, h248_param_ber_octetstring, NULL },
+	{ 0x9020, &hf_h248_pkg_annexc_dialingn, h248_param_ber_octetstring, NULL },
 	{ 0x9021, &hf_h248_pkg_annexc_echoci, h248_param_ber_integer, 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 },
-	{ 0xA002, &hf_h248_pkg_annexc_bmsdu, h248_param_item, &four },
+	{ 0xA001, &hf_h248_pkg_annexc_fmsdu, h248_param_ber_octetstring, NULL },
+	{ 0xA002, &hf_h248_pkg_annexc_bmsdu, h248_param_ber_octetstring, NULL },
 	{ 0xA003, &hf_h248_pkg_annexc_sscs, NULL, NULL },
 
 	{ 0xB001, &hf_h248_pkg_annexc_sdp_v, h248_param_ber_octetstring, &h248_c_implicit },