diff options
Diffstat (limited to 'tests/msc_vlr')
-rw-r--r-- | tests/msc_vlr/Makefile.am | 4 | ||||
-rw-r--r-- | tests/msc_vlr/msc_vlr_tests.c | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am index ab0714ebf..a2b0f0889 100644 --- a/tests/msc_vlr/Makefile.am +++ b/tests/msc_vlr/Makefile.am @@ -65,8 +65,8 @@ LDFLAGS = \ -Wl,--wrap=gsup_client_send \ -Wl,--wrap=a_iface_tx_dtap \ -Wl,--wrap=a_iface_tx_paging \ - -Wl,--wrap=iu_tx \ - -Wl,--wrap=iu_page_cs \ + -Wl,--wrap=ranap_iu_tx \ + -Wl,--wrap=ranap_iu_page_cs \ -Wl,--wrap=msc_stop_paging \ -Wl,--wrap=gsm340_gen_scts \ -Wl,--wrap=RAND_bytes \ diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 75786bac4..0a485b4a9 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -30,11 +30,11 @@ #include <osmocom/core/application.h> #include <osmocom/gsm/protocol/gsm_04_11.h> #include <osmocom/gsm/gsup.h> +#include <osmocom/ranap/iu_client.h> #include <openbsc/gsup_client.h> #include <openbsc/gsm_04_11.h> #include <openbsc/bsc_subscriber.h> #include <openbsc/debug.h> -#include <openbsc/iu.h> #include <openbsc/iucs_ranap.h> #include "msc_vlr_tests.h" @@ -147,8 +147,8 @@ struct gsm_subscriber_connection *conn_new(void) conn->bts = the_bts; conn->via_ran = rx_from_ran; if (conn->via_ran == RAN_UTRAN_IU) { - struct ue_conn_ctx *ue_ctx = talloc_zero(conn, struct ue_conn_ctx); - *ue_ctx = (struct ue_conn_ctx){ + struct ranap_ue_conn_ctx *ue_ctx = talloc_zero(conn, struct ranap_ue_conn_ctx); + *ue_ctx = (struct ranap_ue_conn_ctx){ .conn_id = 42, }; conn->iu.ue_ctx = ue_ctx; @@ -290,9 +290,9 @@ int _paging_sent(enum ran_type via_ran, const char *imsi, uint32_t tmsi, uint32_ return 1; } -/* override, requires '-Wl,--wrap=iu_page_cs' */ -int __real_iu_page_cs(const char *imsi, const uint32_t *tmsi, uint16_t lac); -int __wrap_iu_page_cs(const char *imsi, const uint32_t *tmsi, uint16_t lac) +/* override, requires '-Wl,--wrap=ranap_iu_page_cs' */ +int __real_ranap_iu_page_cs(const char *imsi, const uint32_t *tmsi, uint16_t lac); +int __wrap_ranap_iu_page_cs(const char *imsi, const uint32_t *tmsi, uint16_t lac) { return _paging_sent(RAN_UTRAN_IU, imsi, tmsi ? *tmsi : GSM_RESERVED_TMSI, lac); } @@ -461,9 +461,9 @@ int _validate_dtap(struct msgb *msg, enum ran_type to_ran) return 0; } -/* override, requires '-Wl,--wrap=iu_tx' */ -int __real_iu_tx(struct msgb *msg, uint8_t sapi); -int __wrap_iu_tx(struct msgb *msg, uint8_t sapi) +/* override, requires '-Wl,--wrap=ranap_iu_tx' */ +int __real_ranap_iu_tx(struct msgb *msg, uint8_t sapi); +int __wrap_ranap_iu_tx(struct msgb *msg, uint8_t sapi) { return _validate_dtap(msg, RAN_UTRAN_IU); } @@ -604,7 +604,7 @@ void ms_sends_security_mode_complete() OSMO_ASSERT(g_conn->iu.ue_ctx); /* TODO mock IEs or call vlr callback directly */ iucs_rx_ranap_event(g_conn->network, g_conn->iu.ue_ctx, - IU_EVENT_SECURITY_MODE_COMPLETE, + RANAP_IU_EVENT_SECURITY_MODE_COMPLETE, NULL); } |