OpenBSC June 2016

openbsc@lists.osmocom.org

18 participants
84 discussions

Stopping Gerrit on Sunday
by Holger Freyther 02 Jun '16

02 Jun '16

Hi Guys, I am a bit fed-up to have to receive Neels non-productive mails every single day and given my tight work schedule let's have him win, declare Gerrit a failure and return to patchwork. The twist is that I am no longer willing to clean behind everyone on the patchwork UI. So somebody else needs to sign-up for the patch merging and gardening in the WebUI. My proposal would be: * Sunday morning we change all ACLs (no more pushes, no more merges/submits/reviews) * Luckily we have all patches in our patchwork and can continue from there. agreed? holger

5 4

gerrit: refs/users vs. refs/heads/users
by Neels Hofmeyr 02 Jun '16

02 Jun '16

Hi all, I have just changed the access configuration of gerrit.osmocom.org: * added a group of "known users" * allow create+push to refs/heads/users/* to this group * disallow access to refs/users/* (except to admins for cleanup) * added a sysmocom group * allow create+push to refs/heads/sysmocom/* to this group Questions: * allow global namespace access to "known users"? * or move old user branches to users/? Causality: Previously, gerrit granted create+push access to refs/users/* (note: no "heads") to anybody. However, branches pushed there were not being replicated to git.osmocom.org. IMHO we should not have this fragmentation of repositories. Instead, we could allow create+push to refs/heads/users/* (note: "heads") to any registered user. The refs/heads/users/* namespace will replicate to git.osmocom.org repositories automatically. But: Before gerrit, anyone would be able to push to any branch. We relied on trust that we wouldn't mess with other devs' branches or push to master without review. That worked out pretty well. But, before gerrit, we would actively enable users we trust. With gerrit, ANYONE can register without any project member even noticing, and start pushing right away. Thus we should rather limit the push access, e.g. to refs/heads/users/* When granting push access to the users/* namespace to ANYONE, one problem remains: any troll could commit any amount of completely unrelated data, and we would readily replicate it to our "upstream" git.osmocom.org repositories. So, actually, instead of allowing push access to users/* to anyone, I have added a group "known users" to gerrit, which should typically contain anyone we trust not to be a troll. I have added all gerrit users I know to this group. Anyone who wishes to push to a users/* branch must request to be added to the "known users" group. The threshold to join this group should be low. (The ability to push patches for review is not affected.) Since certain subgroups like to collaborate on given branches (e.g. fairwaves, sysmocom, ...), we can add specific namespaces for these groups. I have so far added a refs/heads/sysmocom/* namespace and a "sysmocom group access" gerrit group. I can add more groups on request. The only advantage here is that you can drop the "users/" path element. Any "known users" member can collaborate on users/* branches already, e.g. refs/heads/users/sysmocom/topic. To make this less config prone, we could go one step further and allow global push access to the group of known users, going back to the model of trust that users take care not to push nonsense. That would include access to master. We also still have various branches in git.osmocom.org that don't have the 'users' path element. If we grant global namespace access to known users, these would continue to be useful. If not, we could rename these to users/ to allow further access. Opinions welcome! ~Neels -- - Neels Hofmeyr <nhofmeyr(a)sysmocom.de> http://www.sysmocom.de/ ======================================================================= * sysmocom - systems for mobile communications GmbH * Alt-Moabit 93 * 10559 Berlin, Germany * Sitz / Registered office: Berlin, HRB 134158 B * Geschäftsführer / Managing Directors: Holger Freyther, Harald Welte

2 1

[PATCH] openbsc[master]: dyn pdch: send PDCH ACT for each TCH/F_PDCH on TRX RSL UP
by Neels Hofmeyr 02 Jun '16

02 Jun '16

Review at https://gerrit.osmocom.org/182 dyn pdch: send PDCH ACT for each TCH/F_PDCH on TRX RSL UP Add dyn_pdch_init() and call from inp_sig_cb() upon RSL UP. Revert the |= TS_F_PDCH_MODE chunk from previous commit, since this flag will now be set after dyn_pdch_init() sent out the PDCH ACT, i.e. when the PDCH ACT ACK messages are received. Change-Id: I7bfc70527162c95b3d7ea853eda6376b4f1f1161 --- M openbsc/src/libbsc/bsc_init.c 1 file changed, 34 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/82/182/1 diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c index 110e160..02c949c 100644 --- a/openbsc/src/libbsc/bsc_init.c +++ b/openbsc/src/libbsc/bsc_init.c @@ -302,6 +302,36 @@ generate_ma_for_ts(&trx->ts[i]); } +static void dyn_pdch_init(struct gsm_bts_trx *trx) +{ + unsigned int i; + struct gsm_bts_trx_ts *ts; + int rc; + unsigned int pdch_act_count = 0; + + for (i = 0; i < TRX_NR_TS; i++) { + ts = &trx->ts[i]; + if (ts->pchan == GSM_PCHAN_TCH_F_PDCH) { + rc = rsl_ipacc_pdch_activate(ts, 1); + if (rc != 0) { + LOGP(DRSL, LOGL_ERROR, + "Failed to activate PDCH on" + " BTS %u TRX %u TS %u: %d\n", + trx->bts->nr, trx->nr, i, rc); + continue; + } + pdch_act_count ++; + } + } + + if (pdch_act_count) { + LOGP(DRSL, LOGL_NOTICE, + "Activated PDCH on %u dynamic TCH/F_PDCH time slots" + " for BTS %u TRX %u\n", + pdch_act_count, trx->bts->nr, trx->nr); + } +} + /* Callback function to be called every time we receive a signal from INPUT */ static int inp_sig_cb(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data) @@ -328,14 +358,14 @@ generate_cell_chan_list(ca, trx->bts); llist_for_each_entry(cur_trx, &trx->bts->trx_list, list) { - for (i = 0; i < ARRAY_SIZE(cur_trx->ts); i++) { + for (i = 0; i < ARRAY_SIZE(cur_trx->ts); i++) generate_ma_for_ts(&cur_trx->ts[i]); - cur_trx->ts[i].flags |= TS_F_PDCH_MODE; - } } } - if (isd->link_type == E1INP_SIGN_RSL) + if (isd->link_type == E1INP_SIGN_RSL) { bootstrap_rsl(trx); + dyn_pdch_init(trx); + } break; case S_L_INP_TEI_DN: LOGP(DLMI, LOGL_ERROR, "Lost some E1 TEI link: %d %p\n", isd->link_type, trx); -- To view, visit https://gerrit.osmocom.org/182 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7bfc70527162c95b3d7ea853eda6376b4f1f1161 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <nhofmeyr(a)sysmocom.de>

