Merge branch 'master' into proxy

3 files changed, 541 insertions, 237 deletions

diff --git a/wireshark/abis_oml.patch b/wireshark/abis_oml.patch
index 4d13fa23e..f48b3e6f9 100644
--- a/wireshark/abis_oml.patch
+++ b/wireshark/abis_oml.patch
@@ -1,20 +1,20 @@
 Index: wireshark/epan/dissectors/Makefile.common
 ===================================================================
---- wireshark.orig/epan/dissectors/Makefile.common	2009-07-03 22:20:16.000000000 +0200
-+++ wireshark/epan/dissectors/Makefile.common	2009-07-04 03:46:47.000000000 +0200
-@@ -926,6 +926,7 @@
- # Dissectors with warnings.
- #
- DIRTY_DISSECTOR_SRC =	\
+--- wireshark.orig/epan/dissectors/Makefile.common	2009-07-12 14:07:53.000000000 +0200
++++ wireshark/epan/dissectors/Makefile.common	2009-07-12 14:52:09.000000000 +0200
+@@ -472,6 +472,7 @@
+ 	packet-gsm_a_rp.c		\
+ 	packet-gsm_a_rr.c	\
+ 	packet-gsm_abis_ip.c	\
 +	packet-gsm_abis_oml.c	\
- 	packet-isakmp.c		\
- 	packet-k12.c 		\
- 	packet-nbd.c		\
+ 	packet-gsm_bsslap.c		\
+ 	packet-gsm_bssmap_le.c	\
+ 	packet-gsm_sms.c	\
 Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ wireshark/epan/dissectors/packet-gsm_abis_oml.c	2009-07-04 03:47:46.000000000 +0200
-@@ -0,0 +1,1241 @@
++++ wireshark/epan/dissectors/packet-gsm_abis_oml.c	2009-07-12 20:41:18.000000000 +0200
+@@ -0,0 +1,1363 @@
 +/* packet-abis_oml.c
 + * Routines for packet dissection of GSM A-bis over IP (3GPP TS 12.21)
 + * Copyright 2009 by Harald Welte <laforge@gnumonks.org>
@@ -72,6 +72,7 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +static int hf_oml_fom_attr_val = -1;
 +/* FOM attributes */
 +static int hf_attr_adm_state = -1;
++static int hf_attr_arfcn = -1;
 +static int hf_attr_oper_state = -1;
 +static int hf_attr_avail_state = -1;
 +static int hf_attr_event_type = -1;
@@ -113,6 +114,13 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +static int hf_attr_ipa_unit_name = -1;
 +static int hf_attr_ipa_nv_flags = -1;
 +static int hf_attr_ipa_nv_mask = -1;
++static int hf_attr_ipa_nsl_sport = -1;
++static int hf_attr_ipa_nsl_daddr = -1;
++static int hf_attr_ipa_nsl_dport = -1;
++static int hf_attr_ipa_nsei = -1;
++static int hf_attr_ipa_nsvci = -1;
++static int hf_attr_ipa_bvci = -1;
++static int hf_attr_ipa_rac = -1;
 +
 +/* initialize the subtree pointers */
 +static int ett_oml = -1;
@@ -248,6 +256,9 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +	{ NM_MT_IPACC_CONN_TRAF,	"IPA Connect Traffic" },
 +	{ NM_MT_IPACC_CONN_TRAF_ACK,	"IPA Connect Traffic ACK" },
 +	{ NM_MT_IPACC_CONN_TRAF_NACK,	"IPA Connect Traffic NACK" },
++	{ NM_MT_IPACC_DISC_TRAF,	"IPA Disconnect Traffic" },
++	{ NM_MT_IPACC_DISC_TRAF_ACK,	"IPA Disconnect Traffic ACK" },
++	{ NM_MT_IPACC_DISC_TRAF_NACK,	"IPA Disconnect Traffic NACK" },
 +	{ NM_MT_IPACC_DEF_BOOT_SW,	"IPA Default Boot Software" },
 +	{ NM_MT_IPACC_DEF_BOOT_SW_ACK,	"IPA Default Boot Software ACK" },
 +	{ NM_MT_IPACC_DEF_BOOT_SW_NACK,	"IPA Default Boot Software NACK" },
@@ -257,6 +268,16 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +	{ NM_MT_IPACC_GET_NVATTR,	"IPA Get NVRAM Attributes" },
 +	{ NM_MT_IPACC_GET_NVATTR_ACK,	"IPA Get NVRAM Attributes ACK" },
 +	{ NM_MT_IPACC_GET_NVATTR_NACK,	"IPA Get NVRAM Attributes NACK" },
++	{ NM_MT_IPACC_SET_ATTR,		"IPA Set Attributes" },
++	{ NM_MT_IPACC_SET_ATTR_ACK,	"IPA Set Attributes ACK" },
++	{ NM_MT_IPACC_SET_ATTR_NACK,	"IPA Set Attributes NACK" },
++	{ NM_MT_IPACC_ATTR_CHG_EVT,	"IPA Attribute Change Event" },
++	{ NM_MT_IPACC_SW_DEACT,		"IPA Software Deactivate" },
++	{ NM_MT_IPACC_SW_DEACT_ACK,	"IPA Software Deactivate ACK" },
++	{ NM_MT_IPACC_SW_DEACT_NACK,	"IPA Software Deactivate NACK" },
++	{ NM_MT_IPACC_MEAS_RES_REQ_NACK,"IPA Measurement Result Request NACK" },
++	{ NM_MT_IPACC_START_MEAS_NACK,	"IPA Start Measurement NACK" },
++	{ NM_MT_IPACC_STOP_MEAS_NACK,	"IPA Stop Measurement NACK" },
 +	{ NM_MT_BS11_RESET_RESOURCE,	"SIE Reset Resource" },
 +	{ NM_MT_BS11_BEGIN_DB_TX,	"SIE Begin Database Transmission" },
 +	{ NM_MT_BS11_BEGIN_DB_TX_ACK,	"SIE Begin Database Transmission ACK" },
@@ -394,24 +415,54 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +	{ NM_ATT_BS11_ENA_RXLEV_HO,	"SIE Enable RxLevel HO" },
 +	{ NM_ATT_BS11_ENA_RXQUAL_HO,	"SIE Enable RxQual HO" },
 +	{ NM_ATT_BS11_FACCH_QUAL,	"SIE FACCH Quality" },
-+	{ NM_ATT_IPACC_RSL_BSC_IP,	"IPA BSC RSL IP Address" },
-+	{ NM_ATT_IPACC_RSL_BSC_PORT,	"IPA BSC RSL TCP Port" },
++	{ NM_ATT_IPACC_DST_IP,		"IPA Destination IP Address" },
++	{ NM_ATT_IPACC_DST_IP_PORT,	"IPA Destionation IP Port" },
++	{ NM_ATT_IPACC_SSRC,		"IPA RTP SSRC" },
++	{ NM_ATT_IPACC_RTP_PAYLD_TYPE,	"IPA RTP Payload Type" },
++	{ NM_ATT_IPACC_BASEB_ID,	"IPA Baseband Identifier" },
++	{ NM_ATT_IPACC_STREAM_ID,	"IPA Stream Identifier" },
 +	{ NM_ATT_IPACC_NV_FLAGS,	"IPA NVRAM Flags" },
 +	{ NM_ATT_IPACC_FREQ_CTRL,	"IPA Frequency Control" },
++	{ NM_ATT_IPACC_PRIM_OML_CFG,	"IPA Primary OML Config" },
++	{ NM_ATT_IPACC_SEC_OML_CFG,	"IPA Secondary OML Config" },
 +	{ NM_ATT_IPACC_IP_IF_CFG,	"IPA IP Interface Config" },
 +	{ NM_ATT_IPACC_IP_GW_CFG,	"IPA IP Gateway Config" },
 +	{ NM_ATT_IPACC_IN_SERV_TIME,	"IPA In Service Time" },
-+	{ NM_ATT_IPACC_LOCATION,	"IPA Location Name" },
++	{ NM_ATT_IPACC_TRX_BTS_ASS,	"IPA TRX BTS Assignment" },
++	{ NM_ATT_IPACC_LOCATION,	"IPA BTS Location Name" },
++	{ NM_ATT_IPACC_PAGING_CFG,	"IPA Paging Configuration" },
++	{ NM_ATT_IPACC_FILE_DATA,	"IPA File Data" },
 +	{ NM_ATT_IPACC_UNIT_ID,		"IPA Unit ID" },
++	{ NM_ATT_IPACC_PARENT_UNIT_ID,	"IPA Parent Unit ID" },
 +	{ NM_ATT_IPACC_UNIT_NAME,	"IPA Unit Name" },
 +	{ NM_ATT_IPACC_SNMP_CFG,	"IPA SNMP Config" },
-+	{ NM_ATT_IPACC_PRIM_OML_IP,	"IPA Primary OML IP Address" },
-+	{ NM_ATT_IPACC_SEC_OML_IP,	"IPA Secondary OML IP Address" },
++	{ NM_ATT_IPACC_PRIM_OML_CFG_LIST, "IPA Primary OML Config List" },
++	{ NM_ATT_IPACC_PRIM_OML_FB_TOUT,"IPA Primary OML Fallback Timeout" },
 +	{ NM_ATT_IPACC_CUR_SW_CFG,	"IPA Current Software Config" },
++	{ NM_ATT_IPACC_TIMING_BUS,	"IPA Timing Bus" },
++	{ NM_ATT_IPACC_CGI,		"IPA CGI" },
++	{ NM_ATT_IPACC_RAC,		"IPA RAC" },
++	{ NM_ATT_IPACC_OBJ_VERSION,	"IPA Object Version" },
++	{ NM_ATT_IPACC_GPRS_PAGING_CFG,	"IPA GPRS Paging Configuration" },
++	{ NM_ATT_IPACC_NSEI,		"IPA NSEI" },
++	{ NM_ATT_IPACC_BVCI,		"IPA BVCI" },
++	{ NM_ATT_IPACC_NSVCI,		"IPA NSVCI" },
++	{ NM_ATT_IPACC_NS_CFG,		"IPA NS Configuration" },
++	{ NM_ATT_IPACC_BSSGP_CFG,	"IPA BSSGP Configuration" },
++	{ NM_ATT_IPACC_NS_LINK_CFG,	"IPA NS Link Configuration" },
++	{ NM_ATT_IPACC_RLC_CFG,		"IPA RLC Configuration" },
 +	{ NM_ATT_IPACC_ALM_THRESH_LIST,	"IPA Alarm Threshold List" },
