adopt recent IPA related symbol rename
... which happened during recent migration of IPA functionality from
libosmo-abis into libosmocore.
diff --git a/openbsc/src/ipaccess/ipaccess-find.c b/openbsc/src/ipaccess/ipaccess-find.c
index c8de157..40729fa 100644
--- a/openbsc/src/ipaccess/ipaccess-find.c
+++ b/openbsc/src/ipaccess/ipaccess-find.c
@@ -28,7 +28,8 @@
#include <osmocom/core/select.h>
#include <osmocom/core/timer.h>
-#include <openbsc/ipaccess.h>
+#include <osmocom/gsm/protocol/ipaccess.h>
+#include <osmocom/gsm/ipa.h>
#include <openbsc/gsm_data.h>
static int udp_sock(const char *ifname)
@@ -118,7 +119,7 @@
t_len = *cur++;
t_tag = *cur++;
- printf("%s='%s' ", ipaccess_idtag_name(t_tag), cur);
+ printf("%s='%s' ", ipa_ccm_idtag_name(t_tag), cur);
cur += t_len;
}
diff --git a/openbsc/src/ipaccess/ipaccess-proxy.c b/openbsc/src/ipaccess/ipaccess-proxy.c
index 39a0d8b..ab43b9e 100644
--- a/openbsc/src/ipaccess/ipaccess-proxy.c
+++ b/openbsc/src/ipaccess/ipaccess-proxy.c
@@ -42,7 +42,9 @@
#include <osmocom/core/select.h>
#include <osmocom/gsm/tlv.h>
#include <osmocom/core/msgb.h>
+#include <osmocom/gsm/ipa.h>
#include <osmocom/abis/ipa.h>
+#include <osmocom/abis/ipaccess.h>
#include <openbsc/debug.h>
#include <openbsc/ipaccess.h>
#include <openbsc/socket.h>
@@ -444,7 +446,7 @@
switch (msg_type) {
case IPAC_MSGT_PING:
- ret = ipaccess_send_pong(bfd->fd);
+ ret = ipa_ccm_send_pong(bfd->fd);
break;
case IPAC_MSGT_PONG:
DEBUGP(DLMI, "PONG!\n");
@@ -452,7 +454,7 @@
case IPAC_MSGT_ID_RESP:
DEBUGP(DLMI, "ID_RESP ");
/* parse tags, search for Unit ID */
- ipaccess_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2,
+ ipa_ccm_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2,
msgb_l2len(msg)-2);
DEBUGP(DLMI, "\n");
@@ -463,7 +465,7 @@
/* lookup BTS, create sign_link, ... */
memset(&unit_data, 0, sizeof(unit_data));
- ipaccess_parse_unitid((char *)TLVP_VAL(&tlvp, IPAC_IDTAG_UNIT),
+ ipa_parse_unitid((char *)TLVP_VAL(&tlvp, IPAC_IDTAG_UNIT),
&unit_data);
ipbc = find_bts_by_unitid(ipp, unit_data.site_id, unit_data.bts_id);
if (!ipbc) {
@@ -528,7 +530,7 @@
break;
case IPAC_MSGT_ID_ACK:
DEBUGP(DLMI, "ID_ACK? -> ACK!\n");
- ret = ipaccess_send_id_ack(bfd->fd);
+ ret = ipa_ccm_send_id_ack(bfd->fd);
break;
default:
LOGP(DLMI, LOGL_ERROR, "Unhandled IPA type; %d\n", msg_type);
@@ -935,7 +937,7 @@
}
/* Request ID. FIXME: request LOCATION, HW/SW VErsion, Unit Name, Serno */
- ret = ipaccess_send_id_req(bfd->fd);
+ ret = ipa_ccm_send_id_req(bfd->fd);
return 0;
}