1 1

[PATCH] openbsc[master]: dyn PDCH: Automatically deactivate/activate PDCH on TCH/F+PD...
by Neels Hofmeyr 02 Jun '16

02 Jun '16

Review at https://gerrit.osmocom.org/181 dyn PDCH: Automatically deactivate/activate PDCH on TCH/F+PDCH channel Handle shared TCH/F+PDCH channels as regular TCH/F channels. Prior to activation, deactivate PDCH mode. After deactivation, restore PDCH mode. Change-Id: I5b7cff07ad9ac281a212daff8106a7d65c3c3145 --- M openbsc/include/openbsc/gsm_data_shared.h M openbsc/src/libbsc/abis_rsl.c M openbsc/src/libbsc/bsc_init.c 3 files changed, 45 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/81/181/1 diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h index c3d5978..7f9b0cc 100644 --- a/openbsc/include/openbsc/gsm_data_shared.h +++ b/openbsc/include/openbsc/gsm_data_shared.h @@ -256,6 +256,12 @@ struct gsm48_req_ref *rqd_ref; struct gsm_subscriber_connection *conn; + + struct { + /* channel activation type and handover ref */ + uint8_t act_type; + uint8_t ho_ref; + } dyn_pdch; #else /* Number of different GsmL1_Sapi_t used in osmo_bts_sysmo is 23. * Currently we don't share these headers so this is a magic number. */ diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c index abe2f9b..59176df 100644 --- a/openbsc/src/libbsc/abis_rsl.c +++ b/openbsc/src/libbsc/abis_rsl.c @@ -470,6 +470,15 @@ if (rc < 0) return rc; + /* if channel is in PDCH mode, deactivate PDCH first */ + if (lchan->ts->pchan == GSM_PCHAN_TCH_F_PDCH + && (lchan->ts->flags & TS_F_PDCH_MODE)) { + /* store activation type and handover reference */ + lchan->dyn_pdch.act_type = act_type; + lchan->dyn_pdch.ho_ref = ho_ref; + return rsl_ipacc_pdch_activate(lchan->ts, 0); + } + ta = lchan->rqd_ta; /* BS11 requires TA shifted by 2 bits */ @@ -746,6 +755,11 @@ LOGP(DRSL, LOGL_NOTICE, "%s CHAN REL ACK but state %s\n", gsm_lchan_name(lchan), gsm_lchans_name(lchan->state)); + + /* Put PDCH channel back into PDCH mode first */ + if (lchan->ts->pchan == GSM_PCHAN_TCH_F_PDCH) + return rsl_ipacc_pdch_activate(lchan->ts, 1); + do_lchan_free(lchan); return 0; @@ -1187,6 +1201,26 @@ return 0; } +static int rsl_rx_pdch_act_ack(struct msgb *msg) +{ + msg->lchan->ts->flags |= TS_F_PDCH_MODE; + + /* We have activated PDCH, so now the channel is available again. */ + do_lchan_free(msg->lchan); + + return 0; +} + +static int rsl_rx_pdch_deact_ack(struct msgb *msg) +{ + msg->lchan->ts->flags &= ~TS_F_PDCH_MODE; + + rsl_chan_activate_lchan(msg->lchan, msg->lchan->dyn_pdch.act_type, + msg->lchan->dyn_pdch.ho_ref); + + return 0; +} + static int abis_rsl_rx_dchan(struct msgb *msg) { struct abis_rsl_dchan_hdr *rslh = msgb_l2(msg); @@ -1225,14 +1259,14 @@ break; case RSL_MT_IPAC_PDCH_ACT_ACK: DEBUGP(DRSL, "%s IPAC PDCH ACT ACK\n", ts_name); - msg->lchan->ts->flags |= TS_F_PDCH_MODE; + rc = rsl_rx_pdch_act_ack(msg); break; case RSL_MT_IPAC_PDCH_ACT_NACK: LOGP(DRSL, LOGL_ERROR, "%s IPAC PDCH ACT NACK\n", ts_name); break; case RSL_MT_IPAC_PDCH_DEACT_ACK: DEBUGP(DRSL, "%s IPAC PDCH DEACT ACK\n", ts_name); - msg->lchan->ts->flags &= ~TS_F_PDCH_MODE; + rc = rsl_rx_pdch_deact_ack(msg); break; case RSL_MT_IPAC_PDCH_DEACT_NACK: LOGP(DRSL, LOGL_ERROR, "%s IPAC PDCH DEACT NACK\n", ts_name); diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c index 1012425..110e160 100644 --- a/openbsc/src/libbsc/bsc_init.c +++ b/openbsc/src/libbsc/bsc_init.c @@ -328,8 +328,10 @@ generate_cell_chan_list(ca, trx->bts); llist_for_each_entry(cur_trx, &trx->bts->trx_list, list) { - for (i = 0; i < ARRAY_SIZE(cur_trx->ts); i++) + for (i = 0; i < ARRAY_SIZE(cur_trx->ts); i++) { generate_ma_for_ts(&cur_trx->ts[i]); + cur_trx->ts[i].flags |= TS_F_PDCH_MODE; + } } } if (isd->link_type == E1INP_SIGN_RSL) -- To view, visit https://gerrit.osmocom.org/181 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b7cff07ad9ac281a212daff8106a7d65c3c3145 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <nhofmeyr(a)sysmocom.de>

