path: root/openbsc/src/libbsc
diff options
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-05-10 13:56:43 +0200
committerHarald Welte <laforge@gnumonks.org>2016-12-02 12:09:17 +0000
commit1a60644eb21a5c50eddc5790444022fd5aa11df8 (patch)
tree1fa3addcc94f21f3f043e49cbd616e1726bb0123 /openbsc/src/libbsc
parentea11bf80955bbbbacb4589f6cc015ab470ad98e8 (diff)
reinvent connection_for_subscr() and move to libmsc
Implement connection_for_subscr() from a completely different angle: instead of looking up lchans in bts structs, look up the subscriber in the global list of gsm_subscriber_connection. static lchan_find() is thus obsoleted. All callers of connection_for_subscr() live in libmsc, so move to libmsc. The move and edit are done in a single commit since the old and new implementation have nothing in common. Future: osmo-cscn will use this, without bts being present. Remove implementation of connection_for_subscr() from channel_test.c -- it is possible that the abort() in there was intended for a regression test, but actually it seems the implementation was merely added for linking reasons, and the abort() added to guard against the NULL return value: no comment nor the commit log indicate that the abort() is test critical; the addition was the only change in channel_test.c for that commit; at the same time a connection_for_subscr() call was added in libmsc. Change-Id: I5e0ba0ecf1726ebd540800f4e98fdfc937c904ff
Diffstat (limited to 'openbsc/src/libbsc')
1 files changed, 0 insertions, 33 deletions
diff --git a/openbsc/src/libbsc/chan_alloc.c b/openbsc/src/libbsc/chan_alloc.c
index 367139c..0f4d90a 100644
--- a/openbsc/src/libbsc/chan_alloc.c
+++ b/openbsc/src/libbsc/chan_alloc.c
@@ -481,39 +481,6 @@ int lchan_release(struct gsm_lchan *lchan, int sacch_deact, enum rsl_rel_mode mo
return 1;
-static struct gsm_lchan* lchan_find(struct gsm_bts *bts, struct gsm_subscriber *subscr) {
- struct gsm_bts_trx *trx;
- int ts_no, lchan_no;
- llist_for_each_entry(trx, &bts->trx_list, list) {
- for (ts_no = 0; ts_no < 8; ++ts_no) {
- for (lchan_no = 0; lchan_no < TS_MAX_LCHAN; ++lchan_no) {
- struct gsm_lchan *lchan =
- &trx->ts[ts_no].lchan[lchan_no];
- if (lchan->conn && subscr == lchan->conn->subscr)
- return lchan;
- }
- }
- }
- return NULL;
-struct gsm_subscriber_connection *connection_for_subscr(struct gsm_subscriber *subscr)
- struct gsm_bts *bts;
- struct gsm_network *net = subscr->group->net;
- struct gsm_lchan *lchan;
- llist_for_each_entry(bts, &net->bts_list, list) {
- lchan = lchan_find(bts, subscr);
- if (lchan)
- return lchan->conn;
- }
- return NULL;
void bts_chan_load(struct pchan_load *cl, const struct gsm_bts *bts)
struct gsm_bts_trx *trx;