++	{ NM_ATT_IPACC_MONIT_VAL_LIST,	"IPA Monitored Value List" },
++	{ NM_ATT_IPACC_TIB_CONTROL,	"IPA Timing Interface Bus Control" },
++	{ NM_ATT_IPACC_SUPP_FEATURES,	"IPA Supported Features" },
++	{ NM_ATT_IPACC_CODING_SCHEMES,	"IPA Coding Schemes" },
++	{ NM_ATT_IPACC_RLC_CFG_2,	"IPA RLC Configuration 2" },
++	{ NM_ATT_IPACC_HEARTB_TOUT,	"IPA Heartbeat Timeout" },
 +	{ NM_ATT_IPACC_UPTIME,		"IPA Uptime" },
++	{ NM_ATT_IPACC_RLC_CFG_3,	"IPA RLC Configuration 3" },
 +	{ NM_ATT_IPACC_SSL_CFG,		"IPA SSL Configuration" },
-+	{ NM_ATT_IPACC_SEC_POSSIBLE,	"IPA Security Possoble" },
++	{ NM_ATT_IPACC_SEC_POSSIBLE,	"IPA Security Possible" },
++	{ NM_ATT_IPACC_IML_SSL_STATE,	"IPA IML SSL State" },
 +	{ NM_ATT_IPACC_REVOC_DATE,	"IPA Revocation Date" },
 +	/* FIXME: More SIE */
 +};
@@ -512,11 +563,16 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +};
 +
 +static const value_string oml_test_no_vals[] = {
++	{ NM_IPACC_TESTNO_RLOOP_ANT,	"Radio Loop test via antenna" },
++	{ NM_IPACC_TESTNO_RLOOP_XCVR,	"Radio Loop test via transceiver" },
++	{ NM_IPACC_TESTNO_FUNC_OBJ,	"BTS Functional object self test" },
 +	{ NM_IPACC_TESTNO_CHAN_USAGE,	"Channel Usage" },
 +	{ NM_IPACC_TESTNO_BCCH_CHAN_USAGE, "BCCH Channel Usage" },
 +	{ NM_IPACC_TESTNO_FREQ_SYNC,	"Frequency Synchronization" },
 +	{ NM_IPACC_TESTNO_BCCH_INFO,	"BCCH Information" },
-+	{ NM_IPACC_TESTNO_TX_BEACON,	"Tx Beacon" },
++	{ NM_IPACC_TESTNO_TX_BEACON,	"Transmit Beacon" },
++	{ NM_IPACC_TESTNO_SYSINFO_MONITOR, "SysInfo Monitor" },
++	{ NM_IPACC_TESTNO_BCCCH_MONITOR, "BCCH & CCCH Monitor" },
 +};
 +
 +static const value_string ipacc_test_res_vals[] = {
@@ -634,7 +690,6 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +dissect_ipacc_test_rep(proto_tree *tree, tvbuff_t *tvb)
 +{
 +	gint offset = 0;
-+	guint8 test_res = tvb_get_guint8(tvb, offset);
 +
 +	proto_tree_add_item(tree, hf_attr_ipa_test_res, tvb, offset++,
 +			    1, FALSE);
@@ -665,6 +720,7 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +			break;
 +		}
 +	}
++	return offset;
 +}
 +
 +/* Dissect OML FOM Attributes after OML + FOM header */
@@ -675,7 +731,10 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +	int offset = base_offs;
 +
 +	while (tvb_reported_length_remaining(tvb, offset) != 0) {
++		guint i;
 +		guint8 tag, val8;
++		guint16 val16;
++		guint32 val32;
 +		unsigned int len, len_len, hlen;
 +		const struct tlv_def *tdef;
 +		proto_item *ti;
@@ -712,6 +771,10 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +			len = tvb_get_guint8(tvb, offset+1) << 8 |
 +						tvb_get_guint8(tvb, offset+2);
 +			break;
++		default:
++			hlen = len_len = len = 0;
++			DISSECTOR_ASSERT_NOT_REACHED();
++			break;
 +		}
 +
 +		ti = proto_tree_add_item(tree, hf_oml_fom_attr_tag, tvb,
@@ -736,31 +799,30 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +		case NM_ATT_ADM_STATE:
 +			proto_tree_add_item(att_tree, hf_attr_adm_state, tvb,
 +					    offset, len, FALSE);
-+			if (check_col(pinfo->cinfo, COL_INFO)) {
-+				val8 = tvb_get_guint8(tvb, offset);
-+				col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
-+						val_to_str(val8,
-+							   oml_adm_state_vals,
-+							   "%02x"));
-+			}
++			val8 = tvb_get_guint8(tvb, offset);
++			col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
++					val_to_str(val8, oml_adm_state_vals,
++						   "%02x"));
 +			break;
 +		case NM_ATT_ARFCN_LIST:
++			for (i = 0; i < len; i += 2) {
++				val16 = tvb_get_ntohs(tvb, offset + i);
++				proto_tree_add_uint(att_tree, hf_attr_arfcn,
++						    tvb, offset + i, 2, val16);
++			}
 +			break;
 +		case NM_ATT_AVAIL_STATUS:
-+			proto_tree_add_item(att_tree, hf_attr_avail_state, tvb,
-+					    offset, len, FALSE);
-+			if (check_col(pinfo->cinfo, COL_INFO)) {
-+				/* Availability status can have length 0 */
-+				if (len)
-+					val8 = tvb_get_guint8(tvb, offset);
-+				else
-+					val8 = 0xff;
-+				col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
-+						val_to_str(val8,
-+							   oml_avail_state_vals,
-+							   "%02x"));
-+			}
-+
++			/* Availability status can have length 0 */
++			if (len) {
++				val8 = tvb_get_guint8(tvb, offset);
++				proto_tree_add_item(att_tree,
++						    hf_attr_avail_state, tvb,
++					    	    offset, len, FALSE);
++			} else
++				val8 = 0xff;
++			col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
++					val_to_str(val8, oml_avail_state_vals,
++						   "%02x"));
 +			break;
 +		case NM_ATT_BCCH_ARFCN:
 +			proto_tree_add_item(att_tree, hf_attr_bcch_arfcn, tvb,
@@ -785,13 +847,10 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +		case NM_ATT_OPER_STATE:
 +			proto_tree_add_item(att_tree, hf_attr_oper_state, tvb,
 +					    offset, len, FALSE);
-+			if (check_col(pinfo->cinfo, COL_INFO)) {
-+				val8 = tvb_get_guint8(tvb, offset);
-+				col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
-+						val_to_str(val8,
-+							   oml_oper_state_vals,
-+							   "%02x"));
-+			}
++			val8 = tvb_get_guint8(tvb, offset);
++			col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
++					val_to_str(val8, oml_oper_state_vals,
++						   "%02x"));
 +			break;
 +		case NM_ATT_TEI:
 +			proto_tree_add_item(att_tree, hf_attr_tei, tvb,
@@ -811,23 +870,22 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +		case NM_ATT_TEST_NO:
 +			proto_tree_add_item(att_tree, hf_attr_test_no, tvb,
 +					    offset, len, TRUE);
-+			if (check_col(pinfo->cinfo, COL_INFO)) {
-+				val8 = tvb_get_guint8(tvb, offset);
-+				col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
-+						val_to_str(val8,
-+							   oml_test_no_vals,
-+							   "%02x"));
-+			}
++			val8 = tvb_get_guint8(tvb, offset);
++			col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
++					val_to_str(val8, oml_test_no_vals,
++						   "%02x"));
 +			break;
 +
 +		/* proprietary ip.access extensions */
-+		case NM_ATT_IPACC_RSL_BSC_IP:
-+			proto_tree_add_item(att_tree, hf_attr_ipa_rsl_ip, tvb,
-+					    offset, len, TRUE);
++		case NM_ATT_IPACC_DST_IP:
++			val32 = tvb_get_ntohl(tvb, offset);
++			proto_tree_add_ipv4(att_tree, hf_attr_ipa_rsl_ip, tvb,
++					    offset, len, val32);
 +			break;
-+		case NM_ATT_IPACC_RSL_BSC_PORT:
-+			proto_tree_add_item(att_tree, hf_attr_ipa_rsl_port, tvb,
-+					    offset, len, TRUE);
++		case NM_ATT_IPACC_DST_IP_PORT:
++			val16 = tvb_get_ntohs(tvb, offset);
++			proto_tree_add_uint(att_tree, hf_attr_ipa_rsl_port, tvb,
++					    offset, len, val16);
 +			break;
 +		case NM_ATT_IPACC_LOCATION:
 +			proto_tree_add_item(att_tree, hf_attr_ipa_location_name,
@@ -841,15 +899,12 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +			proto_tree_add_item(att_tree, hf_attr_ipa_unit_name,
 +					    tvb, offset, len, TRUE);
 +			break;
-+		case NM_ATT_IPACC_PRIM_OML_IP:
++		case NM_ATT_IPACC_PRIM_OML_CFG_LIST:
 +			proto_tree_add_item(att_tree, hf_attr_ipa_prim_oml_ip,
 +					    tvb, offset+1, 4, TRUE);
 +			proto_tree_add_item(att_tree, hf_attr_ipa_prim_oml_port,
 +					    tvb, offset+1+4, 2, TRUE);
 +			break;
-+		case NM_ATT_IPACC_SEC_OML_IP:
-+			/* FIXME */
-+			break;
 +		case NM_ATT_IPACC_NV_FLAGS:
 +			{
 +				guint flags, mask;
@@ -863,6 +918,36 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +						    tvb, offset+1, 3, mask);
 +			}
 +			break;
