aboutsummaryrefslogtreecommitdiffstats
path: root/openbsc/tests/oap
diff options
context:
space:
mode:
Diffstat (limited to 'openbsc/tests/oap')
-rw-r--r--openbsc/tests/oap/Makefile.am1
-rw-r--r--openbsc/tests/oap/oap_test.c9
2 files changed, 5 insertions, 5 deletions
diff --git a/openbsc/tests/oap/Makefile.am b/openbsc/tests/oap/Makefile.am
index 3a76b11ad..538e1787e 100644
--- a/openbsc/tests/oap/Makefile.am
+++ b/openbsc/tests/oap/Makefile.am
@@ -15,7 +15,6 @@ oap_test_LDADD = \
$(top_builddir)/src/gprs/oap.o \
$(top_builddir)/src/gprs/oap_messages.o \
$(top_builddir)/src/gprs/gprs_utils.o \
- $(top_builddir)/src/gprs/gsm_04_08_gprs.o \
$(top_builddir)/src/libcommon/libcommon.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
diff --git a/openbsc/tests/oap/oap_test.c b/openbsc/tests/oap/oap_test.c
index 9a2063bdc..339d77430 100644
--- a/openbsc/tests/oap/oap_test.c
+++ b/openbsc/tests/oap/oap_test.c
@@ -26,6 +26,7 @@
#include <openbsc/oap_messages.h>
#include <stdio.h>
+#include <string.h>
static void test_oap_api(void)
{
@@ -94,8 +95,8 @@ static void test_oap_api(void)
printf(" - AUTN failures\n");
- struct oap_message oap_rx;
- struct oap_message oap_tx;
+ struct osmo_oap_message oap_rx;
+ struct osmo_oap_message oap_tx;
struct msgb *msg_rx;
struct msgb *msg_tx;
@@ -167,7 +168,7 @@ static void test_oap_api(void)
/* Expect the challenge response in msg_tx */
OSMO_ASSERT(msg_tx);
- OSMO_ASSERT(oap_decode(msg_tx->data, msg_tx->len, &oap_tx) == 0);
+ OSMO_ASSERT(osmo_oap_decode(&oap_tx, msg_tx->data, msg_tx->len) == 0);
OSMO_ASSERT(oap_tx.message_type == OAP_MSGT_CHALLENGE_RESULT);
OSMO_ASSERT(strcmp("e2d05b598c61d9ba",
osmo_hexdump_nospc(oap_tx.xres, sizeof(oap_tx.xres)))
@@ -190,7 +191,7 @@ static void test_oap_api(void)
OSMO_ASSERT(oap_handle(state, msg_rx, &msg_tx) == 0);
OSMO_ASSERT(state->registration_failures == 1);
OSMO_ASSERT(msg_tx);
- OSMO_ASSERT(oap_decode(msg_tx->data, msg_tx->len, &oap_tx) == 0);
+ OSMO_ASSERT(osmo_oap_decode(&oap_tx, msg_tx->data, msg_tx->len) == 0);
OSMO_ASSERT(oap_tx.message_type == OAP_MSGT_REGISTER_REQUEST);
OSMO_ASSERT(state->state == OAP_REQUESTED_CHALLENGE);
msgb_free(msg_tx);