openbsc.git branch master updated. 0.15.0-377-g5f0c71b

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The OpenBSC GSM Base Station Controller (+MSC/HLR/SGSN)". The branch, master has been updated via 5f0c71b7d5c38dcd5eecd2836a86cb9b4768a759 (commit) via c5e75f3e6a5d0dd482d4f5d17da80043fb02e181 (commit) via d3b7fa837d2300093a8f4fb3c923a3b012108564 (commit) via b91e6002a6c97cf1c19b14015f4f17a7ad7ace62 (commit) via 7af652c0b27d79322043a23f4aa081c919546a73 (commit) via fdd9ad7c40c8ddb49acfbf6689fcc238285ead3c (commit) via f58852d117c157db28a52f9ce2e058de1822eb98 (commit) via 9518ffc299e3dd3fd5ff854af047e4d88815dd8b (commit) via 4673b86f3df46b76e8830dec006d8472eeaaa980 (commit) via d384110d3d09e06658d5ca2d5c63dc78dd656b91 (commit) via 6e999b75fa3881540e0426f01c9f80b8953ec33c (commit) via cf7933892a995db7c02a3421df90c84556c38776 (commit) via e2eb5cb6a11c484ecfb77c917c11db2820c263ab (commit) via 2e84b60652d3a6c5bf6d4c8bbc77092b6747f3b8 (commit) via ec1b5a0e9e2b6549e0ede48e803095e569997355 (commit) from 350533cc32cf686b6375f92083981e23c2a86082 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cgit.osmocom.org/openbsc/commit/?id=5f0c71b7d5c38dcd5eecd2836a86cb9b… commit 5f0c71b7d5c38dcd5eecd2836a86cb9b4768a759 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 23 20:15:28 2016 +0200 dyn TS: OS#1778 workaround: disable TCH/F on dyn TS for nitb To avoid two phones picking mismatching TCH pchans, never pick TCH/F on dynamic TS in osmo-nitb. Add gsm_network flag dyn_ts_allow_tch_f, set to true by default in gsm_network_init(). Set this flag to false in osmo-nitb's main(). See http://osmocom.org/issues/1778 Reasoning about ways to solve this: * a compile time switch doesn't work because libbsc is first compiled and then linked to both osmo-nitb and osmo-bsc. * we could test net->bsc_api == msc_bsc_api(), but I have the so-called MSC split waiting on branch sysmocom/cscn, which will result in msc_bsc_api() not being linked in the osmo-bsc binary. * have a function am_i_nitb() with different implementations in osmo-nitb and osmo-bsc, but then we'd need to add implementations to all tests and other binaries linking lchan_alloc(). * have a flag in struct bsc_api, but so far there are only function pointers there. Having a "global" flag in gsm_network allows to add a VTY command in case we decide to keep this feature (#1781), has no linking implications and is nicely explicit. Tested that osmo-bsc still picks TCH/F on dyn TS indirectly, since I have no standalone MSC available: when compiling osmo-nitb with the line that sets dyn_ts_allow_tch_f = false commented out, TCH/F is picked as described in OS#1778; and by printf-verifying that dyn_ts_allow_tch_f == true in osmo-bsc main(), only osmo-nitb should have TCH/F disabled. Related: OS#1778, OS#1781 Change-Id: If7e4797a72815fc6e2bbef27756ea5df69f4bde7 http://cgit.osmocom.org/openbsc/commit/?id=c5e75f3e6a5d0dd482d4f5d17da80043… commit c5e75f3e6a5d0dd482d4f5d17da80043fb02e181 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 23 17:17:34 2016 +0200 dyn TS: Rename bsc_dyn_pdch.c to bsc_dyn_ts.c It's no longer just for IPAC style TCH/F_PDCH, but also contains code for TCH/F_TCH/H_PDCH, so pick a more general name. Change-Id: Ic19db81eca03fd72738839ee3686b6b4c8b6b437 http://cgit.osmocom.org/openbsc/commit/?id=d3b7fa837d2300093a8f4fb3c923a3b0… commit d3b7fa837d2300093a8f4fb3c923a3b012108564 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 23 20:08:41 2016 +0200 dyn TS: split dyn_pdch_init() for new dyn type and rename Init both TCH/F_PDCH and TCH/F_TCH/H_PDCH via dyn_ts_init(), which refactors dyn_pdch_init(). Make dyn_ts_switchover_start from abis_rsl.c public in abis_rsl.h, so we can start the initial switchover to PDCH from dyn_ts_init(); in abis_rsl.h include gsm_utils.h for enum gsm_phys_chan_config. Change-Id: I5c0b257ba8ff0e9c9a2268681a84b0681a778368 http://cgit.osmocom.org/openbsc/commit/?id=b91e6002a6c97cf1c19b14015f4f17a7… commit b91e6002a6c97cf1c19b14015f4f17a7ad7ace62 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 23 19:45:15 2016 +0200 dyn TS: implement pchan switchover logic In struct gsm_lchan, add dyn.rqd_ref and dyn.rqd_ta. These save the Channel Requested details across the PDCH deactivation dance. abis_rsl.c: add static functions: * dyn_ts_switchover*() for the various stages of switchover between pchans. * pchan_for_lchant() to derive the desired pchan from the lchan type that was set during lchan_alloc(). * rsl_chan_activate_lchan_as_pdch() to compose the simpler RSL CHAN ACT message without introducing numerous special cases to the normal RSL CHAN ACT code. In rsl_chan_activate_lchan(), detect and initiate required pchan switchovers if requested pchan on a dyn TS differs. In rsl_rx_rf_chan_rel_ack(), initiate or continue pchan switchovers after a channel was released. In rsl_rx_chan_act_ack(), notice that a switchover is complete. In chan_alloc.c, add ts_subslots(): abis_rsl.c will need to know the number of subslots per pchan, to verify that all lchans are free before dyn TS switchover. The subslots_per_pchan[] array is static to lchan_alloc.c, and since we need a non-trivial check for dyn TS anyway, add public ts_subslots() to lchan_alloc.c, which also checks the current dyn pchan type. Change-Id: I5c6bce13092a10204113d84678c587c65e35e4fd http://cgit.osmocom.org/openbsc/commit/?id=7af652c0b27d79322043a23f4aa081c9… commit 7af652c0b27d79322043a23f4aa081c919546a73 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 23 19:51:09 2016 +0200 dyn TS: chan act: set chan_nr according to dyn pchan type Change-Id: Ica5ef2197b3e97d5e895f3e3221295d5d0ef8908 http://cgit.osmocom.org/openbsc/commit/?id=fdd9ad7c40c8ddb49acfbf6689fcc238… commit fdd9ad7c40c8ddb49acfbf6689fcc238285ead3c Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Thu Jul 14 03:01:24 2016 +0200 dyn TS: enhance channel allocator for dynamic TS Change _lc_find_bts() to _lc_dyn_find_bts() with added dyn_as_pchan arg to pass exactly as which pchan we'd like to allocate on a dynamic TS. Add _lc_find_bts() as wrapper so non-dynamic-TS callers remain unchanged. Also add dyn_as_pchan arg to _lc_find_trx() (not renaming to dyn and wrapping because there is only one caller). Implement dynamic allocator logic in _lc_find_trx() and lchan_alloc(). A returned dynamic channel still needs to be switched to the proper mode, which will follow in another commit. Replace a fixme comment with a normal comment in subslots_per_pchan[], because handling of dynamic TS is now defined. Change-Id: I18da7679300c43220d9baa6a304e8df74d366249 http://cgit.osmocom.org/openbsc/commit/?id=f58852d117c157db28a52f9ce2e058de… commit f58852d117c157db28a52f9ce2e058de1822eb98 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 23 17:57:53 2016 +0200 dyn TS: rsl_lchan_lookup(): add dyn PCHAN Accept GSM_PCHAN_TCH_F_TCH_H_PDCH for TCH/F and TCH/H if in matching pchan mode or switching to matching pchan. Accept RSL_CHAN_OSMO_PDCH chan_nr cbits for GSM_PCHAN_TCH_F_TCH_H_PDCH pchan. Change-Id: If8f7c118f69e5a9f370bfe25f82f3d5a8de75b51 http://cgit.osmocom.org/openbsc/commit/?id=9518ffc299e3dd3fd5ff854af047e4d8… commit 9518ffc299e3dd3fd5ff854af047e4d88815dd8b Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Thu Jul 14 03:09:56 2016 +0200 dyn TS: verify_chan_comb(): handle new dyn TS NM_CHANC_* Change-Id: I7ce754a48c7f492e921a4450745383bb8dd7225c http://cgit.osmocom.org/openbsc/commit/?id=4673b86f3df46b76e8830dec006d8472… commit 4673b86f3df46b76e8830dec006d8472eeaaa980 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 23 20:18:40 2016 +0200 dyn TS: rsl *2chan_nr(): handle TCH/F_TCH/H_PDCH In gsm_lchan2chan_nr() use the current pchan type. In gsm_lchan_as_pchan2chan_nr(), add the special case of non-standard cbits for activating PDCH on a TCH/F_TCH/H_PDCH dyn TS. This way, gsm_pchan2chan_nr() conforms to the standard and does not need access to a ts struct. Change-Id: If248b9073b9f397110a2003d8e1a04afdc1c0e20 http://cgit.osmocom.org/openbsc/commit/?id=d384110d3d09e06658d5ca2d5c63dc78… commit d384110d3d09e06658d5ca2d5c63dc78dd656b91 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Mon Jul 18 23:43:44 2016 +0200 dyn TS: gsm_lchan2chan_nr(): decouple from ts->pchan For upcoming dynamic TS, the pchan choice for RSL De-/Activation is not trivial. So in order to pass the desired pchan to generate the RSL chan_nr, introduce gsm_lchan_as_pchan2chan_nr(). To avoid code dup, this requires decoupling the gsm_ts2chan_nr() pchan from the actual ts struct, so refactor gsm_ts2chan_nr() to gsm_pchan2chan_nr() with explicit pchan, ts_nr and lchan_nr arguments. Change-Id: I1a40e8452fe8120d350a27973e56be0b8c8c517f http://cgit.osmocom.org/openbsc/commit/?id=6e999b75fa3881540e0426f01c9f80b8… commit 6e999b75fa3881540e0426f01c9f80b8953ec33c Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 23 21:00:51 2016 +0200 dyn TS: rename lchan->dyn_pdch to lchan->dyn This will also be used by the new dynamic TS type, so make the name more general. Change-Id: I2451b10519dff3e5cdf503b430574c0984d19000 http://cgit.osmocom.org/openbsc/commit/?id=cf7933892a995db7c02a3421df90c845… commit cf7933892a995db7c02a3421df90c84556c38776 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 23 19:49:58 2016 +0200 prepare dyn TS: act lchan: fetch the channel mode a bit later Dyn TS will add a new type of chan activation, which does not need a Channel Mode IE. Incidentally, the dyn PDCH also doesn't need this IE if it opts for sending a PDCH ACT instead. So it makes sense to compose the Channel Mode IE only after the dynamic decisions are done. Change-Id: I66d88ad6a4ae7bee1e552960fd4e92aff953125c http://cgit.osmocom.org/openbsc/commit/?id=e2eb5cb6a11c484ecfb77c917c11db28… commit e2eb5cb6a11c484ecfb77c917c11db2820c263ab Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Mon Jul 18 23:56:08 2016 +0200 error log: rsl_chan_activate_lchan: log channel mode error Change-Id: I0f403b13ff9897770c0b855bf57a9440717b46e8 http://cgit.osmocom.org/openbsc/commit/?id=2e84b60652d3a6c5bf6d4c8bbc77092b… commit 2e84b60652d3a6c5bf6d4c8bbc77092b6747f3b8 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 23 20:06:27 2016 +0200 cosmetic: dyn_pdch_init(): debug log: use new gsm_ts_and_pchan_name() Change-Id: I396c2696bdbedb41a1f1fe2183f8eada57dc3413 http://cgit.osmocom.org/openbsc/commit/?id=ec1b5a0e9e2b6549e0ede48e803095e5… commit ec1b5a0e9e2b6549e0ede48e803095e569997355 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 23 16:54:16 2016 +0200 gsm_ts2chan_nr(): add assertions for lchan_nr Change-Id: Ibfdef347c85d4a145645a7325cd193ea1b475a54 ----------------------------------------------------------------------- Summary of changes: openbsc/include/openbsc/abis_rsl.h | 5 +- openbsc/include/openbsc/chan_alloc.h | 2 + openbsc/include/openbsc/gsm_data.h | 4 + openbsc/include/openbsc/gsm_data_shared.h | 9 +- openbsc/src/libbsc/Makefile.am | 2 +- openbsc/src/libbsc/abis_nm.c | 3 + openbsc/src/libbsc/abis_rsl.c | 367 ++++++++++++++++++++- .../src/libbsc/{bsc_dyn_pdch.c => bsc_dyn_ts.c} | 50 ++- openbsc/src/libbsc/bts_ipaccess_nanobts.c | 2 +- openbsc/src/libbsc/chan_alloc.c | 137 +++++++- openbsc/src/libbsc/net_init.c | 2 + openbsc/src/libcommon/gsm_data_shared.c | 50 ++- openbsc/src/osmo-nitb/bsc_hack.c | 13 + 13 files changed, 604 insertions(+), 42 deletions(-) rename openbsc/src/libbsc/{bsc_dyn_pdch.c => bsc_dyn_ts.c} (58%) hooks/post-receive -- The OpenBSC GSM Base Station Controller (+MSC/HLR/SGSN)