openbsc.git branch neels/dyn_ts updated. 0.15.0-375-gc1bf24d

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, neels/dyn_ts has been updated discards 60939792480566f6ce71a24046584fbf0c56c7ec (commit) discards c0f354f06b7e1750d5017572e895014f05e6ae2f (commit) discards cb8775d7035207d8d8425338cc1b277688d1ba18 (commit) discards 124a0d23fb9fed4f47dd1f8324165ec720baf897 (commit) discards db34d929b19e54092956771fafe8dd356203ede7 (commit) discards 5dbfde5f1548ac1b8fb9c996cf3182c3f59809ba (commit) discards 63829cd6465602bea11d6b22f517e791c9ae8094 (commit) discards bab8227214127a941ea34b84f4dd1788d30037d0 (commit) discards 0195d521cc8fab8eb10413fefe511f6ae8a7a20f (commit) discards 687b2bf35aed09ab955376c568c4881662bd5f95 (commit) discards d8bc15ba7417a5eb2a09d8ae16cc16148e4cc4de (commit) discards 86d2af09b87f629597c6d35e3294022ecc7e2075 (commit) discards ca79bf3380dd23c676b4fdc96dbd488ae2ea939c (commit) discards e64c8b55a8ffd0f0a6ae8e705fe4161758597a84 (commit) discards 394dbbd1874abd1ffa62968bc0c05d6e2e87fb84 (commit) discards a13ed4749ff634ad1da446991e2eed8b5d9fb243 (commit) discards 0cffd6bdbc4a71eb8447ce9a12e0dff8f04abc5c (commit) discards 057fa092e232ff2a00cde2e8bd325a92f787afbf (commit) discards 7e06ceec06625f25749233fe504361fa3e92b2cf (commit) discards 223e664cf1c260431968503065d76afcd8b57d1e (commit) discards 21357d807c78f2a67f6a931b7a65fe8a7f1a566b (commit) discards 784bb2cc9705dd129e23fb05c41c3e3fd64dcb65 (commit) discards 2b252214966af4b0fc38954a2da2dd634839eb57 (commit) discards fc8099dca030cdcdb849e5214eb9ee9cc8b86e6c (commit) discards e370a4922aa422ef19744d5775db3cc7f42efd72 (commit) discards 2014e8131c157ab9a090532f672b37f470737af4 (commit) discards 36ed87e50b0fb5380317c9fb3f91798e3cb79a46 (commit) discards e6daaecd4ff794aa2a6949176ddc811b459958ed (commit) discards d6dfad390e9d59dba8a5e82879e521be9637464a (commit) via c1bf24d63c5adf61ac9e3bf3a0416fcfeb4ec91b (commit) via 1bb5384ae316eedd6cca9a24d150a62411373c65 (commit) via 423ae8929a0af88896a9f4e5d71476efb52dca38 (commit) via 0138925b5e9a96bd95f0a567b2a8f91c0ce4d5ae (commit) via ad10a2008d5e9c4cd633b07b8f5fd76f33c56935 (commit) via 7673accaf6e9316e7a5c8e7423841e3d120b54bb (commit) via befa82dcdf1bb64441559b92bcf34917c9bcabf3 (commit) via bffa9bbc27c6cf53f7124af93b3272a98ad0ea1a (commit) via 4ee5870ae65cda5bea00424727c3e46990331034 (commit) via 75ce5b91ea30f49b49adfe142bf0d75835ab9efc (commit) via b6731109c29955b0967240fbde6216e37d09f0c1 (commit) via 74ab755471365e8ff2144b761cf6e9919a7c6b48 (commit) via d36e6229bc53991a8c5b0e459aebfcfd92e7630f (commit) via ed4511422ead5a8273b3a82649d3f27c83124007 (commit) via f805952fa24f220f569827ee69f0fbc519cc96d0 (commit) via 675fedb900aa7a5c1e16f59afab192e43cc65962 (commit) via b464f4c0df0b300f3b5358f45e7375875dbf44e4 (commit) via 1af8725927b23e0ffe9c2466cbb296ba9a9a6aff (commit) via 6478e8e44b0bed7e9836c74f2ed86df6627b0529 (commit) via 936d912decd6860eecbfc7b9492ff8d30864c261 (commit) via a107abf960fd2840e325c61ebe8a47243c7531b0 (commit) via 1ee76c1aeb37198ebd0b0bad238e7273da47b276 (commit) via 6adc28b494c879baa77a012c67a6114da66a8441 (commit) via a3237c434a2196a7c1eaa8d57645f1c637229a06 (commit) via c01708171c01ef012034993fe8ed444fa4633d34 (commit) via b63c16161e429357128b52597abef01b29555a52 (commit) via 93dffe48964d38b5afe0b98a9a1dce6e3fc0ea70 (commit) via 559b804710b2968ca024882d2c810b27e1f0d56b (commit) via 7908779b9e6c38760a7ce6713a00d62ddc922730 (commit) via 17a6bab150bd70954b00645c8d1f18ce3ccf8948 (commit) via d091b8de21506571f64c248a7635af60cc77633c (commit) via 15fcd10fde06f841c5f3e0ce4c9fded463fad470 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (60939792480566f6ce71a24046584fbf0c56c7ec) \ N -- N -- N (c1bf24d63c5adf61ac9e3bf3a0416fcfeb4ec91b) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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=c1bf24d63c5adf61ac9e3bf3a0416fcf… commit c1bf24d63c5adf61ac9e3bf3a0416fcfeb4ec91b Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 23 16:25:15 2016 +0200 compiler warning: abis_rsl.h: include gsm_utils.h Change-Id: I10f9d64398adabf8fca29663f883ac952470579c http://cgit.osmocom.org/openbsc/commit/?id=1bb5384ae316eedd6cca9a24d150a624… commit 1bb5384ae316eedd6cca9a24d150a62411373c65 Author: Neels Hofmeyr <nhofmeyr(a)sysmocom.de> Date: Tue Jun 14 01:32:46 2016 +0200 debug log: log all lchan_alloc steps Change-Id: Ib2d11744d92dc06205fb1573815e11efd84842b0 http://cgit.osmocom.org/openbsc/commit/?id=423ae8929a0af88896a9f4e5d71476ef… commit 423ae8929a0af88896a9f4e5d71476efb52dca38 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 To avoid two phones picking mismatching TCH pchans, disable TCH/F on dynamic pchans for now. See http://osmocom.org/issues/1778 Related: OS#1778 Change-Id: If7e4797a72815fc6e2bbef27756ea5df69f4bde7 http://cgit.osmocom.org/openbsc/commit/?id=0138925b5e9a96bd95f0a567b2a8f91c… commit 0138925b5e9a96bd95f0a567b2a8f91c0ce4d5ae 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=ad10a2008d5e9c4cd633b07b8f5fd76f… commit ad10a2008d5e9c4cd633b07b8f5fd76f33c56935 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 so we can call it from dyn_ts_init(). Change-Id: I5c0b257ba8ff0e9c9a2268681a84b0681a778368 http://cgit.osmocom.org/openbsc/commit/?id=7673accaf6e9316e7a5c8e7423841e3d… commit 7673accaf6e9316e7a5c8e7423841e3d120b54bb 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. Change-Id: I5c6bce13092a10204113d84678c587c65e35e4fd http://cgit.osmocom.org/openbsc/commit/?id=befa82dcdf1bb64441559b92bcf34917… commit befa82dcdf1bb64441559b92bcf34917c9bcabf3 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=bffa9bbc27c6cf53f7124af93b3272a9… commit bffa9bbc27c6cf53f7124af93b3272a98ad0ea1a Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 23 19:59:31 2016 +0200 dyn TS: 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 check for dyn TS anyway, add public ts_subslots() to lchan_alloc.c, which also checks the current dyn pchan type. Change-Id: I69d8f1ec7a828028bffdf7641ca410a7d5814488 http://cgit.osmocom.org/openbsc/commit/?id=4ee5870ae65cda5bea00424727c3e469… commit 4ee5870ae65cda5bea00424727c3e46990331034 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=75ce5b91ea30f49b49adfe142bf0d758… commit 75ce5b91ea30f49b49adfe142bf0d75835ab9efc 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=b6731109c29955b0967240fbde6216e3… commit b6731109c29955b0967240fbde6216e37d09f0c1 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=74ab755471365e8ff2144b761cf6e991… commit 74ab755471365e8ff2144b761cf6e9919a7c6b48 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=d36e6229bc53991a8c5b0e459aebfcfd… commit d36e6229bc53991a8c5b0e459aebfcfd92e7630f 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 Change-Id: I66d88ad6a4ae7bee1e552960fd4e92aff953125c http://cgit.osmocom.org/openbsc/commit/?id=ed4511422ead5a8273b3a82649d3f27c… commit ed4511422ead5a8273b3a82649d3f27c83124007 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=f805952fa24f220f569827ee69f0fbc5… commit f805952fa24f220f569827ee69f0fbc519cc96d0 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Mon Jul 18 23:54:54 2016 +0200 debug log: rsl_chan_activate_lchan: log activation type Change-Id: I9b6b43b4fad62195af0009ab12632125de39d4fe http://cgit.osmocom.org/openbsc/commit/?id=675fedb900aa7a5c1e16f59afab192e4… commit 675fedb900aa7a5c1e16f59afab192e43cc65962 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=b464f4c0df0b300f3b5358f45e737587… commit b464f4c0df0b300f3b5358f45e7375875dbf44e4 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 16 23:59:32 2016 +0200 gsm_data_shared: add gsm_ts_and_pchan_name() for dyn ts logging Change-Id: I9b6be77c9e5fb9dffa2021a2da72293af15a03a0 http://cgit.osmocom.org/openbsc/commit/?id=1af8725927b23e0ffe9c2466cbb296ba… commit 1af8725927b23e0ffe9c2466cbb296ba9a9a6aff Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 23 16:14:06 2016 +0200 dyn TS: add ts->dyn state Add state fields osmo_bts_trx_ts->dyn.* to record dynamic timeslot state. Initialize in gsm_bts_trx_alloc(). Change-Id: I0a4049df8500b4f7c864f1355c4e9238932d1b8f http://cgit.osmocom.org/openbsc/commit/?id=6478e8e44b0bed7e9836c74f2ed86df6… commit 6478e8e44b0bed7e9836c74f2ed86df6627b0529 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 23 17:57:53 2016 +0200 dyn TS: rsl_lchan_lookup(): add dyn PCHAN and PDCH chan bits Change-Id: If8f7c118f69e5a9f370bfe25f82f3d5a8de75b51 http://cgit.osmocom.org/openbsc/commit/?id=936d912decd6860eecbfc7b9492ff8d3… commit 936d912decd6860eecbfc7b9492ff8d30864c261 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=a107abf960fd2840e325c61ebe8a4724… commit a107abf960fd2840e325c61ebe8a47243c7531b0 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 http://cgit.osmocom.org/openbsc/commit/?id=1ee76c1aeb37198ebd0b0bad238e7273… commit 1ee76c1aeb37198ebd0b0bad238e7273da47b276 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 23 16:47:07 2016 +0200 gsm_ts2chan_nr(): use constants instead of magic numbers Change-Id: I14dceab6ac9f0d4ad852259eae643f567d0982f2 http://cgit.osmocom.org/openbsc/commit/?id=6adc28b494c879baa77a012c67a6114d… commit 6adc28b494c879baa77a012c67a6114da66a8441 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Mon Jul 18 23:47:24 2016 +0200 error log: abis_rsl.c: log errors in channel_mode_from_lchan() Change-Id: Ifa416eab76e6c26dc83e979d815ae778d0d7133b http://cgit.osmocom.org/openbsc/commit/?id=a3237c434a2196a7c1eaa8d57645f1c6… commit a3237c434a2196a7c1eaa8d57645f1c637229a06 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 23 17:38:22 2016 +0200 code dup: join [rsl_]lchan_lookup() from libbsc and osmo-bts lchan_lookup in abis_rsl.c and rsl_lchan_lookup() from osmo-bts rsl.c are the same code, except for the log context, which is only set in abis_rsl.c. Factor out the common code to rsl_lchan_lookup() in gsm_data_shared.c. Openbsc and osmo-bts each define their own DRSL log constant, so add an int *rc return code argument and keep the logging part in abis_rsl.c's thin lchan_lookup() wrapper. Incidentally, this also removes code dup for logging. To avoid duplicate symbols, the rsl_lchan_lookup() implementation needs to be removed from osmo-bts, so older osmo-bts git revisions will not build with this. Change-Id: Ie89bc5bb9110a0e539d37991dedac6f913211b48 http://cgit.osmocom.org/openbsc/commit/?id=c01708171c01ef012034993fe8ed444f… commit c01708171c01ef012034993fe8ed444fa4633d34 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Thu Jul 14 02:51:13 2016 +0200 comments: clarify some dynamic TS comments A new type of dynamic channel will be introduced soon, so prepare some comments to name the dynamic TS kind more specifically. Change-Id: I51fa8c2ebba507299e55a5cb7e67e48a6c8471f7 http://cgit.osmocom.org/openbsc/commit/?id=b63c16161e429357128b52597abef01b… commit b63c16161e429357128b52597abef01b29555a52 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 23 20:01:49 2016 +0200 cosmetic: rsl_rx_rf_chan_rel_ack(): use local ts var for brevity In preparation for an upcoming change. Change-Id: I11bd59492fa8d5b9392d9f2b511c8fa9585afe6c http://cgit.osmocom.org/openbsc/commit/?id=93dffe48964d38b5afe0b98a9a1dce6e… commit 93dffe48964d38b5afe0b98a9a1dce6e3fc0ea70 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Fri Jul 15 01:26:03 2016 +0200 cosmetic: act lchan type: use constant instead of 0x00 Change-Id: Idc8afc4e52e189f474077899eef896381ce238f7 http://cgit.osmocom.org/openbsc/commit/?id=559b804710b2968ca024882d2c810b27… commit 559b804710b2968ca024882d2c810b27e1f0d56b Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Thu Jul 14 16:16:33 2016 +0200 cosmetic: rsl_rx_chan_act_ack(): use local lchan var in 14 instances In preparation for an upcoming change. Change-Id: I9ce71fd7dde42ad7d20f806ac70c150d11450efa http://cgit.osmocom.org/openbsc/commit/?id=7908779b9e6c38760a7ce6713a00d62d… commit 7908779b9e6c38760a7ce6713a00d62ddc922730 Author: Neels Hofmeyr <neels(a)hofmeyr.de> Date: Sat Jul 23 22:23:17 2016 +0200 fix: create_pdp_conf(): unset reject_cause after unknown ran_type f9f4387686584d4575b326ac7414138d8ba0c641 introduced a check for ran_type, which potentially leaves reject_cause unset. Fix that. Change-Id: I0220841ff796f949d00a1415d46b54a3eacc9493 ----------------------------------------------------------------------- Summary of changes: openbsc/src/gprs/gprs_gmm.c | 3 +-- openbsc/src/libmsc/mncc_sock.c | 57 ++++----------------------------------- openbsc/tests/ctrl_test_runner.py | 5 +++- 3 files changed, 10 insertions(+), 55 deletions(-) hooks/post-receive -- The OpenBSC GSM Base Station Controller (+MSC/HLR/SGSN)