1 0

[PATCH] openbsc[master]: dyn PDCH: allow allocating TCH/F on TCH/F_PDCH slots
by Neels Hofmeyr 02 Jun '16

02 Jun '16

Review at https://gerrit.osmocom.org/180 dyn PDCH: allow allocating TCH/F on TCH/F_PDCH slots See comment added in the code. Original patch by jolly, but split in two, added comment and flipped the if() logic for readability by nhofmeyr. Change-Id: Iddd575873a2fe819fc182a6b3d4186caea1997e5 --- M openbsc/src/libbsc/chan_alloc.c 1 file changed, 10 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/80/180/1 diff --git a/openbsc/src/libbsc/chan_alloc.c b/openbsc/src/libbsc/chan_alloc.c index 8600846..cd25bd9 100644 --- a/openbsc/src/libbsc/chan_alloc.c +++ b/openbsc/src/libbsc/chan_alloc.c @@ -96,14 +96,16 @@ ts = &trx->ts[j]; if (!ts_is_usable(ts)) continue; - /* ip.access dynamic TCH/F + PDCH combination */ - if (ts->pchan == GSM_PCHAN_TCH_F_PDCH && - pchan == GSM_PCHAN_TCH_F) { - /* we can only consider such a dynamic channel - * if the PDCH is currently inactive */ - if (ts->flags & TS_F_PDCH_MODE) - continue; - } else if (ts->pchan != pchan) + /* + * pchan must match; but when looking for TCH/F, allow a match + * with TCH/F_PDCH, to return dynamic TCH/F_PDCH slots to the + * channel allocator. Thus the channel allocator can pick a + * TCH/F_PDCH time slot and disable its PDCH later on (no need + * to check whether PDCH mode is currently active here). + */ + if (!(ts->pchan == pchan + || (ts->pchan == GSM_PCHAN_TCH_F_PDCH + && pchan == GSM_PCHAN_TCH_F))) continue; /* check if all sub-slots are allocated yet */ for (ss = 0; ss < subslots_per_pchan[pchan]; ss++) { -- To view, visit https://gerrit.osmocom.org/180 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iddd575873a2fe819fc182a6b3d4186caea1997e5 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <nhofmeyr(a)sysmocom.de>