++		case NM_ATT_IPACC_RAC:
++			proto_tree_add_item(att_tree, hf_attr_ipa_rac,
++					    tvb, offset, 1, TRUE);
++			break;
++		case NM_ATT_IPACC_NSEI:
++			val16 = tvb_get_ntohs(tvb, offset);
++			proto_tree_add_uint(att_tree, hf_attr_ipa_nsei,
++					   tvb, offset, 2, val16);
++			break;
++		case NM_ATT_IPACC_NSVCI:
++			val16 = tvb_get_ntohs(tvb, offset);
++			proto_tree_add_uint(att_tree, hf_attr_ipa_nsvci,
++					   tvb, offset, 2, val16);
++			break;
++		case NM_ATT_IPACC_BVCI:
++			val16 = tvb_get_ntohs(tvb, offset);
++			proto_tree_add_uint(att_tree, hf_attr_ipa_bvci,
++					   tvb, offset, 2, val16);
++			break;
++		case NM_ATT_IPACC_NS_LINK_CFG:
++			val16 = tvb_get_ntohs(tvb, offset);
++			proto_tree_add_uint(att_tree, hf_attr_ipa_nsl_sport,
++					   tvb, offset, 2, val16);
++			val32 = tvb_get_ipv4(tvb, offset+2);
++			proto_tree_add_ipv4(att_tree, hf_attr_ipa_nsl_daddr,
++					   tvb, offset+2, 4, val32);
++			val16 = tvb_get_ntohs(tvb, offset+6);
++			proto_tree_add_uint(att_tree, hf_attr_ipa_nsl_dport,
++					   tvb, offset+6, 2, val16);
++			break;
 +		default:
 +			proto_tree_add_item(att_tree, hf_oml_fom_attr_val, tvb,
 +					    offset, len, FALSE);
@@ -873,7 +958,8 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +}
 +
 +static int
-+dissect_oml_fom(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
++dissect_oml_fom(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
++		int offset, proto_item *top_ti)
 +{
 +	guint8 msg_type, obj_class, bts_nr, trx_nr, ts_nr;
 +	proto_item *ti;
@@ -884,13 +970,16 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +	bts_nr = tvb_get_guint8(tvb, offset+2);
 +	trx_nr = tvb_get_guint8(tvb, offset+3);
 +	ts_nr = tvb_get_guint8(tvb, offset+4);
-+	if (check_col(pinfo->cinfo, COL_INFO)) {
-+		col_append_fstr(pinfo->cinfo, COL_INFO, "%s(%02x,%02x,%02x) %s ",
-+				val_to_str(obj_class, oml_fom_objclass_vals, "%02x"),
-+				bts_nr, trx_nr, ts_nr,
-+				val_to_str(msg_type, oml_fom_msgtype_vals,
-+					   "unknown 0x%x"));
-+	}
++	proto_item_append_text(top_ti, ", %s(%02x,%02x,%02x) %s ",
++			val_to_str(obj_class, oml_fom_objclass_vals, "%02x"),
++			bts_nr, trx_nr, ts_nr,
++			val_to_str(msg_type, oml_fom_msgtype_vals,
++				   "unknown 0x%x"));
++	col_append_fstr(pinfo->cinfo, COL_INFO, "%s(%02x,%02x,%02x) %s ",
++			val_to_str(obj_class, oml_fom_objclass_vals, "%02x"),
++			bts_nr, trx_nr, ts_nr,
++			val_to_str(msg_type, oml_fom_msgtype_vals,
++				   "unknown 0x%x"));
 +	ti = proto_tree_add_item(tree, hf_oml_fom_msgtype, tvb, offset++, 1, FALSE);
 +	fom_tree = proto_item_add_subtree(ti, ett_oml_fom);
 +	proto_tree_add_item(fom_tree, hf_oml_fom_objclass, tvb, offset++, 1, FALSE);
@@ -908,7 +997,8 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +static const guint8 ipaccess_magic[] = "com.ipaccess";
 +
 +static int
-+dissect_oml_manuf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
++dissect_oml_manuf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
++		  int offset, proto_item *top_ti)
 +{
 +	if (tvb_get_guint8(tvb, offset) != 0x0d ||
 +	    tvb_memeql(tvb, offset+1, ipaccess_magic, sizeof(ipaccess_magic)))
@@ -916,7 +1006,7 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +
 +	offset += sizeof(ipaccess_magic) + 1;
 +
-+	return dissect_oml_fom(tvb, pinfo, tree, offset);
++	return dissect_oml_fom(tvb, pinfo, tree, offset, top_ti);
 +}
 +
 +static void
@@ -927,12 +1017,7 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +
 +	int offset = 0;
 +
-+	if (check_col(pinfo->cinfo, COL_PROTOCOL))
-+		col_set_str(pinfo->cinfo, COL_PROTOCOL, "OML");
-+#if 0
-+	if (check_col(pinfo->cinfo, COL_INFO))
-+		col_clear(pinfo->cinfo, COL_INFO);
-+#endif
++	col_set_str(pinfo->cinfo, COL_PROTOCOL, "OML");
 +
 +	top_tree = tree;
 +	if (tree) {
@@ -952,10 +1037,11 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +
 +		switch (msg_disc) {
 +		case ABIS_OM_MDISC_FOM:
-+			offset = dissect_oml_fom(tvb, pinfo, oml_tree, offset);
++			offset = dissect_oml_fom(tvb, pinfo, oml_tree,
++						 offset, ti);
 +			break;
 +		case ABIS_OM_MDISC_MANUF:
-+			offset = dissect_oml_manuf(tvb, pinfo, oml_tree, offset);
++			offset = dissect_oml_manuf(tvb, pinfo, oml_tree,							       offset, ti);
 +			break;
 +		case ABIS_OM_MDISC_MMI:
 +		case ABIS_OM_MDISC_TRAU:
@@ -1038,6 +1124,10 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +			  FT_UINT8, BASE_HEX, VALS(oml_adm_state_vals), 0,
 +			  NULL, HFILL }
 +		},
++		{ &hf_attr_arfcn,
++			{ "ARFCN", "oml.fom.attr.arfcn",
++			  FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }
++		},
 +		{ &hf_attr_oper_state,
 +			{ "Operational State", "oml.fom.attr.oper_state",
 +			  FT_UINT8, BASE_HEX, VALS(oml_oper_state_vals), 0,
@@ -1232,6 +1322,38 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 +						"oml.fom.attr.ipa.chan_desc",
 +			  FT_BYTES, BASE_HEX, NULL, 0, NULL, HFILL }
 +		},
++		{ &hf_attr_ipa_nsl_sport,
++			{ "NS Link IP Source Port",
++						"oml.fom.attr.ipa.nsl_sport",
++			  FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }
++		},
++		{ &hf_attr_ipa_nsl_daddr,
++			{ "NS Link IP Destination Addr",
++						"oml.fom.attr.ipa.nsl_daddr",
++			  FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }
++		},
++		{ &hf_attr_ipa_nsl_dport,
++			{ "NS Link IP Destination Port",
++						"oml.fom.attr.ipa.nsl_dport",
++			  FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }
++		},
++		{ &hf_attr_ipa_nsei,
++			{ "NSEI", "oml.fom.attr.ipa.nsei",
++			  FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }
++		},
++		{ &hf_attr_ipa_nsvci,
++			{ "NSVCI", "oml.fom.attr.ipa.nsvci",
++			  FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }
++		},
++		{ &hf_attr_ipa_bvci,
++			{ "BVCI", "oml.fom.attr.ipa.bvci",
++			  FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }
++		},
++		{ &hf_attr_ipa_rac,
++			{ "RAC", "oml.fom.attr.ipa.rac",
++			  FT_UINT8, BASE_HEX, NULL, 0,
++			  "Routing Area Code", HFILL }
++		},
 +	};
 +	static gint *ett[] = {
 +		&ett_oml,
@@ -1259,8 +1381,8 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c
 Index: wireshark/epan/dissectors/packet-gsm_abis_oml.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ wireshark/epan/dissectors/packet-gsm_abis_oml.h	2009-07-04 03:46:47.000000000 +0200
-@@ -0,0 +1,726 @@
++++ wireshark/epan/dissectors/packet-gsm_abis_oml.h	2009-07-12 17:18:20.000000000 +0200
+@@ -0,0 +1,786 @@
 +/* GSM Network Management messages on the A-bis interface
 + * 3GPP TS 12.21 version 8.0.0 Release 1999 / ETSI TS 100 623 V8.0.0 */
 +
@@ -1482,6 +1604,9 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.h
 +	NM_MT_IPACC_CONN_TRAF		= 0xe6,
 +	NM_MT_IPACC_CONN_TRAF_ACK,
 +	NM_MT_IPACC_CONN_TRAF_NACK,
++	NM_MT_IPACC_DISC_TRAF		= 0xe9,
++	NM_MT_IPACC_DISC_TRAF_ACK,
++	NM_MT_IPACC_DISC_TRAF_NACK,
 +	NM_MT_IPACC_DEF_BOOT_SW		= 0xec,
 +	NM_MT_IPACC_DEF_BOOT_SW_ACK,
 +	NM_MT_IPACC_DEF_BOOT_SW_NACK,
@@ -1491,6 +1616,16 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.h
 +	NM_MT_IPACC_GET_NVATTR		= 0xf2,
 +	NM_MT_IPACC_GET_NVATTR_ACK,
 +	NM_MT_IPACC_GET_NVATTR_NACK,
++	NM_MT_IPACC_SET_ATTR		= 0xf5,
++	NM_MT_IPACC_SET_ATTR_ACK,
++	NM_MT_IPACC_SET_ATTR_NACK,
++	NM_MT_IPACC_ATTR_CHG_EVT	= 0xf8,
++	NM_MT_IPACC_SW_DEACT		= 0xf9,
++	NM_MT_IPACC_SW_DEACT_ACK,
++	NM_MT_IPACC_SW_DEACT_NACK,
++	NM_MT_IPACC_MEAS_RES_REQ_NACK	= 0xfc,
++	NM_MT_IPACC_START_MEAS_NACK,
++	NM_MT_IPACC_STOP_MEAS_NACK,
 +};
 +
 +enum abis_nm_bs11_cell_alloc {
@@ -1619,26 +1754,54 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.h
 +	NM_ATT_BS11_ENA_RXQUAL_HO	= 0x6d,
 +	NM_ATT_BS11_FACCH_QUAL		= 0x6e,
 +
-+	NM_ATT_IPACC_RSL_BSC_IP		= 0x80,
-+	NM_ATT_IPACC_RSL_BSC_PORT	= 0x81,
++	NM_ATT_IPACC_DST_IP		= 0x80,
++	NM_ATT_IPACC_DST_IP_PORT	= 0x81,
++	NM_ATT_IPACC_SSRC		= 0x82,		/* RTP Sync Source */
++	NM_ATT_IPACC_RTP_PAYLD_TYPE	= 0x83,
++	NM_ATT_IPACC_BASEB_ID		= 0x84,
++	NM_ATT_IPACC_STREAM_ID		= 0x85,
 +	NM_ATT_IPACC_NV_FLAGS		= 0x86,
 +	NM_ATT_IPACC_FREQ_CTRL		= 0x87,
++	NM_ATT_IPACC_PRIM_OML_CFG	= 0x88,
 +	NM_ATT_IPACC_SEC_OML_CFG	= 0x89,
 +	NM_ATT_IPACC_IP_IF_CFG		= 0x8a,		/* IP interface */
 +	NM_ATT_IPACC_IP_GW_CFG		= 0x8b,		/* IP gateway */
 +	NM_ATT_IPACC_IN_SERV_TIME	= 0x8c,
++	NM_ATT_IPACC_TRX_BTS_ASS	= 0x8d,
 +	NM_ATT_IPACC_LOCATION		= 0x8e,		/* string describing location */
++	NM_ATT_IPACC_PAGING_CFG		= 0x8f,
++	NM_ATT_IPACC_FILE_DATA		= 0x90,
 +	NM_ATT_IPACC_UNIT_ID		= 0x91,		/* Site/BTS/TRX */
++	NM_ATT_IPACC_PARENT_UNIT_ID	= 0x92,
 +	NM_ATT_IPACC_UNIT_NAME		= 0x93,		/* default: nbts-<mac-as-string> */
 +	NM_ATT_IPACC_SNMP_CFG		= 0x94,
-+	NM_ATT_IPACC_PRIM_OML_IP	= 0x95,
-+	NM_ATT_IPACC_SEC_OML_IP		= 0x96,
++	NM_ATT_IPACC_PRIM_OML_CFG_LIST	= 0x95,
++	NM_ATT_IPACC_PRIM_OML_FB_TOUT	= 0x96,		/* fallback timeout */
 +	NM_ATT_IPACC_CUR_SW_CFG		= 0x97,
-+
++	NM_ATT_IPACC_TIMING_BUS		= 0x98,
++	NM_ATT_IPACC_CGI		= 0x99,		/* Cell Global ID */
++	NM_ATT_IPACC_RAC		= 0x9a,
++	NM_ATT_IPACC_OBJ_VERSION	= 0x9b,
++	NM_ATT_IPACC_GPRS_PAGING_CFG	= 0x9c,
++	NM_ATT_IPACC_NSEI		= 0x9d,
++	NM_ATT_IPACC_BVCI		= 0x9e,
++	NM_ATT_IPACC_NSVCI		= 0x9f,
++	NM_ATT_IPACC_NS_CFG		= 0xa0,
++	NM_ATT_IPACC_BSSGP_CFG		= 0xa1,
++	NM_ATT_IPACC_NS_LINK_CFG	= 0xa2,
++	NM_ATT_IPACC_RLC_CFG		= 0xa3,
 +	NM_ATT_IPACC_ALM_THRESH_LIST	= 0xa4,
++	NM_ATT_IPACC_MONIT_VAL_LIST	= 0xa5,
++	NM_ATT_IPACC_TIB_CONTROL	= 0xa6,
++	NM_ATT_IPACC_SUPP_FEATURES	= 0xa7,
++	NM_ATT_IPACC_CODING_SCHEMES	= 0xa8,
++	NM_ATT_IPACC_RLC_CFG_2		= 0xa9,
++	NM_ATT_IPACC_HEARTB_TOUT	= 0xaa,
 +	NM_ATT_IPACC_UPTIME		= 0xab,
++	NM_ATT_IPACC_RLC_CFG_3		= 0xac,
 +	NM_ATT_IPACC_SSL_CFG		= 0xad,
 +	NM_ATT_IPACC_SEC_POSSIBLE	= 0xae,
++	NM_ATT_IPACC_IML_SSL_STATE	= 0xaf,
 +	NM_ATT_IPACC_REVOC_DATE		= 0xb0,
 +
 +
@@ -1847,11 +2010,16 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.h
 +};
 +
 +enum abis_nm_ipacc_test_no {
++	NM_IPACC_TESTNO_RLOOP_ANT	= 0x01,
++	NM_IPACC_TESTNO_RLOOP_XCVR	= 0x02,
++	NM_IPACC_TESTNO_FUNC_OBJ	= 0x03,
 +	NM_IPACC_TESTNO_CHAN_USAGE	= 0x40,
 +	NM_IPACC_TESTNO_BCCH_CHAN_USAGE	= 0x41,
 +	NM_IPACC_TESTNO_FREQ_SYNC	= 0x42,
 +	NM_IPACC_TESTNO_BCCH_INFO	= 0x43,
 +	NM_IPACC_TESTNO_TX_BEACON	= 0x44,
++	NM_IPACC_TESTNO_SYSINFO_MONITOR	= 0x45,
++	NM_IPACC_TESTNO_BCCCH_MONITOR	= 0x46,
 +};
 +
 +/* first byte after length inside NM_ATT_TEST_REPORT */
