From 8927bb46d523904e982bc85e3e4f29317b241715 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Fri, 4 Mar 2016 14:49:12 +0100 Subject: libmsc: stubify paging (A-/Iu-interfaces need to reimplement this) --- openbsc/src/libmsc/gsm_04_08.c | 5 +++++ openbsc/src/libmsc/gsm_subscriber.c | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) (limited to 'openbsc') diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index f2065836e..1d06c69ff 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -1163,8 +1163,13 @@ static int gsm48_rx_rr_pag_resp(struct gsm_subscriber_connection *conn, struct m /* We received a paging */ conn->expire_timer_stopped = 1; +#if BEFORE_MSCSPLIT rc = gsm48_handle_paging_resp(conn, msg, subscr); return rc; +#else + LOGP(DRR, LOGL_ERROR, "MSC wants to tell BSC to gsm48_handle_paging_resp() but A-interface not implemented\n"); + return -1; +#endif } static int gsm48_rx_rr_app_info(struct gsm_subscriber_connection *conn, struct msgb *msg) diff --git a/openbsc/src/libmsc/gsm_subscriber.c b/openbsc/src/libmsc/gsm_subscriber.c index 7489b169f..63ad0f6d8 100644 --- a/openbsc/src/libmsc/gsm_subscriber.c +++ b/openbsc/src/libmsc/gsm_subscriber.c @@ -84,6 +84,7 @@ static int subscr_paging_dispatch(unsigned int hooknum, unsigned int event, OSMO_ASSERT(subscr->is_paging); +#if BEFORE_MSCSPLIT /* * Stop paging on all other BTS. E.g. if this is * the first timeout on a BTS then the others will @@ -91,6 +92,7 @@ static int subscr_paging_dispatch(unsigned int hooknum, unsigned int event, * and forget we wanted to page. */ paging_request_stop(NULL, subscr, NULL, NULL); +#endif /* Inform parts of the system we don't know */ sig_data.subscr = subscr; @@ -163,6 +165,14 @@ static int subscr_paging_cb(unsigned int hooknum, unsigned int event, return gsm48_secure_channel(conn, pr->key_seq, subscr_paging_sec_cb, param); } +int msc_paging_request(struct gsm_network *network, struct gsm_subscriber *subscr, + int type, gsm_cbfn *cbfn, void *data) +{ + LOGP(DMM, LOGL_ERROR, "MSC paging not implemented! want to page %s\n", + subscr_name(subscr)); + return -1; +} + struct subscr_request *subscr_request_channel(struct gsm_subscriber *subscr, int channel_type, gsm_cbfn *cbfn, void *param) { @@ -173,8 +183,8 @@ struct subscr_request *subscr_request_channel(struct gsm_subscriber *subscr, if (!subscr->is_paging) { LOGP(DMM, LOGL_DEBUG, "Subscriber %s not paged yet.\n", subscr_name(subscr)); - rc = paging_request(subscr->group->net, subscr, channel_type, - subscr_paging_cb, subscr); + rc = msc_paging_request(subscr->group->net, subscr, channel_type, + subscr_paging_cb, subscr); if (rc <= 0) { LOGP(DMM, LOGL_ERROR, "Subscriber %s paging failed: %d\n", subscr_name(subscr), rc); -- cgit v1.2.3