diff options
-rw-r--r-- | openbsc/include/openbsc/abis_nm.h | 48 | ||||
-rw-r--r-- | openbsc/src/abis_nm.c | 16 | ||||
-rw-r--r-- | openbsc/src/bsc_hack.c | 4 | ||||
-rw-r--r-- | openbsc/src/ipaccess-config.c | 2 |
4 files changed, 51 insertions, 19 deletions
diff --git a/openbsc/include/openbsc/abis_nm.h b/openbsc/include/openbsc/abis_nm.h index 65cef73f3..201b90242 100644 --- a/openbsc/include/openbsc/abis_nm.h +++ b/openbsc/include/openbsc/abis_nm.h @@ -171,9 +171,6 @@ enum abis_nm_msgtype { NM_MT_SET_ALARM_THRES, NM_MT_SET_ALARM_THRES_ACK, NM_MT_SET_ALARM_THRES_NACK, - - NM_MT_IPACC_RESTART = 0x87, - NM_MT_IPACC_RESTART_ACK, }; enum abis_nm_msgtype_bs11 { @@ -212,6 +209,8 @@ enum abis_nm_msgtype_bs11 { }; enum abis_nm_msgtype_ipacc { + NM_MT_IPACC_RESTART = 0x87, + NM_MT_IPACC_RESTART_ACK, NM_MT_IPACC_RSL_CONNECT = 0xe0, NM_MT_IPACC_RSL_CONNECT_ACK, NM_MT_IPACC_RSL_CONNECT_NACK, @@ -358,26 +357,54 @@ enum abis_nm_attr { 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, + 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, NM_ATT_IPACC_CUR_SW_CFG = 0x97, - + NM_ATT_IPACC_TIMING_BUS = 0x98, + NM_ATT_IPACC_CGI = 0x99, + 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, @@ -568,11 +595,16 @@ enum abis_bs11_phase { }; 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 */ diff --git a/openbsc/src/abis_nm.c b/openbsc/src/abis_nm.c index 7e016dbc5..b13ce55be 100644 --- a/openbsc/src/abis_nm.c +++ b/openbsc/src/abis_nm.c @@ -355,12 +355,12 @@ static const struct tlv_definition nm_att_tlvdef = { [NM_ATT_BS11_CCLK_ACCURACY] = { TLV_TYPE_TV }, [NM_ATT_BS11_CCLK_TYPE] = { TLV_TYPE_TV }, /* 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_DST_IP] = { TLV_TYPE_FIXED, 4 }, + [NM_ATT_IPACC_DST_IP_PORT] = { TLV_TYPE_FIXED, 2 }, + [NM_ATT_IPACC_PRIM_OML_CFG_LIST] = { TLV_TYPE_TL16V }, [NM_ATT_IPACC_NV_FLAGS] = { TLV_TYPE_TL16V }, [NM_ATT_IPACC_FREQ_CTRL] = { TLV_TYPE_FIXED, 2 }, - [NM_ATT_IPACC_SEC_OML_IP] = { TLV_TYPE_TL16V }, // wrong name + [NM_ATT_IPACC_PRIM_OML_FB_TOUT] = { TLV_TYPE_TL16V }, [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 }, @@ -2263,14 +2263,14 @@ static int abis_nm_rx_ipacc(struct msgb *msg) switch (foh->msg_type) { case NM_MT_IPACC_RSL_CONNECT_ACK: DEBUGPC(DNM, "RSL CONNECT ACK "); - if (TLVP_PRESENT(&tp, NM_ATT_IPACC_RSL_BSC_IP)) + if (TLVP_PRESENT(&tp, NM_ATT_IPACC_DST_IP)) DEBUGPC(DNM, "IP=%s ", inet_ntoa(*((struct in_addr *) - TLVP_VAL(&tp, NM_ATT_IPACC_RSL_BSC_IP)))); - if (TLVP_PRESENT(&tp, NM_ATT_IPACC_RSL_BSC_PORT)) + TLVP_VAL(&tp, NM_ATT_IPACC_DST_IP)))); + if (TLVP_PRESENT(&tp, NM_ATT_IPACC_DST_IP_PORT)) DEBUGPC(DNM, "PORT=%u ", ntohs(*((u_int16_t *) - TLVP_VAL(&tp, NM_ATT_IPACC_RSL_BSC_PORT)))); + TLVP_VAL(&tp, NM_ATT_IPACC_DST_IP_PORT)))); DEBUGPC(DNM, "\n"); break; case NM_MT_IPACC_RSL_CONNECT_NACK: diff --git a/openbsc/src/bsc_hack.c b/openbsc/src/bsc_hack.c index 384da54b8..688ee9fbc 100644 --- a/openbsc/src/bsc_hack.c +++ b/openbsc/src/bsc_hack.c @@ -362,8 +362,8 @@ static unsigned char nanobts_attr_radio[] = { }; static unsigned char nanobts_attr_e0[] = { - 0x85, 0x00, - 0x81, 0x0b, 0xbb, /* TCP PORT for RSL */ + NM_ATT_IPACC_STREAM_ID, 0x00, + NM_ATT_IPACC_DST_IP_PORT, 0x0b, 0xbb, /* TCP PORT for RSL */ }; /* Callback function to be called whenever we get a GSM 12.21 state change event */ diff --git a/openbsc/src/ipaccess-config.c b/openbsc/src/ipaccess-config.c index 52e9cc99d..5ccbaa70c 100644 --- a/openbsc/src/ipaccess-config.c +++ b/openbsc/src/ipaccess-config.c @@ -111,7 +111,7 @@ static void bootstrap_om(struct gsm_bts *bts) /* 0x88 + IP + port */ len = 1 + sizeof(ia) + 2; - *cur++ = NM_ATT_IPACC_PRIM_OML_IP; + *cur++ = NM_ATT_IPACC_PRIM_OML_CFG_LIST; *cur++ = (len) >> 8; *cur++ = (len) & 0xff; *cur++ = 0x88; |