@@ -1877,112 +2045,126 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.h
 +	.def = {
 +		[NM_ATT_ABIS_CHANNEL] =		{ TLV_TYPE_FIXED, 3 },
 +		[NM_ATT_ADD_INFO] =		{ TLV_TYPE_TL16V, 0 },
-+		[NM_ATT_ADD_TEXT] =		{ TLV_TYPE_TL16V },
-+		[NM_ATT_ADM_STATE] =		{ TLV_TYPE_TV },
-+		[NM_ATT_ARFCN_LIST]=		{ TLV_TYPE_TL16V },
-+		[NM_ATT_AUTON_REPORT] =		{ TLV_TYPE_TV },
-+		[NM_ATT_AVAIL_STATUS] =		{ TLV_TYPE_TL16V },
++		[NM_ATT_ADD_TEXT] =		{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_ADM_STATE] =		{ TLV_TYPE_TV, 0 },
++		[NM_ATT_ARFCN_LIST]=		{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_AUTON_REPORT] =		{ TLV_TYPE_TV, 0 },
++		[NM_ATT_AVAIL_STATUS] =		{ TLV_TYPE_TL16V, 0 },
 +		[NM_ATT_BCCH_ARFCN] =		{ TLV_TYPE_FIXED, 2 },
-+		[NM_ATT_BSIC] =			{ TLV_TYPE_TV },
-+		[NM_ATT_BTS_AIR_TIMER] =	{ TLV_TYPE_TV },
-+		[NM_ATT_CCCH_L_I_P] =		{ TLV_TYPE_TV },
-+		[NM_ATT_CCCH_L_T] =		{ TLV_TYPE_TV },
-+		[NM_ATT_CHAN_COMB] =		{ TLV_TYPE_TV },
-+		[NM_ATT_CONN_FAIL_CRIT] =	{ TLV_TYPE_TL16V },
-+		[NM_ATT_DEST] =			{ TLV_TYPE_TL16V },
-+		[NM_ATT_EVENT_TYPE] =		{ TLV_TYPE_TV },
-+		[NM_ATT_FILE_DATA] =		{ TLV_TYPE_TL16V },
-+		[NM_ATT_FILE_ID] =		{ TLV_TYPE_TL16V },
-+		[NM_ATT_FILE_VERSION] =		{ TLV_TYPE_TL16V },
++		[NM_ATT_BSIC] =			{ TLV_TYPE_TV, 0 },
++		[NM_ATT_BTS_AIR_TIMER] =	{ TLV_TYPE_TV, 0 },
++		[NM_ATT_CCCH_L_I_P] =		{ TLV_TYPE_TV, 0 },
++		[NM_ATT_CCCH_L_T] =		{ TLV_TYPE_TV, 0 },
++		[NM_ATT_CHAN_COMB] =		{ TLV_TYPE_TV, 0 },
++		[NM_ATT_CONN_FAIL_CRIT] =	{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_DEST] =			{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_EVENT_TYPE] =		{ TLV_TYPE_TV, 0 },
++		[NM_ATT_FILE_ID] =		{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_FILE_VERSION] =		{ TLV_TYPE_TL16V, 0 },
 +		[NM_ATT_GSM_TIME] =		{ TLV_TYPE_FIXED, 2 },
-+		[NM_ATT_HSN] =			{ TLV_TYPE_TV },
-+		[NM_ATT_HW_CONFIG] =		{ TLV_TYPE_TL16V },
-+		[NM_ATT_HW_DESC] =		{ TLV_TYPE_TL16V },
-+		[NM_ATT_INTAVE_PARAM] =		{ TLV_TYPE_TV },
++		[NM_ATT_HSN] =			{ TLV_TYPE_TV, 0 },
++		[NM_ATT_HW_CONFIG] =		{ TLV_TYPE_TL16V, 0 },
++		//BS11 [NM_ATT_HW_DESC] =		{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_HW_DESC] =		{ TLV_TYPE_TLV, 0 },
++		[NM_ATT_INTAVE_PARAM] =		{ TLV_TYPE_TV, 0 },
 +		[NM_ATT_INTERF_BOUND] =		{ TLV_TYPE_FIXED, 6 },
-+		[NM_ATT_LIST_REQ_ATTR] =	{ TLV_TYPE_TL16V },
-+		[NM_ATT_MAIO] =			{ TLV_TYPE_TV },
-+		[NM_ATT_MANUF_STATE] =		{ TLV_TYPE_TV },
-+		[NM_ATT_MANUF_THRESH] =		{ TLV_TYPE_TL16V },
-+		[NM_ATT_MANUF_ID] =		{ TLV_TYPE_TL16V },
-+		[NM_ATT_MAX_TA] =		{ TLV_TYPE_TV },
++		[NM_ATT_LIST_REQ_ATTR] =	{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_MAIO] =			{ TLV_TYPE_TV, 0 },
++		[NM_ATT_MANUF_STATE] =		{ TLV_TYPE_TV, 0 },
++		[NM_ATT_MANUF_THRESH] =		{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_MANUF_ID] =		{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_MAX_TA] =		{ TLV_TYPE_TV, 0 },
 +		[NM_ATT_MDROP_LINK] =		{ TLV_TYPE_FIXED, 2 },
 +		[NM_ATT_MDROP_NEXT] =		{ TLV_TYPE_FIXED, 2 },
-+		[NM_ATT_NACK_CAUSES] =		{ TLV_TYPE_TV },
-+		[NM_ATT_NY1] =			{ TLV_TYPE_TV },
-+		[NM_ATT_OPER_STATE] =		{ TLV_TYPE_TV },
-+		[NM_ATT_OVERL_PERIOD] =		{ TLV_TYPE_TL16V },
-+		[NM_ATT_PHYS_CONF] =		{ TLV_TYPE_TL16V },
-+		[NM_ATT_POWER_CLASS] =		{ TLV_TYPE_TV },
++		[NM_ATT_NACK_CAUSES] =		{ TLV_TYPE_TV, 0 },
++		[NM_ATT_NY1] =			{ TLV_TYPE_TV, 0 },
++		[NM_ATT_OPER_STATE] =		{ TLV_TYPE_TV, 0 },
++		[NM_ATT_OVERL_PERIOD] =		{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_PHYS_CONF] =		{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_POWER_CLASS] =		{ TLV_TYPE_TV, 0 },
 +		[NM_ATT_POWER_THRESH] =		{ TLV_TYPE_FIXED, 3 },
 +		[NM_ATT_PROB_CAUSE] =		{ TLV_TYPE_FIXED, 3 },
-+		[NM_ATT_RACH_B_THRESH] =	{ TLV_TYPE_TV },
++		[NM_ATT_RACH_B_THRESH] =	{ TLV_TYPE_TV, 0 },
 +		[NM_ATT_LDAVG_SLOTS] =		{ TLV_TYPE_FIXED, 2 },
-+		[NM_ATT_RAD_SUBC] =		{ TLV_TYPE_TV },
-+		[NM_ATT_RF_MAXPOWR_R] =		{ TLV_TYPE_TV },
-+		[NM_ATT_SITE_INPUTS] =		{ TLV_TYPE_TL16V },
-+		[NM_ATT_SITE_OUTPUTS] =		{ TLV_TYPE_TL16V },
-+		[NM_ATT_SOURCE] =		{ TLV_TYPE_TL16V },
-+		[NM_ATT_SPEC_PROB] =		{ TLV_TYPE_TV },
++		[NM_ATT_RAD_SUBC] =		{ TLV_TYPE_TV, 0 },
++		[NM_ATT_RF_MAXPOWR_R] =		{ TLV_TYPE_TV, 0 },
++		[NM_ATT_SITE_INPUTS] =		{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_SITE_OUTPUTS] =		{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_SOURCE] =		{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_SPEC_PROB] =		{ TLV_TYPE_TV, 0 },
 +		[NM_ATT_START_TIME] =		{ TLV_TYPE_FIXED, 2 },
 +		[NM_ATT_T200] =			{ TLV_TYPE_FIXED, 7 },
-+		[NM_ATT_TEI] =			{ TLV_TYPE_TV },
++		[NM_ATT_TEI] =			{ TLV_TYPE_TV, 0 },
 +		[NM_ATT_TEST_DUR] =		{ TLV_TYPE_FIXED, 2 },
-+		[NM_ATT_TEST_NO] =		{ TLV_TYPE_TV },
-+		[NM_ATT_TEST_REPORT] =		{ TLV_TYPE_TL16V, },
++		[NM_ATT_TEST_NO] =		{ TLV_TYPE_TV, 0 },
++		[NM_ATT_TEST_REPORT] =		{ TLV_TYPE_TL16V, 0 },
 +		[NM_ATT_VSWR_THRESH] =		{ TLV_TYPE_FIXED, 2 },
-+		[NM_ATT_WINDOW_SIZE] = 		{ TLV_TYPE_TV },
-+		[NM_ATT_TSC] =			{ TLV_TYPE_TV },
-+		[NM_ATT_SW_CONFIG] =		{ TLV_TYPE_TL16V },
-+		[NM_ATT_SEVERITY] = 		{ TLV_TYPE_TV },
-+		[NM_ATT_GET_ARI] =		{ TLV_TYPE_TL16V },
-+		[NM_ATT_HW_CONF_CHG] = 		{ TLV_TYPE_TL16V },
-+		[NM_ATT_OUTST_ALARM] =		{ TLV_TYPE_TV },
-+		[NM_ATT_FILE_DATA] =		{ TLV_TYPE_TL16V },
-+		[NM_ATT_MEAS_RES] =		{ TLV_TYPE_TL16V },
++		[NM_ATT_WINDOW_SIZE] = 		{ TLV_TYPE_TV, 0 },
++		[NM_ATT_TSC] =			{ TLV_TYPE_TV, 0 },
++		[NM_ATT_SW_CONFIG] =		{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_SEVERITY] = 		{ TLV_TYPE_TV, 0 },
++		[NM_ATT_GET_ARI] =		{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_HW_CONF_CHG] = 		{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_OUTST_ALARM] =		{ TLV_TYPE_TV, 0 },
++		[NM_ATT_FILE_DATA] =		{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_MEAS_RES] =		{ TLV_TYPE_TL16V, 0 },
++#if 0
 +		/* BS11 specifics */
-+		[NM_ATT_BS11_ESN_FW_CODE_NO] =	{ TLV_TYPE_TLV },
-+		[NM_ATT_BS11_ESN_HW_CODE_NO] =	{ TLV_TYPE_TLV },
-+		[NM_ATT_BS11_ESN_PCB_SERIAL] =	{ TLV_TYPE_TLV },
-+		[NM_ATT_BS11_BOOT_SW_VERS] =	{ TLV_TYPE_TLV },
-+		[0xd5] =			{ TLV_TYPE_TLV },
-+		[0xa8] =			{ TLV_TYPE_TLV },
-+		[NM_ATT_BS11_PASSWORD] =	{ TLV_TYPE_TLV },
-+		[NM_ATT_BS11_TXPWR] =		{ TLV_TYPE_TLV },
-+		[NM_ATT_BS11_RSSI_OFFS] =	{ TLV_TYPE_TLV },
-+		[NM_ATT_BS11_LINE_CFG] = 	{ TLV_TYPE_TV },
-+		[NM_ATT_BS11_L1_PROT_TYPE] =	{ TLV_TYPE_TV },
++		[NM_ATT_BS11_ESN_FW_CODE_NO] =	{ TLV_TYPE_TLV, 0 },
++		[NM_ATT_BS11_ESN_HW_CODE_NO] =	{ TLV_TYPE_TLV, 0 },
++		[NM_ATT_BS11_ESN_PCB_SERIAL] =	{ TLV_TYPE_TLV, 0 },
++		[NM_ATT_BS11_BOOT_SW_VERS] =	{ TLV_TYPE_TLV, 0 },
++		[0xd5] =			{ TLV_TYPE_TLV, 0 },
++		[0xa8] =			{ TLV_TYPE_TLV, 0 },
++		[NM_ATT_BS11_PASSWORD] =	{ TLV_TYPE_TLV, 0 },
++		[NM_ATT_BS11_TXPWR] =		{ TLV_TYPE_TLV, 0 },
++		[NM_ATT_BS11_RSSI_OFFS] =	{ TLV_TYPE_TLV, 0 },
++		[NM_ATT_BS11_LINE_CFG] = 	{ TLV_TYPE_TV, 0 },
++		[NM_ATT_BS11_L1_PROT_TYPE] =	{ TLV_TYPE_TV, 0 },
 +		[NM_ATT_BS11_BIT_ERR_THESH] =	{ TLV_TYPE_FIXED, 2 },
-+		[NM_ATT_BS11_DIVERSITY] =	{ TLV_TYPE_TLV },
-+		[NM_ATT_BS11_LMT_LOGON_SESSION]={ TLV_TYPE_TLV },
-+		[NM_ATT_BS11_LMT_LOGIN_TIME] =	{ TLV_TYPE_TLV },
-+		[NM_ATT_BS11_LMT_USER_ACC_LEV] ={ TLV_TYPE_TLV },
-+		[NM_ATT_BS11_LMT_USER_NAME] =	{ TLV_TYPE_TLV },
-+		[NM_ATT_BS11_BTS_STATE]	=	{ TLV_TYPE_TLV },
-+		[NM_ATT_BS11_E1_STATE]	=	{ TLV_TYPE_TLV },
-+		[NM_ATT_BS11_PLL_MODE]	=	{ TLV_TYPE_TLV },
-+		[NM_ATT_BS11_PLL]	=	{ TLV_TYPE_TLV },
-+		[NM_ATT_BS11_CCLK_ACCURACY] =	{ TLV_TYPE_TV },
-+		[NM_ATT_BS11_CCLK_TYPE] =	{ TLV_TYPE_TV },
++		[NM_ATT_BS11_DIVERSITY] =	{ TLV_TYPE_TLV, 0 },
++		[NM_ATT_BS11_LMT_LOGON_SESSION]={ TLV_TYPE_TLV, 0 },
++		[NM_ATT_BS11_LMT_LOGIN_TIME] =	{ TLV_TYPE_TLV, 0 },
++		[NM_ATT_BS11_LMT_USER_ACC_LEV] ={ TLV_TYPE_TLV, 0 },
++		[NM_ATT_BS11_LMT_USER_NAME] =	{ TLV_TYPE_TLV, 0 },
++		[NM_ATT_BS11_BTS_STATE]	=	{ TLV_TYPE_TLV, 0 },
++		[NM_ATT_BS11_E1_STATE]	=	{ TLV_TYPE_TLV, 0 },
++		[NM_ATT_BS11_PLL_MODE]	=	{ TLV_TYPE_TLV, 0 },
++		[NM_ATT_BS11_PLL]	=	{ TLV_TYPE_TLV, 0 },
++		[NM_ATT_BS11_CCLK_ACCURACY] =	{ TLV_TYPE_TV, 0 },
++		[NM_ATT_BS11_CCLK_TYPE] =	{ TLV_TYPE_TV, 0 },
++		[0x95] =			{ TLV_TYPE_FIXED, 2 },
++#endif
 +		/* ip.access specifics */
-+		[NM_ATT_IPACC_RSL_BSC_IP] =	{ TLV_TYPE_FIXED, 4 },
-+		[NM_ATT_IPACC_RSL_BSC_PORT] =	{ TLV_TYPE_FIXED, 2 },
-+		[NM_ATT_IPACC_PRIM_OML_IP] =	{ TLV_TYPE_TL16V },
-+		[NM_ATT_IPACC_NV_FLAGS] =	{ TLV_TYPE_TL16V },
++		[NM_ATT_IPACC_DST_IP] =		{ TLV_TYPE_FIXED, 4 },
++		[NM_ATT_IPACC_DST_IP_PORT] =	{ TLV_TYPE_FIXED, 2 },
++		[NM_ATT_IPACC_PRIM_OML_CFG] =	{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_IPACC_NV_FLAGS] =	{ TLV_TYPE_TL16V, 0 },
 +		[NM_ATT_IPACC_FREQ_CTRL] =	{ TLV_TYPE_FIXED, 2 },
-+		[NM_ATT_IPACC_SEC_OML_IP] =	{ TLV_TYPE_TL16V }, // wrong name
 +		[NM_ATT_IPACC_SEC_OML_CFG] =	{ TLV_TYPE_FIXED, 6 },
 +		[NM_ATT_IPACC_IP_IF_CFG] =	{ TLV_TYPE_FIXED, 8 },
 +		[NM_ATT_IPACC_IP_GW_CFG] =	{ TLV_TYPE_FIXED, 12 },
-+		[NM_ATT_IPACC_LOCATION] =	{ TLV_TYPE_TL16V },
-+		[NM_ATT_IPACC_UNIT_ID] =	{ TLV_TYPE_TL16V },
-+		[NM_ATT_IPACC_UNIT_NAME] =	{ TLV_TYPE_TL16V },
-+		[NM_ATT_IPACC_SNMP_CFG] =	{ TLV_TYPE_TL16V },
-+		[NM_ATT_IPACC_ALM_THRESH_LIST]= { TLV_TYPE_TL16V },
-+		//[0x95] =			{ TLV_TYPE_FIXED, 2 },
-+		[0x9b] =			{ TLV_TYPE_TL16V },
-+		[0x85] =			{ TLV_TYPE_TV },
-+
++		[NM_ATT_IPACC_LOCATION] =	{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_IPACC_UNIT_ID] =	{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_IPACC_UNIT_NAME] =	{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_IPACC_SNMP_CFG] =	{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_IPACC_ALM_THRESH_LIST]= { TLV_TYPE_TL16V, 0 },
++		[NM_ATT_IPACC_CUR_SW_CFG] =	{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_IPACC_STREAM_ID] =	{ TLV_TYPE_TV, 0 },
++		[NM_ATT_IPACC_RAC] =		{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_IPACC_OBJ_VERSION] =	{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_IPACC_GPRS_PAGING_CFG] ={ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_IPACC_NSEI] =		{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_IPACC_BVCI] =		{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_IPACC_NSVCI] =		{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_IPACC_NS_CFG] =		{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_IPACC_BSSGP_CFG] =	{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_IPACC_NS_LINK_CFG] =	{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_IPACC_RLC_CFG] =	{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_IPACC_SUPP_FEATURES] =	{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_IPACC_CODING_SCHEMES] =	{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_IPACC_RLC_CFG_2] =	{ TLV_TYPE_TL16V, 0 },
++		[NM_ATT_IPACC_RLC_CFG_3] =	{ TLV_TYPE_TL16V, 0 },
 +	},
 +};
 +
