summaryrefslogtreecommitdiffstats
path: root/openbsc/tests
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2015-04-06 12:03:45 +0200
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2015-04-29 18:53:28 +0200
commitd6d7affa6eb9e9e158d2e0f0108ef154e24867a5 (patch)
tree860cdcfefdd3f9b7badd414c03dee332ba03cd63 /openbsc/tests
parent0759b1b9522f0a4f8256671b9098f7bc493c3a99 (diff)
sub: Remove the queue from the subscriber code
The idea of "subscriber_get_channel" was that different requests would be coordinated. At the same time we have seen that the "queue" can get stuck at both 31C3 and the rhizomatica installations. Voice calls and SMS do not need coordination. We should be able to send SMS on a voice channel and switch the MS from a SDCCH to a TCH in case we establish a voice call. The SMS code itself needs to coordinate to obey the limit of one SMS per direction but this should be enforced in the sms layer and not on the subscriber. Modify the code to have a simple paging coordination. The subscriber code will schedule the paging and register who would like to know about success/failure. This allowed to greatly simplify the paging response handling for the transaction code (and in fact we could move the transaction list into the subscriber structure now). The code gained to support to cancel the notification of a request (but not the paging itself yet). TODO: Cancel paging request in case no one cares about it anymore.
Diffstat (limited to 'openbsc/tests')
-rw-r--r--openbsc/tests/channel/channel_test.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/openbsc/tests/channel/channel_test.c b/openbsc/tests/channel/channel_test.c
index 2369339..cd6a1fd 100644
--- a/openbsc/tests/channel/channel_test.c
+++ b/openbsc/tests/channel/channel_test.c
@@ -31,6 +31,8 @@
static int s_end = 0;
static struct gsm_subscriber_connection s_conn;
+static void *s_data;
+static gsm_cbfn *s_cbfn;
/* our handler */
static int subscr_cb(unsigned int hook, unsigned int event, struct msgb *msg, void *data, void *param)
@@ -48,7 +50,8 @@ static int subscr_cb(unsigned int hook, unsigned int event, struct msgb *msg, vo
/* mock object for testing, directly invoke the cb... maybe later through the timer */
int paging_request(struct gsm_bts *bts, struct gsm_subscriber *subscriber, int type, gsm_cbfn *cbfn, void *data)
{
- cbfn(101, 200, (void*)0x1323L, &s_conn, data);
+ s_data = data;
+ s_cbfn = cbfn;
/* claim we have patched */
return 1;
@@ -80,11 +83,10 @@ int main(int argc, char **argv)
OSMO_ASSERT(subscr->group->net == network);
/* Ask for a channel... */
- subscr_get_channel(subscr, RSL_CHANNEED_TCH_F, subscr_cb, (void*)0x2342L);
+ subscr_request_channel(subscr, RSL_CHANNEED_TCH_F, subscr_cb, (void*)0x2342L);
+ s_cbfn(101, 200, (void*)0x1323L, &s_conn, s_data);
- while (!s_end) {
- osmo_select_main(0);
- }
+ OSMO_ASSERT(s_end);
return EXIT_SUCCESS;
}