1 0

[PATCH] openbsc[master]: dyn PDCH: Fix free slot search for chan_alloc_reverse == true
by Neels Hofmeyr 02 Jun '16

02 Jun '16

Review at https://gerrit.osmocom.org/179 dyn PDCH: Fix free slot search for chan_alloc_reverse == true For chan_alloc_reverse, _lc_find_trx() should return the last free slot instead of the first. Original patch by jolly, but split in two by nhofmeyr. Change-Id: Ie919bfcaabab5286cbbbb1dbda0c140c62289503 --- M openbsc/src/libbsc/chan_alloc.c 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/79/179/1 diff --git a/openbsc/src/libbsc/chan_alloc.c b/openbsc/src/libbsc/chan_alloc.c index de9da81..8600846 100644 --- a/openbsc/src/libbsc/chan_alloc.c +++ b/openbsc/src/libbsc/chan_alloc.c @@ -75,12 +75,24 @@ _lc_find_trx(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan) { struct gsm_bts_trx_ts *ts; - int j, ss; + int j, start, stop, dir, ss; if (!trx_is_usable(trx)) return NULL; - for (j = 0; j < 8; j++) { + if (trx->bts->chan_alloc_reverse) { + /* check TS 7..0 */ + start = 7; + stop = -1; + dir = -1; + } else { + /* check TS 0..7 */ + start = 0; + stop = 8; + dir = 1; + } + + for (j = start; j != stop; j += dir) { ts = &trx->ts[j]; if (!ts_is_usable(ts)) continue; -- To view, visit https://gerrit.osmocom.org/179 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie919bfcaabab5286cbbbb1dbda0c140c62289503 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <nhofmeyr(a)sysmocom.de>

1 0

[PATCH] openbsc[master]: cosmetic: declare local var at top
by Neels Hofmeyr 02 Jun '16

02 Jun '16

Review at https://gerrit.osmocom.org/178 cosmetic: declare local var at top Change-Id: Ie6f3394a18b6157f14469f676fff6849a503b694 --- M openbsc/src/libbsc/bsc_init.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/78/178/1 diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c index 5c27862..1012425 100644 --- a/openbsc/src/libbsc/bsc_init.c +++ b/openbsc/src/libbsc/bsc_init.c @@ -309,6 +309,7 @@ struct input_signal_data *isd = signal_data; struct gsm_bts_trx *trx = isd->trx; int ts_no, lchan_no; + int i; if (subsys != SS_L_INPUT) return -EINVAL; @@ -327,8 +328,6 @@ generate_cell_chan_list(ca, trx->bts); llist_for_each_entry(cur_trx, &trx->bts->trx_list, list) { - int i; - for (i = 0; i < ARRAY_SIZE(cur_trx->ts); i++) generate_ma_for_ts(&cur_trx->ts[i]); } -- To view, visit https://gerrit.osmocom.org/178 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6f3394a18b6157f14469f676fff6849a503b694 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <nhofmeyr(a)sysmocom.de>