diff --git a/wireshark/abisip.patch b/wireshark/abisip.patch
index 11ab59779..44ca3ee7f 100644
--- a/wireshark/abisip.patch
+++ b/wireshark/abisip.patch
@@ -1,7 +1,7 @@
 Index: epan/dissectors/Makefile.common
 ===================================================================
---- epan/dissectors/Makefile.common.orig	2009-07-03 22:19:54.000000000 +0200
-+++ epan/dissectors/Makefile.common	2009-07-03 22:20:16.000000000 +0200
+--- epan/dissectors/Makefile.common.orig
++++ epan/dissectors/Makefile.common
 @@ -471,6 +471,7 @@
  	packet-gsm_a_gm.c		\
  	packet-gsm_a_rp.c		\
@@ -12,8 +12,8 @@ Index: epan/dissectors/Makefile.common
  	packet-gsm_sms.c	\
 Index: epan/dissectors/packet-rsl.c
 ===================================================================
---- epan/dissectors/packet-rsl.c.orig	2009-07-03 22:19:54.000000000 +0200
-+++ epan/dissectors/packet-rsl.c	2009-07-03 22:20:16.000000000 +0200
+--- epan/dissectors/packet-rsl.c.orig
++++ epan/dissectors/packet-rsl.c
 @@ -3950,6 +3950,7 @@
  	proto_register_field_array(proto_rsl, hf, array_length(hf));
  	proto_register_subtree_array(ett, array_length(ett));
