summaryrefslogtreecommitdiffstats
path: root/openbsc/src
diff options
context:
space:
mode:
Diffstat (limited to 'openbsc/src')
-rw-r--r--openbsc/src/abis_nm.c16
-rw-r--r--openbsc/src/bsc_hack.c4
-rw-r--r--openbsc/src/ipaccess-config.c2
3 files changed, 11 insertions, 11 deletions
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;