From b16004ca8d036ba0f196d14cd74e7bf4c1e77c28 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 11 Jul 2009 19:44:53 +0200 Subject: abis_oml wireshark plugin now builds without compiler warnings --- wireshark/abis_oml.patch | 227 ++++++++++++++++++++++++----------------------- 1 file changed, 116 insertions(+), 111 deletions(-) (limited to 'wireshark') diff --git a/wireshark/abis_oml.patch b/wireshark/abis_oml.patch index 00069ceea..cc75e52c7 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-10 23:17:56.000000000 +0200 -+++ wireshark/epan/dissectors/Makefile.common 2009-07-11 10:11:29.000000000 +0200 -@@ -926,6 +926,7 @@ - # Dissectors with warnings. - # - DIRTY_DISSECTOR_SRC = \ ++++ wireshark/epan/dissectors/Makefile.common 2009-07-11 17:50:23.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-11 16:40:31.000000000 +0200 -@@ -0,0 +1,1244 @@ ++++ wireshark/epan/dissectors/packet-gsm_abis_oml.c 2009-07-11 17:49:29.000000000 +0200 +@@ -0,0 +1,1248 @@ +/* packet-abis_oml.c + * Routines for packet dissection of GSM A-bis over IP (3GPP TS 12.21) + * Copyright 2009 by Harald Welte @@ -635,7 +635,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); @@ -666,6 +665,7 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.c + break; + } + } ++ return offset; +} + +/* Dissect OML FOM Attributes after OML + FOM header */ @@ -716,6 +716,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, @@ -1262,8 +1266,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-11 10:54:34.000000000 +0200 -@@ -0,0 +1,740 @@ ++++ wireshark/epan/dissectors/packet-gsm_abis_oml.h 2009-07-11 17:46:16.000000000 +0200 +@@ -0,0 +1,741 @@ +/* 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 */ + @@ -1880,126 +1884,127 @@ 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 }, -+ //BS11 [NM_ATT_HW_DESC] = { TLV_TYPE_TL16V }, -+ [NM_ATT_HW_DESC] = { TLV_TYPE_TLV }, -+ [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_PRIM_OML_IP] = { 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_IP] = { TLV_TYPE_TL16V, 0 }, // 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 }, -+ [NM_ATT_IPACC_CUR_SW_CFG] = { TLV_TYPE_TL16V }, -+ [0x85] = { TLV_TYPE_TV }, -+ [0x9a] = { TLV_TYPE_TL16V }, -+ [0x9b] = { TLV_TYPE_TL16V }, -+ [0x9c] = { TLV_TYPE_TL16V }, -+ [0x9d] = { TLV_TYPE_TL16V }, -+ [0x9e] = { TLV_TYPE_TL16V }, -+ [0x9f] = { TLV_TYPE_TL16V }, -+ [0xa0] = { TLV_TYPE_TL16V }, -+ [0xa1] = { TLV_TYPE_TL16V }, -+ [0xa2] = { TLV_TYPE_TL16V }, -+ [0xa3] = { TLV_TYPE_TL16V }, -+ [0xa7] = { TLV_TYPE_TL16V }, -+ [0xa8] = { TLV_TYPE_TL16V }, -+ [0xa9] = { TLV_TYPE_TL16V }, -+ [0xac] = { TLV_TYPE_TL16V }, ++ [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 }, ++ [0x85] = { TLV_TYPE_TV, 0 }, ++ [0x9a] = { TLV_TYPE_TL16V, 0 }, ++ [0x9b] = { TLV_TYPE_TL16V, 0 }, ++ [0x9c] = { TLV_TYPE_TL16V, 0 }, ++ [0x9d] = { TLV_TYPE_TL16V, 0 }, ++ [0x9e] = { TLV_TYPE_TL16V, 0 }, ++ [0x9f] = { TLV_TYPE_TL16V, 0 }, ++ [0xa0] = { TLV_TYPE_TL16V, 0 }, ++ [0xa1] = { TLV_TYPE_TL16V, 0 }, ++ [0xa2] = { TLV_TYPE_TL16V, 0 }, ++ [0xa3] = { TLV_TYPE_TL16V, 0 }, ++ [0xa7] = { TLV_TYPE_TL16V, 0 }, ++ [0xa8] = { TLV_TYPE_TL16V, 0 }, ++ [0xa9] = { TLV_TYPE_TL16V, 0 }, ++ [0xac] = { TLV_TYPE_TL16V, 0 }, + }, +}; + -- cgit v1.2.3