@@ -24,9 +24,9 @@ Index: epan/dissectors/packet-rsl.c
  
 Index: epan/dissectors/packet-gsm_abis_ip.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ epan/dissectors/packet-gsm_abis_ip.c	2009-07-03 22:20:16.000000000 +0200
-@@ -0,0 +1,279 @@
+--- /dev/null
++++ epan/dissectors/packet-gsm_abis_ip.c
+@@ -0,0 +1,284 @@
 +/* packet-gsm_abis_ip.c
 + * Routines for packet dissection of ip.access A-bis over IP
 + * Copyright 2009 by Harald Welte <laforge@gnumonks.org>
@@ -124,7 +124,7 @@ Index: epan/dissectors/packet-gsm_abis_ip.c
 +static gint
 +dissect_ipa_attr(tvbuff_t *tvb, int base_offs, proto_tree *tree)
 +{
-+	guint8 len, tag, attr_type;
++	guint8 len, attr_type;
 +
 +	int offset = base_offs;
 +
@@ -134,7 +134,6 @@ Index: epan/dissectors/packet-gsm_abis_ip.c
 +		switch (attr_type) {
 +		case 0x00:	/* a string prefixed by its length */
 +			len = tvb_get_guint8(tvb, offset+1);
-+			tag = tvb_get_guint8(tvb, offset+2);
 +			proto_tree_add_item(tree, hf_ipaccess_attr_tag,
 +					    tvb, offset+2, 1, FALSE);
 +			proto_tree_add_item(tree, hf_ipaccess_attr_string,
@@ -145,6 +144,12 @@ Index: epan/dissectors/packet-gsm_abis_ip.c
 +			proto_tree_add_item(tree, hf_ipaccess_attr_tag,
 +					    tvb, offset+1, 1, FALSE);
 +			break;
++		default:
++			len = 0;
++			proto_tree_add_text(tree, tvb, offset+1, 1,
++					    "unknonw attribute type 0x%02x",
++					    attr_type);
++			break;
 +		};
 +		offset += len + 2;
 +	};
diff --git a/wireshark/rsl-ipaccess.patch b/wireshark/rsl-ipaccess.patch
index 75de56193..17d644135 100644
--- a/wireshark/rsl-ipaccess.patch
+++ b/wireshark/rsl-ipaccess.patch
@@ -1,14 +1,14 @@
 Index: wireshark/epan/dissectors/packet-rsl.c
 ===================================================================
---- wireshark.orig/epan/dissectors/packet-rsl.c	2009-07-03 22:20:16.000000000 +0200
-+++ wireshark/epan/dissectors/packet-rsl.c	2009-07-04 04:06:04.000000000 +0200
+--- wireshark.orig/epan/dissectors/packet-rsl.c	2009-07-12 14:07:48.000000000 +0200
++++ wireshark/epan/dissectors/packet-rsl.c	2009-07-12 21:58:21.000000000 +0200
 @@ -2,6 +2,7 @@
   * Routines for Radio Signalling Link (RSL) dissection.
   *
   * Copyright 2007, Anders Broman <anders.broman@ericsson.com>
 + * Copyright 2009, Harald Welte <laforge@gnumonks.org>
   *
-  * $Id: packet-rsl.c 28770 2009-06-18 21:30:42Z stig $
+  * $Id: packet-rsl.c 29056 2009-07-10 20:00:54Z tuexen $
   *
 @@ -44,6 +45,8 @@
  #include <epan/lapd_sapi.h>
@@ -23,10 +23,10 @@ Index: wireshark/epan/dissectors/packet-rsl.c
  static int hf_rsl_rtd				= -1;
  static int hf_rsl_delay_ind			= -1;
  static int hf_rsl_tfo				= -1;
-+static int hf_rsl_f4				= -1;
-+static int hf_rsl_f6				= -1;
-+static int hf_rsl_f8				= -1;
-+static int hf_rsl_fc				= -1;
++static int hf_rsl_speech_mode			= -1;
++static int hf_rsl_conn_stat			= -1;
++static int hf_rsl_conn_id			= -1;
++static int hf_rsl_rtp_payload			= -1;
 +static int hf_rsl_local_port			= -1;
 +static int hf_rsl_remote_port			= -1;
 +static int hf_rsl_local_ip			= -1;
@@ -38,14 +38,14 @@ Index: wireshark/epan/dissectors/packet-rsl.c
  static int ett_ie_meas_res_no = -1;
  static int ett_ie_message_id = -1;
  static int ett_ie_sys_info_type = -1;
-+static int ett_ie_f4 = -1;
-+static int ett_ie_f6 = -1;
-+static int ett_ie_f8 = -1;
++static int ett_ie_speech_mode = -1;
++static int ett_ie_conn_stat = -1;
++static int ett_ie_conn_id = -1;
 +static int ett_ie_remote_ip = -1;
 +static int ett_ie_remote_port = -1;
 +static int ett_ie_local_port = -1;
 +static int ett_ie_local_ip = -1;
