summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-05-30 21:44:32 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-03-09 18:34:15 +0100
commit6b075782ab68bed9bc89a25b1fd3c501ef8136e0 (patch)
tree78f4e705258e739676fb7c4aaf63685786bb1d8c
parent25c92ba0f8c7608b782abd0580e6281bd2ccf32d (diff)
cut off libbsc paging, pending paging in libmsc
Temporarily disable all paging to be able to link libmsc without libbsc. Skip the paging part of channel_test because the paging is now disabled. In osmo-nitb, paging is done on BSC level and MSC level "at the same time". When the new MSC is fully operational, paging will be controlled separately on the MSC level, and the BSC (RNC) level will be instructed over an IuCS or A-interface to negotiate paging with the MS (UE). This MSC level paging does not yet exist and will be added in subsequent commits. Change-Id: I8b6920ddc54fc3f2876a59664e6722666d8a8a4a
-rw-r--r--openbsc/src/libmsc/gsm_subscriber.c12
-rw-r--r--openbsc/src/libmsc/vty_interface_layer3.c4
-rw-r--r--openbsc/tests/channel/channel_test.c3
-rw-r--r--openbsc/tests/channel/channel_test.ok1
4 files changed, 19 insertions, 1 deletions
diff --git a/openbsc/src/libmsc/gsm_subscriber.c b/openbsc/src/libmsc/gsm_subscriber.c
index 20c02c6..d9f3db0 100644
--- a/openbsc/src/libmsc/gsm_subscriber.c
+++ b/openbsc/src/libmsc/gsm_subscriber.c
@@ -74,6 +74,10 @@ static struct bsc_subscr *vlr_subscr_to_bsc_sub(struct llist_head *bsc_subscribe
return sub;
}
+#if 0
+TODO implement paging response in libmsc!
+Excluding this to be able to link without libbsc:
+
/*
* We got the channel assigned and can now hand this channel
* over to one of our callbacks.
@@ -172,6 +176,7 @@ static int subscr_paging_cb(unsigned int hooknum, unsigned int event,
/* We _really_ have a channel, secure it now ! */
return gsm48_secure_channel(conn, pr->key_seq, subscr_paging_sec_cb, param);
}
+#endif
struct subscr_request *subscr_request_channel(struct vlr_subscr *vsub,
int channel_type,
@@ -186,10 +191,17 @@ struct subscr_request *subscr_request_channel(struct vlr_subscr *vsub,
if (!vsub->cs.is_paging) {
LOGP(DMM, LOGL_DEBUG, "Subscriber %s not paged yet.\n",
vlr_subscr_name(vsub));
+#if 0
+ TODO implement paging response in libmsc!
+ Excluding this to be able to link without libbsc:
+
bsub = vlr_subscr_to_bsc_sub(net->bsc_subscribers, vsub);
rc = paging_request(net, bsub, channel_type, subscr_paging_cb,
vsub);
bsc_subscr_put(bsub);
+#else
+ rc = -ENOTSUP;
+#endif
if (rc <= 0) {
LOGP(DMM, LOGL_ERROR, "Subscriber %s paging failed: %d\n",
vlr_subscr_name(vsub), rc);
diff --git a/openbsc/src/libmsc/vty_interface_layer3.c b/openbsc/src/libmsc/vty_interface_layer3.c
index 0d0b4d9..60a3666 100644
--- a/openbsc/src/libmsc/vty_interface_layer3.c
+++ b/openbsc/src/libmsc/vty_interface_layer3.c
@@ -678,7 +678,11 @@ DEFUN(show_stats,
{
struct gsm_network *net = gsmnet_from_vty(vty);
+#if 0
+ TODO implement statistics specifically for libmsc!
+ Excluding this to be able to link without libbsc:
openbsc_vty_print_statistics(vty, net);
+#endif
vty_out(vty, "Location Update : %lu attach, %lu normal, %lu periodic%s",
net->msc_ctrs->ctr[MSC_CTR_LOC_UPDATE_TYPE_ATTACH].current,
net->msc_ctrs->ctr[MSC_CTR_LOC_UPDATE_TYPE_NORMAL].current,
diff --git a/openbsc/tests/channel/channel_test.c b/openbsc/tests/channel/channel_test.c
index 2c3b44e..76e86a0 100644
--- a/openbsc/tests/channel/channel_test.c
+++ b/openbsc/tests/channel/channel_test.c
@@ -86,6 +86,8 @@ void test_request_chan(void)
/* Ask for a channel... */
struct subscr_request *sr;
+#warning _______________SKIPPING SOME TESTS____________________
+#if 0
sr = subscr_request_channel(vsub, RSL_CHANNEED_TCH_F, subscr_cb, (void*)0x2342L);
OSMO_ASSERT(sr);
OSMO_ASSERT(s_cbfn);
@@ -93,6 +95,7 @@ void test_request_chan(void)
s_cbfn(101, 200, (void*)0x1323L, &s_conn, s_data);
OSMO_ASSERT(s_end);
+#endif
}
void test_dyn_ts_subslots(void)
diff --git a/openbsc/tests/channel/channel_test.ok b/openbsc/tests/channel/channel_test.ok
index 33c8193..c582b4d 100644
--- a/openbsc/tests/channel/channel_test.ok
+++ b/openbsc/tests/channel/channel_test.ok
@@ -1,3 +1,2 @@
Testing the gsm_subscriber chan logic
-Reached, didn't crash, test passed
Testing subslot numbers for pchan types