1 0

[PATCH] openbsc[master]: debug log: cosmetic fixes
by Neels Hofmeyr 02 Jun '16

02 Jun '16

Review at https://gerrit.osmocom.org/177 debug log: cosmetic fixes Drop erroneous C from a DEBUGPC, should be on a new line. Drop underscores from IPAC_PDCH_[DE]ACT: all other log messages for IPAC PDCH are without underscores -- git grep "P(.*IPAC.PDCH.*ACT" Change-Id: I8fb7a1c1beabb1f4388517383fd0bdc082d557ca --- M openbsc/src/libbsc/abis_rsl.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/77/177/1 diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c index c3a0c5c..abe2f9b 100644 --- a/openbsc/src/libbsc/abis_rsl.c +++ b/openbsc/src/libbsc/abis_rsl.c @@ -1224,7 +1224,7 @@ LOGP(DRSL, LOGL_ERROR, "%s CHANNEL MODE MODIFY NACK\n", ts_name); break; case RSL_MT_IPAC_PDCH_ACT_ACK: - DEBUGPC(DRSL, "%s IPAC PDCH ACT ACK\n", ts_name); + DEBUGP(DRSL, "%s IPAC PDCH ACT ACK\n", ts_name); msg->lchan->ts->flags |= TS_F_PDCH_MODE; break; case RSL_MT_IPAC_PDCH_ACT_NACK: @@ -1951,7 +1951,7 @@ dh->c.msg_discr = ABIS_RSL_MDISC_DED_CHAN; dh->chan_nr = gsm_ts2chan_nr(ts, 0); - DEBUGP(DRSL, "%s IPAC_PDCH_%sACT\n", gsm_ts_name(ts), + DEBUGP(DRSL, "%s IPAC PDCH %sACT\n", gsm_ts_name(ts), act ? "" : "DE"); msg->dst = ts->trx->rsl_link; -- To view, visit https://gerrit.osmocom.org/177 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8fb7a1c1beabb1f4388517383fd0bdc082d557ca Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <nhofmeyr(a)sysmocom.de>

1 0

[PATCH] openbsc[master]: comment tweak for bsc_handover_start()
by Neels Hofmeyr 02 Jun '16

02 Jun '16

Review at https://gerrit.osmocom.org/176 comment tweak for bsc_handover_start() Have a comment only in the .c file to remove dup, tweak wording. Change-Id: If054dad877a1ca750cd72be9c9d90bcf087bf741 --- M openbsc/include/openbsc/handover.h M openbsc/src/libbsc/handover_logic.c 2 files changed, 3 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/76/176/1 diff --git a/openbsc/include/openbsc/handover.h b/openbsc/include/openbsc/handover.h index bd0d8ad..3fe71a2 100644 --- a/openbsc/include/openbsc/handover.h +++ b/openbsc/include/openbsc/handover.h @@ -3,9 +3,6 @@ struct gsm_subscriber_connection; -/* Hand over the specified logical channel to the specified new BTS. - * This is the main entry point for the actual handover algorithm, - * after it has decided it wants to initiate HO to a specific BTS */ int bsc_handover_start(struct gsm_lchan *old_lchan, struct gsm_bts *bts); /* clear any operation for this connection */ diff --git a/openbsc/src/libbsc/handover_logic.c b/openbsc/src/libbsc/handover_logic.c index 2b8c386..641cee4 100644 --- a/openbsc/src/libbsc/handover_logic.c +++ b/openbsc/src/libbsc/handover_logic.c @@ -85,9 +85,9 @@ return NULL; } -/* Hand over the specified logical channel to the specified new BTS. - * This is the main entry point for the actual handover algorithm, - * after it has decided it wants to initiate HO to a specific BTS */ +/* Hand over the specified logical channel to the specified new BTS. This is + * the main entry point for the actual handover algorithm, after the decision + * whether to initiate HO to a specific BTS. */ int bsc_handover_start(struct gsm_lchan *old_lchan, struct gsm_bts *bts) { struct gsm_lchan *new_lchan; -- To view, visit https://gerrit.osmocom.org/176 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If054dad877a1ca750cd72be9c9d90bcf087bf741 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <nhofmeyr(a)sysmocom.de>