-+static int ett_ie_fc = -1;
++static int ett_ie_rtp_payload = -1;
 +
  
  proto_tree *top_tree;
@@ -62,13 +62,24 @@ Index: wireshark/epan/dissectors/packet-rsl.c
  /*
   * 9.2 MESSAGE TYPE
   */
-@@ -276,6 +299,21 @@
+@@ -276,6 +299,49 @@
  	/* 	0 1 - - - - - - Location Services messages: */
  #define RSL_MSG_LOC_INF					65	/* 8.7.1 */
  
 +/* Vendor-Specific messages of ip.access nanoBTS. There is no public documentation
 + * about those extensions, all information in this dissector is based on lawful
 + * protocol reverse enginering by Harald Welte <laforge@gnumonks.org> */
++#define RSL_MSG_TYPE_IPAC_MEAS_PP_DEF	0x60
++#define RSL_MSG_TYPE_IPAC_HO_CAND_INQ	0x61
++#define RSL_MSG_TYPE_IPAC_HO_CAND_RESP	0x62
++
++#define RSL_MSG_TYPE_IPAC_PDCH_ACT	0x48
++#define RSL_MSG_TYPE_IPAC_PDCH_ACT_ACK	0x49
++#define RSL_MSG_TYPE_IPAC_PDCH_ACT_NACK	0x4a
++#define RSL_MSG_TYPE_IPAC_PDCH_DEACT	0x4b
++#define RSL_MSG_TYPE_IPAC_PDCH_DEACT_ACK 0x4c
++#define RSL_MSG_TYPE_IPAC_PDCH_DEACT_NACK 0x4d
++
 +#define RSL_MSG_TYPE_IPAC_BIND		0x70
 +#define RSL_MSG_TYPE_IPAC_BIND_ACK	0x71
 +#define RSL_MSG_TYPE_IPAC_BIND_NACK	0x72
@@ -76,19 +87,45 @@ Index: wireshark/epan/dissectors/packet-rsl.c
 +#define RSL_MSG_TYPE_IPAC_CONNECT_ACK	0x74
 +#define RSL_MSG_TYPE_IPAC_CONNECT_NACK	0x75
 +#define RSL_MSG_TYPE_IPAC_DISC_IND	0x76
++#define RSL_MSG_TYPE_IPAC_DISC		0x77
++#define RSL_MSG_TYPE_IPAC_DISC_ACK	0x78
++#define RSL_MSG_TYPE_IPAC_DISC_NACK	0x79
 +
++#define RSL_IE_IPAC_SRTP_CONFIG		0xe0
++#define RSL_IE_IPAC_PROXY_UDP		0xe1
++#define RSL_IE_IPAC_BSCMPL_TOUT		0xe2
 +#define RSL_IE_IPAC_REMOTE_IP		0xf0
 +#define RSL_IE_IPAC_REMOTE_PORT		0xf1
++#define RSL_IE_IPAC_RTP_PAYLOAD		0xf2
 +#define RSL_IE_IPAC_LOCAL_PORT		0xf3
++#define RSL_IE_IPAC_SPEECH_MODE		0xf4
 +#define RSL_IE_IPAC_LOCAL_IP		0xf5
++#define RSL_IE_IPAC_CONN_STAT		0xf6
++#define RSL_IE_IPAC_HO_C_PARMS		0xf7
++#define RSL_IE_IPAC_CONN_ID		0xf8
++#define RSL_IE_IPAC_RTP_CSD_FMT		0xf9
++#define RSL_IE_IPAC_RTP_JIT_BUF		0xfa
++#define RSL_IE_IPAC_RTP_COMPR		0xfb
++#define RSL_IE_IPAC_RTP_PAYLOAD2	0xfc
++#define RSL_IE_IPAC_RTP_MPLEX		0xfd
++#define RSL_IE_IPAC_RTP_MPLEX_ID	0xfe
  
  static const value_string rsl_msg_type_vals[] = {
  	  /* 	0 0 0 0 - - - - Radio Link Layer Management messages: */
-@@ -338,6 +376,14 @@
+@@ -338,6 +404,26 @@
  	{  0x3f,	"TFO MODification REQuest" },					/* 8.4.31 */
  	/* 	0 1 - - - - - - Location Services messages: */
  	{  0x41,	"Location Information" },						/* 8.7.1 */
 +	/* ip.access */
++	{  0x48,	"ip.access PDCH ACTIVATION" },
++	{  0x49,	"ip.access PDCH ACTIVATION ACK" },
++	{  0x4a,	"ip.access PDCH ACTIVATION NACK" },
++	{  0x4b,	"ip.access PDCH DEACTIVATION" },
++	{  0x4c,	"ip.access PDCH DEACTIVATION ACK" },
++	{  0x4d,	"ip.access PDCH DEACTIVATION NACK" },
++	{  0x60,	"ip.access MEASurement PREPROCessing DeFauLT" },
++	{  0x61,	"ip.access HANDOover CANDidate ENQuiry" },
++	{  0x62,	"ip.access HANDOover CANDidate RESPonse" },
 +	{  0x70,	"ip.access BIND" },
 +	{  0x71,	"ip.access BIND ACK" },
 +	{  0x72,	"ip.access BIND NACK" },
@@ -96,21 +133,53 @@ Index: wireshark/epan/dissectors/packet-rsl.c
 +	{  0x74,	"ip.access CONNECT ACK" },
 +	{  0x75,	"ip.access CONNECT NACK" },
 +	{  0x76,	"ip.access DISCONNECT INDication" },
++	{  0x77,	"ip.access DISCONNECT" },
++	{  0x78,	"ip.access DISCONNECT ACK" },
++	{  0x79,	"ip.access DISCONNECT NACK" },
  	{ 0,		NULL }
  };
  
-@@ -477,6 +523,10 @@
+@@ -371,10 +457,10 @@
+ #define RSL_IE_MESSAGE_ID		28
+ 
+ #define RSL_IE_SYS_INFO_TYPE	30
+-
+-
+-
+-
++#define RSL_IE_MS_POWER_PARAM		31
++#define RSL_IE_BS_POWER_PARAM		32
++#define RSL_IE_PREPROC_PARAM		33
++#define RSL_IE_PREPROC_MEAS		34
+ #define RSL_IE_FULL_IMM_ASS_INF			35
+ #define RSL_IE_SMSCB_INF				36
+ #define RSL_IE_FULL_MS_TIMING_OFFSET	37
+@@ -477,6 +563,24 @@
  			Not used
  
  	*/
++	{ 0xe0,		"SRTP Configuration" },
++	{ 0xe1,		"BSC Proxy UDP Port" },
++	{ 0xe2,		"BSC Multiplex Timeout" },
 +	{ 0xf0,		"Remote IP Address" },
 +	{ 0xf1,		"Remote RTP Port" },
++	{ 0xf2,		"RTP Payload Type" },
 +	{ 0xf3,		"Local RTP Port" },
++	{ 0xf4,		"Speech Mode" },
 +	{ 0xf5,		"Local IP Address" },
++	{ 0xf6,		"Connection Statistics" },
++	{ 0xf7,		"Handover C Parameters" },
++	{ 0xf8,		"Connection Identifier" },
++	{ 0xf9,		"RTP CSD Format" },
++	{ 0xfa,		"RTP Jitter Buffer" },
++	{ 0xfb,		"RTP Compression" },
++	{ 0xfc,		"RTP Payload Type 2" },
++	{ 0xfd,		"RTP Multiplex" },
++	{ 0xfe,		"RTP Multiplex Identifier" },
  	{ 0,			NULL }
  };
  
-@@ -513,6 +563,95 @@
+@@ -513,6 +617,95 @@
  	{ 0,			NULL }
  };
  
@@ -163,10 +232,10 @@ Index: wireshark/epan/dissectors/packet-rsl.c
 +		[RSL_IE_MEAS_RES_NO]		= { TLV_TYPE_TV, 0 },
 +		[RSL_IE_MESSAGE_ID]		= { TLV_TYPE_TV, 0 },
 +		[RSL_IE_SYS_INFO_TYPE]		= { TLV_TYPE_TV, 0 },
-+		//[RSL_IE_MS_POWER_PARAM]		= { TLV_TYPE_TLV, 0 },
-+		//[RSL_IE_BS_POWER_PARAM]		= { TLV_TYPE_TLV, 0 },
-+		//[RSL_IE_PREPROC_CONFIG]		= { TLV_TYPE_TLV, 0 },
-+		//[RSL_IE_PREPROC_MEAS_RES]		= { TLV_TYPE_TLV, 0 },
++		[RSL_IE_MS_POWER_PARAM]		= { TLV_TYPE_TLV, 0 },
++		[RSL_IE_BS_POWER_PARAM]		= { TLV_TYPE_TLV, 0 },
++		[RSL_IE_PREPROC_PARAM]		= { TLV_TYPE_TLV, 0 },
++		[RSL_IE_PREPROC_MEAS]		= { TLV_TYPE_TLV, 0 },
 +		//[RSL_IE_IMM_ASS_INFO]		= { TLV_TYPE_TLV, 0 },
 +		//[RSL_IE_SMSCB_INFO]		= { TLV_TYPE_FIXED, 23 },
 +		//[RSL_IE_MS_TIMING_OFFSET]	= { TLV_TYPE_TV, 0 },
@@ -197,16 +266,16 @@ Index: wireshark/epan/dissectors/packet-rsl.c
 +		[RSL_IE_IPAC_REMOTE_PORT]	= { TLV_TYPE_FIXED, 2 },
 +		[RSL_IE_IPAC_LOCAL_IP]		= { TLV_TYPE_FIXED, 4 },
 +		[RSL_IE_IPAC_LOCAL_PORT]	= { TLV_TYPE_FIXED, 2 },
-+		[0xf4]				= { TLV_TYPE_TV, 0 },
-+		[0xf8]				= { TLV_TYPE_FIXED, 2 },
-+		[0xfc]				= { TLV_TYPE_TV, 0 },
++		[RSL_IE_IPAC_SPEECH_MODE]	= { TLV_TYPE_TV, 0 },
++		[RSL_IE_IPAC_CONN_ID]		= { TLV_TYPE_FIXED, 2 },
++		[RSL_IE_IPAC_RTP_PAYLOAD2]	= { TLV_TYPE_TV, 0 },
 +	},
 +};
 +
  /* 9.3.1 Channel number			9.3.1	M TV 2 */
  static int
  dissect_rsl_ie_ch_no(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, gboolean is_mandatory)
