openbsc.git branch neels/dyn_ts updated. 0.15.0-376-gb6ac607

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 c1bf24d63c5adf61ac9e3bf3a0416fcfeb4ec91b (commit) discards 1bb5384ae316eedd6cca9a24d150a62411373c65 (commit) discards 423ae8929a0af88896a9f4e5d71476efb52dca38 (commit) discards 0138925b5e9a96bd95f0a567b2a8f91c0ce4d5ae (commit) discards ad10a2008d5e9c4cd633b07b8f5fd76f33c56935 (commit) discards 7673accaf6e9316e7a5c8e7423841e3d120b54bb (commit) discards befa82dcdf1bb64441559b92bcf34917c9bcabf3 (commit) discards bffa9bbc27c6cf53f7124af93b3272a98ad0ea1a (commit) discards 4ee5870ae65cda5bea00424727c3e46990331034 (commit) discards 75ce5b91ea30f49b49adfe142bf0d75835ab9efc (commit) discards b6731109c29955b0967240fbde6216e37d09f0c1 (commit) discards 74ab755471365e8ff2144b761cf6e9919a7c6b48 (commit) discards d36e6229bc53991a8c5b0e459aebfcfd92e7630f (commit) discards ed4511422ead5a8273b3a82649d3f27c83124007 (commit) discards f805952fa24f220f569827ee69f0fbc519cc96d0 (commit) discards 675fedb900aa7a5c1e16f59afab192e43cc65962 (commit) discards b464f4c0df0b300f3b5358f45e7375875dbf44e4 (commit) discards 1af8725927b23e0ffe9c2466cbb296ba9a9a6aff (commit) discards 6478e8e44b0bed7e9836c74f2ed86df6627b0529 (commit) discards 936d912decd6860eecbfc7b9492ff8d30864c261 (commit) discards a107abf960fd2840e325c61ebe8a47243c7531b0 (commit) discards 1ee76c1aeb37198ebd0b0bad238e7273da47b276 (commit) discards 6adc28b494c879baa77a012c67a6114da66a8441 (commit) discards a3237c434a2196a7c1eaa8d57645f1c637229a06 (commit) discards c01708171c01ef012034993fe8ed444fa4633d34 (commit) discards b63c16161e429357128b52597abef01b29555a52 (commit) discards 93dffe48964d38b5afe0b98a9a1dce6e3fc0ea70 (commit) discards 559b804710b2968ca024882d2c810b27e1f0d56b (commit) discards 7908779b9e6c38760a7ce6713a00d62ddc922730 (commit) via b6ac607ca4c27654d7296f51c5ce91667a27b7c7 (commit) via 8e080d462efd753127d70712843d1e5c49fb9efc (commit) via b865d8a3a35a7ef0527a7046f68c44bd873a4eda (commit) via 00db96f4a09ae6134717f2342a2ec392598b2edb (commit) via aef5d5f08216483679e3de5db7f205badbce36ee (commit) via 1fe767799be1b12b8419cff47cdee057bf1a42e1 (commit) via 57b9f4f00294ce075a468d6806bdf6b32f6334eb (commit) via 5ce7702afbcbdee1a41b68c6ba7224d8d2561239 (commit) via 69e11d9ac8056b97b05c7f32e3eb10676d71d00a (commit) via 80b01c9169b37f937ce4acbec8817a379082da14 (commit) via b33329c9d73274c9093b767ac91bd10c9b108b6c (commit) via 6de65e14d22f9743b4d6f5a1a002b56d58a7912e (commit) via e371115d07a9569d8ddbacdd6405cd9fda9b5f56 (commit) via be926a72e42eeade042b5dd6e62e415621e07958 (commit) via 4c80eab89a942fdb5cba986925a36947a32f0a47 (commit) via b0a42ae7dee38accd653e8b7f32459fca65830fd (commit) via 0eb5adb533096a7c3f73bbe53354c4b7ad24b5f3 (commit) via 97f9f61cdb983ca0757a3325093bb09152abf7d6 (commit) via c61461c7eb752744821670004c1b7d9777682742 (commit) via f3173fc87ea4a040c4e558cf1db03b744594fafe (commit) via 571fda8c71fbcbabea3d03c8d86a622a931b31dc (commit) via d6c9820e0c07f8eaf08edcbca7c472949611fd63 (commit) via dab44b8dddb8411ba984864beebd57159be091f7 (commit) via 8e8b0ad5da7d8e0245bcd5d1b74ce884009a1483 (commit) via e710b68cbe610489710fb2165330faafe51437fb (commit) via 4dcc5516d1252e749b118b4014228d31de2dc278 (commit) via 4ea60c44e250b42501d783eac9448f83ee41ebb4 (commit) via b20b4891e2c2ae8f31a4498a167482e44132e83e (commit) via 14314bd808369f0da32860412acfcd775e5c7b24 (commit) via b1c227e5abbe023615c591ccaf865a3dcb9c742e (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 (c1bf24d63c5adf61ac9e3bf3a0416fcfeb4ec91b) \ N -- N -- N (b6ac607ca4c27654d7296f51c5ce91667a27b7c7) 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=b6ac607ca4c27654d7296f51c5ce9166… commit b6ac607ca4c27654d7296f51c5ce91667a27b7c7 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=8e080d462efd753127d70712843d1e5c… commit 8e080d462efd753127d70712843d1e5c49fb9efc 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=b865d8a3a35a7ef0527a7046f68c44bd… commit b865d8a3a35a7ef0527a7046f68c44bd873a4eda 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=00db96f4a09ae6134717f2342a2ec392… commit 00db96f4a09ae6134717f2342a2ec392598b2edb 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=aef5d5f08216483679e3de5db7f205ba… commit aef5d5f08216483679e3de5db7f205badbce36ee 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=1fe767799be1b12b8419cff47cdee057… commit 1fe767799be1b12b8419cff47cdee057bf1a42e1 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=57b9f4f00294ce075a468d6806bdf6b3… commit 57b9f4f00294ce075a468d6806bdf6b32f6334eb 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=5ce7702afbcbdee1a41b68c6ba7224d8… commit 5ce7702afbcbdee1a41b68c6ba7224d8d2561239 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=69e11d9ac8056b97b05c7f32e3eb1067… commit 69e11d9ac8056b97b05c7f32e3eb10676d71d00a 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=80b01c9169b37f937ce4acbec8817a37… commit 80b01c9169b37f937ce4acbec8817a379082da14 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=b33329c9d73274c9093b767ac91bd10c… commit b33329c9d73274c9093b767ac91bd10c9b108b6c 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=6de65e14d22f9743b4d6f5a1a002b56d… commit 6de65e14d22f9743b4d6f5a1a002b56d58a7912e 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=e371115d07a9569d8ddbacdd6405cd9f… commit e371115d07a9569d8ddbacdd6405cd9fda9b5f56 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=be926a72e42eeade042b5dd6e62e4156… commit be926a72e42eeade042b5dd6e62e415621e07958 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=4c80eab89a942fdb5cba986925a36947… commit 4c80eab89a942fdb5cba986925a36947a32f0a47 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=b0a42ae7dee38accd653e8b7f32459fc… commit b0a42ae7dee38accd653e8b7f32459fca65830fd 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=0eb5adb533096a7c3f73bbe53354c4b7… commit 0eb5adb533096a7c3f73bbe53354c4b7ad24b5f3 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=97f9f61cdb983ca0757a3325093bb091… commit 97f9f61cdb983ca0757a3325093bb09152abf7d6 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=c61461c7eb752744821670004c1b7d97… commit c61461c7eb752744821670004c1b7d9777682742 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=f3173fc87ea4a040c4e558cf1db03b74… commit f3173fc87ea4a040c4e558cf1db03b744594fafe 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=571fda8c71fbcbabea3d03c8d86a622a… commit 571fda8c71fbcbabea3d03c8d86a622a931b31dc 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=d6c9820e0c07f8eaf08edcbca7c47294… commit d6c9820e0c07f8eaf08edcbca7c472949611fd63 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=dab44b8dddb8411ba984864beebd5715… commit dab44b8dddb8411ba984864beebd57159be091f7 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=8e8b0ad5da7d8e0245bcd5d1b74ce884… commit 8e8b0ad5da7d8e0245bcd5d1b74ce884009a1483 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=e710b68cbe610489710fb2165330faaf… commit e710b68cbe610489710fb2165330faafe51437fb 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=4dcc5516d1252e749b118b4014228d31… commit 4dcc5516d1252e749b118b4014228d31de2dc278 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=4ea60c44e250b42501d783eac9448f83… commit 4ea60c44e250b42501d783eac9448f83ee41ebb4 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=b20b4891e2c2ae8f31a4498a167482e4… commit b20b4891e2c2ae8f31a4498a167482e44132e83e 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/include/openbsc/abis_rsl.h | 1 - openbsc/include/openbsc/gprs_sgsn.h | 2 ++ openbsc/include/openbsc/sgsn.h | 26 ++++++++++++++++++++++++++ openbsc/src/gprs/gprs_gmm.c | 19 +++++++++++++++++-- openbsc/src/gprs/gprs_sgsn.c | 34 ++++++++++++++++++++++++++++++++++ openbsc/src/gprs/sgsn_main.c | 1 + openbsc/src/utils/bs11_config.c | 3 ++- openbsc/tests/sgsn/sgsn_test.c | 3 ++- 8 files changed, 84 insertions(+), 5 deletions(-) hooks/post-receive -- The OpenBSC GSM Base Station Controller (+MSC/HLR/SGSN)