1 0

[PATCH] openbsc[master]: Add regexp authorization policy for IMSI
by Max 02 Jun '16

02 Jun '16

Review at https://gerrit.osmocom.org/104 Add regexp authorization policy for IMSI * extend "auth policy" vty command with new option "regexp" * add vty command "authorized-regexp" for setting arbitrary POSIX regular expression * add basic vty test * add optional "regexp" argument to subscriber-create-on-demand vty command With those in place we can now set the regexp against which MS's IMSI will be matched. If IMSI match the regexp than MS is allowed to access the network. If subscriber is already marked as authorized in HLR than it'll be allowed regardless of IMSI matching. The same way we can decide whether to create subscribers on-demand basesd on IMSI regexp match. Similar to authorization this restriction can be overridden by manually creating subscriber via vty, ctrl interface or directly in HLR. Change-Id: I525f4b80676de47d1d422686da2ca012301b0129 Fixes: OS#1647 --- M openbsc/include/openbsc/gsm_data.h M openbsc/src/libbsc/bsc_vty.c M openbsc/src/libbsc/net_init.c M openbsc/src/libcommon/gsm_data.c M openbsc/src/libmsc/gsm_04_08.c M openbsc/src/libmsc/vty_interface_layer3.c M openbsc/tests/vty_test_runner.py 7 files changed, 87 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/04/104/1 diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index a08938c..31a4ed5 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -2,6 +2,8 @@ #define _GSM_DATA_H #include <stdint.h> +#include <regex.h> +#include <sys/types.h> #include <osmocom/core/timer.h> #include <osmocom/core/select.h> @@ -22,6 +24,7 @@ enum gsm_subscr_creation_mode { GSM_SUBSCR_DONT_CREATE = 0, GSM_SUBSCR_CREAT_W_RAND_EXT = 1, + GSM_SUBSCR_CREAT_W_REGEXP = 2, }; enum gsm_security_event { @@ -205,6 +208,7 @@ GSM_AUTH_POLICY_CLOSED, /* only subscribers authorized in DB */ GSM_AUTH_POLICY_ACCEPT_ALL, /* accept everyone, even if not authorized in DB */ GSM_AUTH_POLICY_TOKEN, /* accept first, send token per sms, then revoke authorization */ + GSM_AUTH_POLICY_REGEXP, /* accept IMSIs matching given regexp */ }; #define GSM_T3101_DEFAULT 10 @@ -219,6 +223,8 @@ char *name_long; char *name_short; enum gsm_auth_policy auth_policy; + regex_t authorized_regexp; + char *authorized_reg_str; enum gsm48_reject_value reject_cause; int a5_encryption; int neci; diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c index 46ad457..66c9107 100644 --- a/openbsc/src/libbsc/bsc_vty.c +++ b/openbsc/src/libbsc/bsc_vty.c @@ -190,8 +190,11 @@ net->name_long, VTY_NEWLINE); vty_out(vty, " Short network name: '%s'%s", net->name_short, VTY_NEWLINE); - vty_out(vty, " Authentication policy: %s%s", - gsm_auth_policy_name(net->auth_policy), VTY_NEWLINE); + vty_out(vty, " Authentication policy: %s", + gsm_auth_policy_name(net->auth_policy)); + if (net->authorized_reg_str) + vty_out(vty, ", authorized regexp: %s", net->authorized_reg_str); + vty_out(vty, "%s", VTY_NEWLINE); vty_out(vty, " Location updating reject cause: %u%s", net->reject_cause, VTY_NEWLINE); vty_out(vty, " Encryption: A5/%u%s", net->a5_encryption, @@ -791,6 +794,8 @@ vty_out(vty, " short name %s%s", gsmnet->name_short, VTY_NEWLINE); vty_out(vty, " long name %s%s", gsmnet->name_long, VTY_NEWLINE); vty_out(vty, " auth policy %s%s", gsm_auth_policy_name(gsmnet->auth_policy), VTY_NEWLINE); + if (gsmnet->authorized_reg_str) + vty_out(vty, " authorized-regexp %s%s", gsmnet->authorized_reg_str, VTY_NEWLINE); vty_out(vty, " location updating reject cause %u%s", gsmnet->reject_cause, VTY_NEWLINE); vty_out(vty, " encryption a5 %u%s", gsmnet->a5_encryption, VTY_NEWLINE); @@ -1398,17 +1403,34 @@ DEFUN(cfg_net_auth_policy, cfg_net_auth_policy_cmd, - "auth policy (closed|accept-all|token)", + "auth policy (closed|accept-all|regexp|token)", "Authentication (not cryptographic)\n" "Set the GSM network authentication policy\n" "Require the MS to be activated in HLR\n" "Accept all MS, whether in HLR or not\n" + "Use regular expression for IMSI authorization decision\n" "Use SMS-token based authentication\n") { enum gsm_auth_policy policy = gsm_auth_policy_parse(argv[0]); struct gsm_network *gsmnet = gsmnet_from_vty(vty); gsmnet->auth_policy = policy; + + return CMD_SUCCESS; +} + +DEFUN(cfg_net_authorize_regexp, cfg_net_authorize_regexp_cmd, + "authorized-regexp REGEXP", + "Set regexp for IMSI which will be used for authorization decision\n" + "Regular expression, IMSIs matching it are allowed to use the network\n") +{ + struct gsm_network *gsmnet = gsmnet_from_vty(vty); + if (gsm_parse_reg(gsmnet, &gsmnet->authorized_regexp, + &gsmnet->authorized_reg_str, argc, argv) != 0) { + vty_out(vty, "%%Failed to parse the authorized-regexp: '%s'%s", + argv[0], VTY_NEWLINE); + return CMD_WARNING; + } return CMD_SUCCESS; } @@ -3973,6 +3995,7 @@ install_element(GSMNET_NODE, &cfg_net_name_short_cmd); install_element(GSMNET_NODE, &cfg_net_name_long_cmd); install_element(GSMNET_NODE, &cfg_net_auth_policy_cmd); + install_element(GSMNET_NODE, &cfg_net_authorize_regexp_cmd); install_element(GSMNET_NODE, &cfg_net_reject_cause_cmd); install_element(GSMNET_NODE, &cfg_net_encryption_cmd); install_element(GSMNET_NODE, &cfg_net_neci_cmd); diff --git a/openbsc/src/libbsc/net_init.c b/openbsc/src/libbsc/net_init.c index afcaaf3..caf134a 100644 --- a/openbsc/src/libbsc/net_init.c +++ b/openbsc/src/libbsc/net_init.c @@ -49,7 +49,7 @@ net->subscr_group->net = net; net->subscr_creation_mode = GSM_SUBSCR_CREAT_W_RAND_EXT; - + net->authorized_reg_str = NULL; net->country_code = country_code; net->network_code = network_code; net->num_bts = 0; diff --git a/openbsc/src/libcommon/gsm_data.c b/openbsc/src/libcommon/gsm_data.c index 4e235fd..9d794ee 100644 --- a/openbsc/src/libcommon/gsm_data.c +++ b/openbsc/src/libcommon/gsm_data.c @@ -162,6 +162,7 @@ { GSM_AUTH_POLICY_CLOSED, "closed" }, { GSM_AUTH_POLICY_ACCEPT_ALL, "accept-all" }, { GSM_AUTH_POLICY_TOKEN, "token" }, + { GSM_AUTH_POLICY_REGEXP, "regexp" }, { 0, NULL } }; diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index 74da34b..1f948b2 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -25,9 +25,12 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <stdbool.h> #include <errno.h> #include <time.h> #include <netinet/in.h> +#include <regex.h> +#include <sys/types.h> #include "bscconfig.h" @@ -244,6 +247,17 @@ return -EINVAL; /* not reached */ } +static bool subscr_regexp_check(const struct gsm_network *net, const char *imsi) +{ + if (!net->authorized_reg_str) + return false; + + if (regexec(&net->authorized_regexp, imsi, 0, NULL, 0) != REG_NOMATCH) + return true; + + return false; +} + static int authorize_subscriber(struct gsm_loc_updating_operation *loc, struct gsm_subscriber *subscriber) { @@ -261,6 +275,11 @@ switch (subscriber->group->net->auth_policy) { case GSM_AUTH_POLICY_CLOSED: return subscriber->authorized; + case GSM_AUTH_POLICY_REGEXP: + if (subscriber->authorized) + return 1; + return subscr_regexp_check(subscriber->group->net, + subscriber->imsi); case GSM_AUTH_POLICY_TOKEN: if (subscriber->authorized) return subscriber->authorized; @@ -509,10 +528,14 @@ static struct gsm_subscriber *subscr_create(const struct gsm_network *net, const char *imsi) { - if (net->subscr_creation_mode != GSM_SUBSCR_DONT_CREATE) - return subscr_create_subscriber(net->subscr_group, imsi); + if (net->subscr_creation_mode == GSM_SUBSCR_DONT_CREATE) + return NULL; - return NULL; + if (net->subscr_creation_mode & GSM_SUBSCR_CREAT_W_REGEXP) + if (!subscr_regexp_check(net, imsi)) + return NULL; + + return subscr_create_subscriber(net->subscr_group, imsi); } /* Parse Chapter 9.2.11 Identity Response */ diff --git a/openbsc/src/libmsc/vty_interface_layer3.c b/openbsc/src/libmsc/vty_interface_layer3.c index 5d74e04..3f67b9a 100644 --- a/openbsc/src/libmsc/vty_interface_layer3.c +++ b/openbsc/src/libmsc/vty_interface_layer3.c @@ -1032,11 +1032,15 @@ } DEFUN(cfg_nitb_subscr_create, cfg_nitb_subscr_create_cmd, - "subscriber-create-on-demand", - "Make a new record when a subscriber is first seen.\n") + "subscriber-create-on-demand [regexp]", + "Make a new record when a subscriber is first seen.\n" + "Create subscribers only if IMSI matches the regexp specified in " + "authorized-regexp command\n") { struct gsm_network *gsmnet = gsmnet_from_vty(vty); gsmnet->subscr_creation_mode = GSM_SUBSCR_CREAT_W_RAND_EXT; + if (argc) + gsmnet->subscr_creation_mode |= GSM_SUBSCR_CREAT_W_REGEXP; return CMD_SUCCESS; } @@ -1070,9 +1074,12 @@ static int config_write_nitb(struct vty *vty) { struct gsm_network *gsmnet = gsmnet_from_vty(vty); + enum gsm_subscr_creation_mode scm = gsmnet->subscr_creation_mode; + const char *reg = (scm & GSM_SUBSCR_CREAT_W_REGEXP) ? " regexp" : "", + *pref = scm ? "" : "no "; vty_out(vty, "nitb%s", VTY_NEWLINE); - vty_out(vty, " %ssubscriber-create-on-demand%s", - gsmnet->subscr_creation_mode ? "" : "no ", VTY_NEWLINE); + vty_out(vty, " %ssubscriber-create-on-demand%s%s", + pref, reg, VTY_NEWLINE); vty_out(vty, " %sassign-tmsi%s", gsmnet->avoid_tmsi ? "no " : "", VTY_NEWLINE); return CMD_SUCCESS; diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py index c088855..c264328 100644 --- a/openbsc/tests/vty_test_runner.py +++ b/openbsc/tests/vty_test_runner.py @@ -231,6 +231,22 @@ self.assertEquals(self.vty.node(), 'config-mncc-int') + def testVtyAuthorization(self): + self.vty.enable() + self.vty.command("configure terminal") + self.vty.command("network") + self.assertTrue(self.vty.verify("auth policy closed", [''])) + self.assertTrue(self.vty.verify("auth policy regexp", [''])) + self.assertTrue(self.vty.verify("authorized-regexp ^001", [''])) + self.assertTrue(self.vty.verify("authorized-regexp 02$", [''])) + self.assertTrue(self.vty.verify("authorized-regexp *123.*", [''])) + self.vty.command("end") + self.vty.command("configure terminal") + self.vty.command("nitb") + self.assertTrue(self.vty.verify("subscriber-create-on-demand", [''])) + self.assertTrue(self.vty.verify("subscriber-create-on-demand regexp", [''])) + self.vty.command("end") + def testSi2Q(self): self.vty.enable() self.vty.command("configure terminal") -- To view, visit https://gerrit.osmocom.org/104 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I525f4b80676de47d1d422686da2ca012301b0129 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Max <msuraev(a)sysmocom.de>

3 4

← Newer
1
2
3
4
5
6
7
8
9
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC June 2016