-@@ -2043,7 +2182,6 @@
+@@ -2043,7 +2236,6 @@
  	proto_item_set_len(ti, length+2);
  
  	proto_tree_add_item(ie_tree, hf_rsl_ie_length, tvb, offset, 1, FALSE);
@@ -214,7 +283,7 @@ Index: wireshark/epan/dissectors/packet-rsl.c
  
  	/* Received Message */
  	offset = dissct_rsl_msg(tvb, pinfo, ie_tree, offset);
-@@ -2907,13 +3045,392 @@
+@@ -2907,13 +3099,425 @@
  	return ie_offset + length;
  }
  
@@ -452,7 +521,7 @@ Index: wireshark/epan/dissectors/packet-rsl.c
 +#endif
 +
 +static int
-+dissct_rsl_ipaccess_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
++dissct_rsl_ipaccess_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,				    int offset)
 +{
 +	guint8 msg_type;
 +	guint32 local_addr = 0;
@@ -470,6 +539,15 @@ Index: wireshark/epan/dissectors/packet-rsl.c
 +	case RSL_MSG_TYPE_IPAC_CONNECT_ACK:
 +	case RSL_MSG_TYPE_IPAC_CONNECT_NACK:
 +	case RSL_MSG_TYPE_IPAC_DISC_IND:
++	case RSL_MSG_TYPE_IPAC_DISC:
++	case RSL_MSG_TYPE_IPAC_DISC_ACK:
++	case RSL_MSG_TYPE_IPAC_DISC_NACK:
++	case RSL_MSG_TYPE_IPAC_PDCH_ACT:
++	case RSL_MSG_TYPE_IPAC_PDCH_ACT_ACK:
++	case RSL_MSG_TYPE_IPAC_PDCH_ACT_NACK:
++	case RSL_MSG_TYPE_IPAC_PDCH_DEACT:
++	case RSL_MSG_TYPE_IPAC_PDCH_DEACT_ACK:
++	case RSL_MSG_TYPE_IPAC_PDCH_DEACT_NACK:
 +		/* Channel number			9.3.1	M TV 2		*/
 +		offset = dissect_rsl_ie_ch_no(tvb, pinfo, tree, offset, TRUE);
 +		break;
@@ -545,6 +623,10 @@ Index: wireshark/epan/dissectors/packet-rsl.c
 +			len = tvb_get_guint8(tvb, offset+1) << 8 |
 +					tvb_get_guint8(tvb, offset+2);
 +			break;
++		default:
++			hlen = len_len = len = 0;
++			DISSECTOR_ASSERT_NOT_REACHED();
++			break;
 +		}
 +
 +		ti = proto_tree_add_item(tree, hf_rsl_ie_id, tvb, offset, 1, FALSE);
@@ -553,25 +635,45 @@ Index: wireshark/epan/dissectors/packet-rsl.c
 +
 +		switch (tag) {
 +		case RSL_IE_CH_NO:
++			dissect_rsl_ie_ch_no(tvb, pinfo, tree, offset, TRUE);
++			break;
++		case RSL_IE_FRAME_NO:
++			dissect_rsl_ie_frame_no(tvb, pinfo, ie_tree, offset, TRUE);
++			break;
++		case RSL_IE_MS_POW:
++			dissect_rsl_ie_ms_pow(tvb, pinfo, ie_tree, offset, TRUE);
 +			break;
 +		case RSL_IE_IPAC_REMOTE_IP:
 +			proto_tree_add_item(ie_tree, hf_rsl_remote_ip, tvb,
-+					    offset, len, FALSE);
++					    offset, len, TRUE);
 +			break;
 +		case RSL_IE_IPAC_REMOTE_PORT:
 +			proto_tree_add_item(ie_tree, hf_rsl_remote_port, tvb,
-+					    offset, len, FALSE);
++					    offset, len, TRUE);
 +			break;
 +		case RSL_IE_IPAC_LOCAL_IP:
 +			proto_tree_add_item(ie_tree, hf_rsl_local_ip, tvb,
-+					    offset, len, FALSE);
++					    offset, len, TRUE);
 +			local_addr = tvb_get_ipv4(tvb, offset);
 +			break;
 +		case RSL_IE_IPAC_LOCAL_PORT:
 +			proto_tree_add_item(ie_tree, hf_rsl_local_port, tvb,
-+					    offset, len, FALSE);
++					    offset, len, TRUE);
 +			local_port = tvb_get_ntohs(tvb, offset);
 +			break;
++		case RSL_IE_IPAC_SPEECH_MODE:
++			proto_tree_add_item(ie_tree, hf_rsl_speech_mode, tvb,
++					    offset, len, TRUE);
++			break;
++		case RSL_IE_IPAC_RTP_PAYLOAD:
++		case RSL_IE_IPAC_RTP_PAYLOAD2:
++			proto_tree_add_item(ie_tree, hf_rsl_rtp_payload, tvb,
++					    offset, len, TRUE);
++			break;
++		case RSL_IE_IPAC_CONN_ID:
++			proto_tree_add_item(ie_tree, hf_rsl_conn_id, tvb,
++					    offset, len, TRUE);
++			break;
 +		}
 +		offset += len;
 +	}
@@ -608,7 +710,26 @@ Index: wireshark/epan/dissectors/packet-rsl.c
  	offset++;
  
  	switch (msg_type){
-@@ -3517,7 +4034,6 @@
+@@ -3481,6 +4085,18 @@
+ 		/* LLP APDU 9.3.58 M LV 2-N */
+ 		offset = dissect_rsl_ie_llp_apdu(tvb, pinfo, tree, offset, TRUE);
+ 		break;
++	/* the following messages are ip.access specific but sent without
++	 * ip.access memssage discriminator */
++	case RSL_MSG_TYPE_IPAC_MEAS_PP_DEF:
++	case RSL_MSG_TYPE_IPAC_HO_CAND_INQ:
++	case RSL_MSG_TYPE_IPAC_HO_CAND_RESP:
++	case RSL_MSG_TYPE_IPAC_PDCH_ACT:
++	case RSL_MSG_TYPE_IPAC_PDCH_ACT_ACK:
++	case RSL_MSG_TYPE_IPAC_PDCH_ACT_NACK:
++	case RSL_MSG_TYPE_IPAC_PDCH_DEACT:
++	case RSL_MSG_TYPE_IPAC_PDCH_DEACT_ACK:
++	case RSL_MSG_TYPE_IPAC_PDCH_DEACT_NACK:
++		offset = dissct_rsl_ipaccess_msg(tvb, pinfo, tree, offset-1);
+ 	default:
+ 		break;
+ 	}
+@@ -3517,7 +4133,6 @@
  		/* 9.1 Message discriminator */
  		proto_tree_add_item(rsl_tree, hf_rsl_msg_dsc, tvb, offset, 1, FALSE);
  		proto_tree_add_item(rsl_tree, hf_rsl_T_bit, tvb, offset, 1, FALSE);
@@ -616,29 +737,25 @@ Index: wireshark/epan/dissectors/packet-rsl.c
  
  		offset = dissct_rsl_msg(tvb, pinfo, rsl_tree, offset);
  
-@@ -3883,6 +4399,46 @@
+@@ -3883,6 +4498,42 @@
  			FT_UINT8, BASE_DEC, VALS(rsl_emlpp_prio_vals), 0x03,
  			NULL, HFILL }
  		},
-+		{ &hf_rsl_f4,
-+			{ "unknown F4 IE",	"rsl.ipacc.f4",
-+			  FT_UINT8, BASE_DEC, NULL, 0x0,
-+			  "unknown F4 IE", HFILL }
++		{ &hf_rsl_speech_mode,
++			{ "ip.access Speech Mode", "rsl.ipacc.speech_mode",
++			  FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
 +		},
-+		{ &hf_rsl_f6,
-+			{ "unknown F6 IE",	"rsl.ipacc.f6",
-+			  FT_BYTES, BASE_HEX, NULL, 0x0,
-+			  "unknown F6 IE", HFILL }
++		{ &hf_rsl_conn_stat,
++			{ "ip.access Connection Statistics","rsl.ipacc.conn_stat",
++			  FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }
 +		},
-+		{ &hf_rsl_f8,
-+			{ "unknown F8 IE",	"rsl.ipacc.f8",
-+			  FT_UINT16, BASE_DEC, NULL, 0x0,
-+			  "unknown F8 IE", HFILL }
++		{ &hf_rsl_conn_id,
++			{ "ip.access Connection ID",	"rsl.ipacc.conn_id",
++			  FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 +		},
-+		{ &hf_rsl_fc,
-+			{ "unknown FC IE",	"rsl.ipacc.fc",
-+			  FT_UINT8, BASE_DEC, NULL, 0x0,
-+			  "unknown FC IE", HFILL }
++		{ &hf_rsl_rtp_payload,
++			{ "ip.access RTP Payload Type",	"rsl.ipacc.rtp_payload",
++			  FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
 +		},
 +		{ &hf_rsl_local_port,
 +			{ "ip.access Local RTP Port",	"rsl.ipacc.local_port",
@@ -663,18 +780,18 @@ Index: wireshark/epan/dissectors/packet-rsl.c
  	};
  	static gint *ett[] = {
  		&ett_rsl,
-@@ -3941,6 +4497,14 @@
+@@ -3941,6 +4592,14 @@
  		&ett_ie_meas_res_no,
  		&ett_ie_message_id,
  		&ett_ie_sys_info_type,
-+		&ett_ie_f4,
-+		&ett_ie_f6,
-+		&ett_ie_f8,
++		&ett_ie_speech_mode,
++		&ett_ie_conn_stat,
++		&ett_ie_conn_id,
 +		&ett_ie_remote_ip,
 +		&ett_ie_remote_port,
 +		&ett_ie_local_port,
 +		&ett_ie_local_ip,
-+		&ett_ie_fc,
++		&ett_ie_rtp_payload,
  	};
  
  	/* Register the protocol name and description */