Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64

Package network:osmocom:nightly/osmo-trx failed to build in 
Debian_Testing/x86_64

Check out the package for editing:
  osc checkout network:osmocom:nightly osmo-trx

Last lines of build log:
[  404s] ar: `u' modifier ignored since `D' is the default (see `U')
[  404s] libtool: link: ranlib .libs/libtransceiver_common.a
[  405s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln 
-s "../libtransceiver_common.la" "libtransceiver_common.la" )
[  405s] /bin/bash ../libtool  --tag=CXX   --mode=link g++ -lpthread 
-I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 
-fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat 
-Werror=format-security  -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd 
osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la 
../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la 
../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl 
-losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd 
[  405s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g 
-O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong 
-Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o 
osmo-trx-uhd osmo_trx_uhd-osmo-trx.o  ./device/uhd/.libs/libdevice.a 
./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a 
../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f 
/usr/lib/x86_64-linux-gnu/libosmoctrl.so 
/usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc 
/usr/lib/x86_64-linux-gnu/libosmovty.so 
/usr/lib/x86_64-linux-gnu/libosmocore.so -luhd
[  405s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined 
reference to symbol '_ZN5boost6system16generic_categoryEv'
[  405s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: 
error adding symbols: DSO missing from command line
[  405s] collect2: error: ld returned 1 exit status
[  405s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1
[  405s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M'
[  405s] make[3]: *** [Makefile:820: all-recursive] Error 1
[  405s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M'
[  405s] make[2]: *** [Makefile:513: all-recursive] Error 1
[  405s] make[2]: Leaving directory '/usr/src/packages/BUILD'
[  405s] make[1]: *** [Makefile:444: all] Error 2
[  405s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  405s] dh_auto_build: make -j1 returned exit code 2
[  405s] make: *** [debian/rules:6: build] Error 255
[  405s] dpkg-buildpackage: error: debian/rules build subprocess returned exit 
status 2
[  405s] 
[  405s] lamb51 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Tue Sep  3 
03:48:06 UTC 2019.
[  405s] 
[  405s] ### VM INTERACTION START ###
[  408s] [  388.605896] sysrq: SysRq : Power Off
[  408s] [  388.611511] reboot: Power down
[  408s] ### VM INTERACTION END ###
[  408s] 
[  408s] lamb51 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Tue Sep  3 
03:48:09 UTC 2019.
[  408s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:latest/osmo-trx in Debian_Testing/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Testing/x86_64

Package network:osmocom:latest/osmo-trx failed to build in Debian_Testing/x86_64

Check out the package for editing:
  osc checkout network:osmocom:latest osmo-trx

Last lines of build log:
[  413s] ar: `u' modifier ignored since `D' is the default (see `U')
[  413s] libtool: link: ranlib .libs/libtransceiver_common.a
[  413s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln 
-s "../libtransceiver_common.la" "libtransceiver_common.la" )
[  413s] /bin/bash ../libtool  --tag=CXX   --mode=link g++ -lpthread 
-I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 
-fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat 
-Werror=format-security  -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd 
osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la 
../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la 
../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl 
-losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd 
[  413s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g 
-O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong 
-Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o 
osmo-trx-uhd osmo_trx_uhd-osmo-trx.o  ./device/uhd/.libs/libdevice.a 
./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a 
../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f 
/usr/lib/x86_64-linux-gnu/libosmoctrl.so 
/usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc 
/usr/lib/x86_64-linux-gnu/libosmovty.so 
/usr/lib/x86_64-linux-gnu/libosmocore.so -luhd
[  413s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined 
reference to symbol '_ZN5boost6system16generic_categoryEv'
[  413s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: 
error adding symbols: DSO missing from command line
[  413s] collect2: error: ld returned 1 exit status
[  413s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1
[  413s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M'
[  413s] make[3]: *** [Makefile:820: all-recursive] Error 1
[  413s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M'
[  413s] make[2]: *** [Makefile:513: all-recursive] Error 1
[  413s] make[2]: Leaving directory '/usr/src/packages/BUILD'
[  413s] make[1]: *** [Makefile:444: all] Error 2
[  413s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  413s] dh_auto_build: make -j1 returned exit code 2
[  413s] make: *** [debian/rules:6: build] Error 255
[  413s] dpkg-buildpackage: error: debian/rules build subprocess returned exit 
status 2
[  413s] 
[  413s] lamb57 failed "build osmo-trx_1.1.1.dsc" at Tue Sep  3 03:30:37 UTC 
2019.
[  413s] 
[  413s] ### VM INTERACTION START ###
[  416s] [  397.438387] sysrq: SysRq : Power Off
[  416s] [  397.446941] reboot: Power down
[  416s] ### VM INTERACTION END ###
[  417s] 
[  417s] lamb57 failed "build osmo-trx_1.1.1.dsc" at Tue Sep  3 03:30:42 UTC 
2019.
[  417s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64

Package network:osmocom:nightly/osmo-trx failed to build in 
Debian_Unstable/x86_64

Check out the package for editing:
  osc checkout network:osmocom:nightly osmo-trx

Last lines of build log:
[  486s] ar: `u' modifier ignored since `D' is the default (see `U')
[  486s] libtool: link: ranlib .libs/libtransceiver_common.a
[  486s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln 
-s "../libtransceiver_common.la" "libtransceiver_common.la" )
[  486s] /bin/bash ../libtool  --tag=CXX   --mode=link g++ -lpthread 
-I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 
-fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat 
-Werror=format-security  -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd 
osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la 
../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la 
../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl 
-losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd 
[  487s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g 
-O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong 
-Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o 
osmo-trx-uhd osmo_trx_uhd-osmo-trx.o  ./device/uhd/.libs/libdevice.a 
./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a 
../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f 
/usr/lib/x86_64-linux-gnu/libosmoctrl.so 
/usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc 
/usr/lib/x86_64-linux-gnu/libosmovty.so 
/usr/lib/x86_64-linux-gnu/libosmocore.so -luhd
[  487s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined 
reference to symbol '_ZN5boost6system16generic_categoryEv'
[  487s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: 
error adding symbols: DSO missing from command line
[  487s] collect2: error: ld returned 1 exit status
[  487s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1
[  487s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M'
[  487s] make[3]: *** [Makefile:820: all-recursive] Error 1
[  487s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M'
[  487s] make[2]: *** [Makefile:513: all-recursive] Error 1
[  487s] make[2]: Leaving directory '/usr/src/packages/BUILD'
[  487s] make[1]: *** [Makefile:444: all] Error 2
[  487s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  487s] dh_auto_build: make -j1 returned exit code 2
[  487s] make: *** [debian/rules:6: build] Error 255
[  487s] dpkg-buildpackage: error: debian/rules build subprocess returned exit 
status 2
[  487s] 
[  487s] lamb22 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Tue Sep  3 
01:46:37 UTC 2019.
[  487s] 
[  487s] ### VM INTERACTION START ###
[  490s] [  470.061093] sysrq: SysRq : Power Off
[  490s] [  470.070050] reboot: Power down
[  490s] ### VM INTERACTION END ###
[  490s] 
[  490s] lamb22 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Tue Sep  3 
01:46:40 UTC 2019.
[  490s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64

Package network:osmocom:nightly/osmo-trx failed to build in 
Debian_Testing/x86_64

Check out the package for editing:
  osc checkout network:osmocom:nightly osmo-trx

Last lines of build log:
[  511s] ar: `u' modifier ignored since `D' is the default (see `U')
[  511s] libtool: link: ranlib .libs/libtransceiver_common.a
[  511s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln 
-s "../libtransceiver_common.la" "libtransceiver_common.la" )
[  511s] /bin/bash ../libtool  --tag=CXX   --mode=link g++ -lpthread 
-I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 
-fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat 
-Werror=format-security  -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd 
osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la 
../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la 
../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl 
-losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd 
[  511s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g 
-O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong 
-Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o 
osmo-trx-uhd osmo_trx_uhd-osmo-trx.o  ./device/uhd/.libs/libdevice.a 
./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a 
../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f 
/usr/lib/x86_64-linux-gnu/libosmoctrl.so 
/usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc 
/usr/lib/x86_64-linux-gnu/libosmovty.so 
/usr/lib/x86_64-linux-gnu/libosmocore.so -luhd
[  512s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined 
reference to symbol '_ZN5boost6system16generic_categoryEv'
[  512s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: 
error adding symbols: DSO missing from command line
[  512s] collect2: error: ld returned 1 exit status
[  512s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1
[  512s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M'
[  512s] make[3]: *** [Makefile:820: all-recursive] Error 1
[  512s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M'
[  512s] make[2]: *** [Makefile:513: all-recursive] Error 1
[  512s] make[2]: Leaving directory '/usr/src/packages/BUILD'
[  512s] make[1]: *** [Makefile:444: all] Error 2
[  512s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  512s] dh_auto_build: make -j1 returned exit code 2
[  512s] make: *** [debian/rules:6: build] Error 255
[  512s] dpkg-buildpackage: error: debian/rules build subprocess returned exit 
status 2
[  512s] 
[  512s] morla3 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Tue Sep  3 
01:47:07 UTC 2019.
[  512s] 
[  512s] ### VM INTERACTION START ###
[  515s] [  491.121837] sysrq: SysRq : Power Off
[  515s] [  491.167921] reboot: Power down
[  515s] ### VM INTERACTION END ###
[  515s] 
[  515s] morla3 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Tue Sep  3 
01:47:11 UTC 2019.
[  515s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Change in ...osmo-msc[master]: msc_a fsm: ignore state chg to same state

[neels]

neels has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-msc/+/15389


Change subject: msc_a fsm: ignore state chg to same state
..

msc_a fsm: ignore state chg to same state

We sometimes see errors like

   libmsc/msc_a.c:361 msc_a(...){MSC_A_ST_RELEASING}: transition to state 
MSC_A_ST_RELEASING not permitted!

i.e. changing state to the state msc_a is already in.

Ignore re-entering the same state for most state changes. However, there is one
state change in msc_a where re-entering the MSC_A_ST_VALIDATE_L3 is necessary
to start the timeout.

Hence add msc_a_state_chg_always() and use that for re-entering
MSC_A_ST_VALIDATE_L3. Change msc_a_state_chg() to skip no-op state changes.

This should silence all no-op state change error messages for msc_a.

Related: OS#4169
Change-Id: I0c74c10b5fa7bbdd6ae3674926cc0393edf15a35
---
M src/libmsc/msc_a.c
M tests/msc_vlr/msc_vlr_test_gsm_authen.err
M tests/msc_vlr/msc_vlr_test_hlr_reject.err
M tests/msc_vlr/msc_vlr_test_hlr_timeout.err
M tests/msc_vlr/msc_vlr_test_ms_timeout.err
5 files changed, 8 insertions(+), 13 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/89/15389/1

diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c
index a082cb8..b414574 100644
--- a/src/libmsc/msc_a.c
+++ b/src/libmsc/msc_a.c
@@ -63,9 +63,15 @@
 /* Transition to a state, using the T timer defined in msc_a_fsm_timeouts.
  * The actual timeout value is in turn obtained from network->T_defs.
  * Assumes local variable fi exists. */
-#define msc_a_state_chg(msc_a, state) \
+#define msc_a_state_chg_always(msc_a, state) \
osmo_tdef_fsm_inst_state_chg((msc_a)->c.fi, state, msc_a_fsm_timeouts, 
(msc_a)->c.ran->tdefs, 5)

+/* Same as msc_a_state_chg_always() but ignore if the msc_a already is in the 
target state. */
+#define msc_a_state_chg(msc_a, STATE) do { \
+   if ((msc_a)->c.fi->state != STATE) \
+   msc_a_state_chg_always(msc_a, STATE); \
+   } while(0)
+
 struct gsm_network *msc_a_net(const struct msc_a *msc_a)
 {
return msub_net(msc_a->c.msub);
@@ -1036,7 +1042,7 @@
};
osmo_use_count_make_static_entries(&msc_a->use_count, 
msc_a->use_count_buf, ARRAY_SIZE(msc_a->use_count_buf));
/* Start timeout for first state */
-   msc_a_state_chg(msc_a, MSC_A_ST_VALIDATE_L3);
+   msc_a_state_chg_always(msc_a, MSC_A_ST_VALIDATE_L3);
return msc_a;
 }

diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err 
b/tests/msc_vlr/msc_vlr_test_gsm_authen.err
index c9be4ef..4905881 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err
@@ -1926,7 +1926,6 @@
 DMSC msc_a(IMSI-90170004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_RELEASING}: 
RAN encode: CLEAR_COMMAND on GERAN-A
 DMSC dummy_msc_i(IMSI-90170004620:MSISDN-46071:GERAN-A:LU){0}: Received 
Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST
 DREF VLR subscr IMSI-90170004620:MSISDN-46071 - 
msc_a_fsm_releasing_onenter: now used by 2 (active-conn,vlr_gsup_rx)
-DMSC msc_a(IMSI-90170004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_RELEASING}: 
transition to state MSC_A_ST_RELEASING not permitted!
 DREF VLR subscr IMSI-90170004620:MSISDN-46071 - vlr_gsup_rx: now used by 1 
(active-conn)
 <-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: vlr_gsupc_read_cb() returns 0
 msc_a_is_accepted() == false
@@ -2192,7 +2191,6 @@
 DMSC msc_a(IMSI-90170004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_RELEASING}: 
RAN encode: CLEAR_COMMAND on GERAN-A
 DMSC dummy_msc_i(IMSI-90170004620:MSISDN-46071:GERAN-A:LU){0}: Received 
Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST
 DREF VLR subscr IMSI-90170004620:MSISDN-46071 - 
msc_a_fsm_releasing_onenter: now used by 2 (active-conn,vlr_gsup_rx)
-DMSC msc_a(IMSI-90170004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_RELEASING}: 
transition to state MSC_A_ST_RELEASING not permitted!
 DREF VLR subscr IMSI-90170004620:MSISDN-46071 - vlr_gsup_rx: now used by 1 
(active-conn)
 <-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_ERROR: vlr_gsupc_read_cb() returns 0
 msc_a_is_accepted() == false
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err 
b/tests/msc_vlr/msc_vlr_test_hlr_reject.err
index 9d0737a..e4ea226 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err
+++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err
@@ -65,7 +65,6 @@
 DMSC msc_a(IMSI-90170004620:GERAN-A:LU){MSC_A_ST_RELEASING}: RAN encode: 
CLEAR_COMMAND on GERAN-A
 DMSC dummy_msc_i(IMSI-90170004620:GERAN-A:LU){0}: Received Event 
MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST
 DREF VLR subscr IMSI-90170004620 - msc_a_fsm_releasing_onenter: now used 
by 2 (active-conn,vlr_gsup_rx)
-DMSC msc_a(IMSI-90170004620:GERAN-A:LU){MSC_A_ST_RELEASING}: transition to 
state MSC_A_ST_RELEASING not permitted!
 DVLR 
VLR_Authenticate(IMSI-90170004620:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: 
Deallocated
 DRE

Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting.

[neels]

neels has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-msc/+/15120 )

Change subject: Implement a global switch on the network to disable call 
waiting.
..


Patch Set 12:

keith, since you have numerous +1 here, you are allowed to add those up by 
giving a +2 yourself and merging.

It is described here: 
https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit#Voting-Rules-for-merging-a-patch-to-master


--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae
Gerrit-Change-Number: 15120
Gerrit-PatchSet: 12
Gerrit-Owner: keith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: keith 
Gerrit-Reviewer: neels 
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Comment-Date: Mon, 02 Sep 2019 23:53:40 +
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

Change in ...osmo-msc[master]: vlr: don't log about "gratuitous ID RESPONSE"

[neels]

neels has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-msc/+/15388


Change subject: vlr: don't log about "gratuitous ID RESPONSE"
..

vlr: don't log about "gratuitous ID RESPONSE"

If an ID Response comes in during a non-LU L3 Complete (Paging or CM Service
Request), no event needs to be dispatched. So far vlr_subscr_rx_id_resp()
logged a NOTICE "gratuitous ID RESPONSE?!?" if no lu_fsm is present.

An ID Response can come in particularly as payload with a BSSMAP Cipher Mode
Complete message, even though osmo-msc didn't explicitly ask for it.

It is not an error to get a Cipher Mode Complete containing an ID Response
during Paging or CM Service Request, so remove the confusing log message.

Related: OS#4168 (only loosely related)
Change-Id: I8a5b8735eb41cd0976c7ab32cdd55440d3ef70ac
---
M src/libvlr/vlr.c
1 file changed, 0 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/88/15388/1

diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c
index de61ba5..ea160b1 100644
--- a/src/libvlr/vlr.c
+++ b/src/libvlr/vlr.c
@@ -1182,8 +1182,6 @@
break;
}
osmo_fsm_inst_dispatch(vsub->lu_fsm, event, mi_string);
-   } else {
-   LOGVSUBP(LOGL_NOTICE,  vsub, "gratuitous ID RESPONSE?!?\n");
}

return 0;

--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15388
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I8a5b8735eb41cd0976c7ab32cdd55440d3ef70ac
Gerrit-Change-Number: 15388
Gerrit-PatchSet: 1
Gerrit-Owner: neels 
Gerrit-MessageType: newchange

Change in ...osmo-msc[master]: ran_dec logging: log message sizes on errors

[neels]

Hello pespin, fixeria, laforge, Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/osmo-msc/+/15342

to look at the new patch set (#5).

Change subject: ran_dec logging: log message sizes on errors
..

ran_dec logging: log message sizes on errors

Change-Id: Id08e4ee5a4dbf552dbb107d8f0519110664f6acb
---
M src/libmsc/ran_msg_a.c
1 file changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/42/15342/5
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15342
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Id08e4ee5a4dbf552dbb107d8f0519110664f6acb
Gerrit-Change-Number: 15342
Gerrit-PatchSet: 5
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: newpatchset

Change in ...osmo-msc[master]: ran_dec logging: log message sizes on errors

[neels]

neels has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-msc/+/15342 )

Change subject: ran_dec logging: log message sizes on errors
..


Patch Set 4:

(1 comment)

https://gerrit.osmocom.org/#/c/15342/2/src/libmsc/ran_msg_a.c
File src/libmsc/ran_msg_a.c:

https://gerrit.osmocom.org/#/c/15342/2/src/libmsc/ran_msg_a.c@763
PS2, Line 763: \n
> Looks like we don't need a new line here.
whoops



--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15342
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Id08e4ee5a4dbf552dbb107d8f0519110664f6acb
Gerrit-Change-Number: 15342
Gerrit-PatchSet: 4
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Mon, 02 Sep 2019 23:37:59 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria 
Gerrit-MessageType: comment

Change in ...osmo-msc[master]: fix error on BSSMAP Cipher Mode Complete L3 msg IE

[neels]

neels has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-msc/+/15317 )

Change subject: fix error on BSSMAP Cipher Mode Complete L3 msg IE
..


Patch Set 6:

(1 comment)

https://gerrit.osmocom.org/#/c/15317/3/src/libmsc/msc_a.c
File src/libmsc/msc_a.c:

https://gerrit.osmocom.org/#/c/15317/3/src/libmsc/msc_a.c@1411
PS3, Line 1411: but this static msgb saves the extra allocation
> ACK. […]
I don't see how this can be a problem. None of the DTAP handling code is 
permitted to take ownership of the msgb.

What we would do here is allocate a msgb, dispatch it to DTAP, then deallocate 
it right after that here in this function. Even if it were allocated, it would 
still not be possible to put it in a queue. Nothing would be gained AFAICT.

This is the osmo-msc internal DTAP code, it is fully contained here: all 
handling of this msgb is in gsm_04_08.c. We're not talking about the general 
public or another osmocom library here.

The premise of DTAP decoding is to keep the incoming buffer unchanged, 
essentially a 'const' by convention. It is the incoming data and it is not a 
good idea to want to modify it.

Passing the msgb as 'const' is not necessary: even though this is a stack 
struct msgb, we are still free to write to it. We are not allowed to free it, 
but none of the DTAP code is allowed to free msgb passed to it -- it would lead 
to a double free.

If you guys still insist, this can become a dynamic allocation, but I am 
convinced that this patch is completely fine as it is now. The data is there, 
no need to allocate.

[BTW, talking of const msgb... I never added the 'const' to msgb args because 
the legacy gsm0408_* code neglected that. I would gladly change it to const, 
now that we have the time for it. But we do typically write l3h and cb items 
into the msgb, i.e. keep state for later in the code path. Also the msgb API 
from libosmocore often takes non-const msgb even for read-only API (e.g. 
msgb_get_u8()), which would need a lot of casting to non-const.]



--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15317
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Icd8dad18d6dda24d075dd8da72c3d6db1302090d
Gerrit-Change-Number: 15317
Gerrit-PatchSet: 6
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels 
Gerrit-CC: fixeria 
Gerrit-CC: laforge 
Gerrit-Comment-Date: Mon, 02 Sep 2019 23:35:47 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria 
Comment-In-Reply-To: laforge 
Gerrit-MessageType: comment

Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64

Package network:osmocom:nightly/osmo-trx failed to build in 
Debian_Unstable/x86_64

Check out the package for editing:
  osc checkout network:osmocom:nightly osmo-trx

Last lines of build log:
[  332s] ar: `u' modifier ignored since `D' is the default (see `U')
[  332s] libtool: link: ranlib .libs/libtransceiver_common.a
[  332s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln 
-s "../libtransceiver_common.la" "libtransceiver_common.la" )
[  332s] /bin/bash ../libtool  --tag=CXX   --mode=link g++ -lpthread 
-I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 
-fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat 
-Werror=format-security  -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd 
osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la 
../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la 
../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl 
-losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd 
[  332s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g 
-O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong 
-Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o 
osmo-trx-uhd osmo_trx_uhd-osmo-trx.o  ./device/uhd/.libs/libdevice.a 
./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a 
../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f 
/usr/lib/x86_64-linux-gnu/libosmoctrl.so 
/usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc 
/usr/lib/x86_64-linux-gnu/libosmovty.so 
/usr/lib/x86_64-linux-gnu/libosmocore.so -luhd
[  332s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined 
reference to symbol '_ZN5boost6system16generic_categoryEv'
[  332s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: 
error adding symbols: DSO missing from command line
[  332s] collect2: error: ld returned 1 exit status
[  332s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1
[  332s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M'
[  332s] make[3]: *** [Makefile:820: all-recursive] Error 1
[  332s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M'
[  332s] make[2]: *** [Makefile:513: all-recursive] Error 1
[  332s] make[2]: Leaving directory '/usr/src/packages/BUILD'
[  332s] make[1]: *** [Makefile:444: all] Error 2
[  332s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  332s] dh_auto_build: make -j1 returned exit code 2
[  332s] make: *** [debian/rules:6: build] Error 255
[  332s] dpkg-buildpackage: error: debian/rules build subprocess returned exit 
status 2
[  332s] 
[  332s] sheep84 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Mon Sep  2 
23:09:14 UTC 2019.
[  332s] 
[  332s] ### VM INTERACTION START ###
[  335s] [  322.092335] sysrq: SysRq : Power Off
[  335s] [  322.103087] reboot: Power down
[  335s] ### VM INTERACTION END ###
[  335s] 
[  335s] sheep84 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Mon Sep  2 
23:09:17 UTC 2019.
[  335s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64

Package network:osmocom:latest/osmo-trx failed to build in 
Debian_Unstable/x86_64

Check out the package for editing:
  osc checkout network:osmocom:latest osmo-trx

Last lines of build log:
[  428s] ar: `u' modifier ignored since `D' is the default (see `U')
[  428s] libtool: link: ranlib .libs/libtransceiver_common.a
[  428s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln 
-s "../libtransceiver_common.la" "libtransceiver_common.la" )
[  428s] /bin/bash ../libtool  --tag=CXX   --mode=link g++ -lpthread 
-I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 
-fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat 
-Werror=format-security  -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd 
osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la 
../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la 
../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl 
-losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd 
[  428s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g 
-O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong 
-Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o 
osmo-trx-uhd osmo_trx_uhd-osmo-trx.o  ./device/uhd/.libs/libdevice.a 
./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a 
../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f 
/usr/lib/x86_64-linux-gnu/libosmoctrl.so 
/usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc 
/usr/lib/x86_64-linux-gnu/libosmovty.so 
/usr/lib/x86_64-linux-gnu/libosmocore.so -luhd
[  428s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined 
reference to symbol '_ZN5boost6system16generic_categoryEv'
[  428s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: 
error adding symbols: DSO missing from command line
[  428s] collect2: error: ld returned 1 exit status
[  428s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1
[  428s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M'
[  428s] make[3]: *** [Makefile:820: all-recursive] Error 1
[  428s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M'
[  428s] make[2]: *** [Makefile:513: all-recursive] Error 1
[  428s] make[2]: Leaving directory '/usr/src/packages/BUILD'
[  428s] make[1]: *** [Makefile:444: all] Error 2
[  428s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  428s] dh_auto_build: make -j1 returned exit code 2
[  428s] make: *** [debian/rules:6: build] Error 255
[  428s] dpkg-buildpackage: error: debian/rules build subprocess returned exit 
status 2
[  428s] 
[  428s] build70 failed "build osmo-trx_1.1.1.dsc" at Mon Sep  2 23:07:12 UTC 
2019.
[  428s] 
[  428s] ### VM INTERACTION START ###
[  432s] [  418.066495] sysrq: SysRq : Power Off
[  432s] [  418.082075] reboot: Power down
[  432s] ### VM INTERACTION END ###
[  432s] 
[  432s] build70 failed "build osmo-trx_1.1.1.dsc" at Mon Sep  2 23:07:16 UTC 
2019.
[  432s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Change in ...libosmo-abis[master]: ipa: ipa_server_link_close() add checks of link state

[lynxis lazus]

lynxis lazus has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/libosmo-abis/+/15387


Change subject: ipa: ipa_server_link_close() add checks of link state
..

ipa: ipa_server_link_close() add checks of link state

When closing a link which failed on open,
ipa_server_link_close() would crash it when calling osmo_fd_unregister.

Change-Id: I672d4de25464c3829b08aff26b1a6d4ad92e7684
---
M src/input/ipa.c
1 file changed, 6 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/87/15387/1

diff --git a/src/input/ipa.c b/src/input/ipa.c
index 8aed7b3..c05ab04 100644
--- a/src/input/ipa.c
+++ b/src/input/ipa.c
@@ -333,8 +333,12 @@

 void ipa_server_link_close(struct ipa_server_link *link)
 {
-   osmo_fd_unregister(&link->ofd);
-   close(link->ofd.fd);
+   if (osmo_fd_is_registered(&link->ofd))
+   osmo_fd_unregister(&link->ofd);
+   if (link->ofd.fd < 0)
+   close(link->ofd.fd);
+
+   link->ofd.fd = -1;
 }

 static int ipa_server_conn_read(struct ipa_server_conn *conn)

--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/15387
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I672d4de25464c3829b08aff26b1a6d4ad92e7684
Gerrit-Change-Number: 15387
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 
Gerrit-MessageType: newchange

Change in ...osmo-sgsn[master]: Introduce FSM mm_state_gb_fsm

[laforge]

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15353 )

Change subject: Introduce FSM mm_state_gb_fsm
..


Patch Set 2:

I beg to disagree.  Why are we writign new code before we have any way of 
testing it in an automatic way?  And not only writing the code, but actually 
submitting it for inclusion/merge?

There's no problem if the test cases will mostly fail due to problems in the 
old code, and hopefully will gradually start to pass as more new code gets 
merged.

But by not having the tests *before* a rewrite, you will never get around 
writing them.


--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15353
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I04004423e993107374d5a3549b8a93ac169251dd
Gerrit-Change-Number: 15353
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Comment-Date: Mon, 02 Sep 2019 20:23:45 +
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

Change in ...pysim[master]: pysim-testdate: Add test data for Wavemobile-sim

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/pysim/+/15384 )

Change subject: pysim-testdate: Add test data for Wavemobile-sim
..

pysim-testdate: Add test data for Wavemobile-sim

Change-Id: Id2baedf5ac6396a643f36444e8f570ad9c41fafb
---
A pysim-testdata/Wavemobile-SIM.data
A pysim-testdata/Wavemobile-SIM.ok
2 files changed, 53 insertions(+), 0 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/pysim-testdata/Wavemobile-SIM.data 
b/pysim-testdata/Wavemobile-SIM.data
new file mode 100644
index 000..46690b4
--- /dev/null
+++ b/pysim-testdata/Wavemobile-SIM.data
@@ -0,0 +1,5 @@
+MCC=001
+MNC=01
+IMSI=00101000102
+ADM=15E31383624FDC8A
+
diff --git a/pysim-testdata/Wavemobile-SIM.ok b/pysim-testdata/Wavemobile-SIM.ok
new file mode 100644
index 000..5f5b360
--- /dev/null
+++ b/pysim-testdata/Wavemobile-SIM.ok
@@ -0,0 +1,48 @@
+Using PC/SC reader (dev=3) interface
+Reading ...
+ICCID: 89445310150011013678
+IMSI: 00101000102
+SMSP: 
e10581005155f500
+PLMNsel: 
fff11fff
+PLMNwAcT:
+   fff11f # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, 
cdma2000 HRPD, cdma2000 1xRTT
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+
+OPLMNwAcT:
+   fff11f # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, 
cdma2000 HRPD, cdma2000 1xRTT
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+
+HPLMNAcT: Can't read file -- SW match failed! Expected 9000 and got 9404.
+ACC: abce
+MSISDN: Not available
+AD: 0002
+Done !
+

--
To view, visit https://gerrit.osmocom.org/c/pysim/+/15384
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Id2baedf5ac6396a643f36444e8f570ad9c41fafb
Gerrit-Change-Number: 15384
Gerrit-PatchSet: 3
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-MessageType: merged

Change in ...osmo-sip-connector[master]: mncc: check fd before closing a connection

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 )

Change subject: mncc: check fd before closing a connection
..

mncc: check fd before closing a connection

The function close_connection() closes the fd without marking it as
closed. Lets set the fd to -1 and check at the beginning if it is
greater than zero. This prevents us from closing an already closed fd
again.

Related: OS#4159
Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e
---
M src/mncc.c
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/src/mncc.c b/src/mncc.c
index e23bd6f..f2e2579 100644
--- a/src/mncc.c
+++ b/src/mncc.c
@@ -324,8 +324,12 @@
 /* Close the MNCC connection/socket */
 static void close_connection(struct mncc_connection *conn)
 {
+   if (conn->fd.fd < 0)
+   return;
+
osmo_fd_unregister(&conn->fd);
close(conn->fd.fd);
+   conn->fd.fd = -1;
osmo_timer_schedule(&conn->reconnect, 5, 0);
conn->state = MNCC_DISCONNECTED;
if (conn->on_disconnect)
@@ -924,6 +928,7 @@
LOGP(DMNCC, LOGL_ERROR, "Failed to connect(%s). Retrying\n",
conn->app->mncc.path);
conn->state = MNCC_DISCONNECTED;
+   conn->fd.fd = -1;
osmo_timer_schedule(&conn->reconnect, 5, 0);
return;
}
@@ -1022,6 +1027,7 @@
conn->reconnect.data = conn;
conn->fd.cb = mncc_data;
conn->fd.data = conn;
+   conn->fd.fd = -1;
conn->app = cfg;
conn->state = MNCC_DISCONNECTED;
 }

--
To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sip-connector
Gerrit-Branch: master
Gerrit-Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e
Gerrit-Change-Number: 15303
Gerrit-PatchSet: 5
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...osmo-sip-connector[master]: mncc: check fd before closing a connection

[laforge]

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 )

Change subject: mncc: check fd before closing a connection
..


Patch Set 5: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sip-connector
Gerrit-Branch: master
Gerrit-Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e
Gerrit-Change-Number: 15303
Gerrit-PatchSet: 5
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Mon, 02 Sep 2019 20:21:18 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...pysim[master]: pysim-testdate: Add test data for Wavemobile-sim

[laforge]

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/pysim/+/15384 )

Change subject: pysim-testdate: Add test data for Wavemobile-sim
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/pysim/+/15384
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Id2baedf5ac6396a643f36444e8f570ad9c41fafb
Gerrit-Change-Number: 15384
Gerrit-PatchSet: 3
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Comment-Date: Mon, 02 Sep 2019 20:21:00 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: Implement GMM State using osmocom FSM

[pespin]

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15385 )

Change subject: Implement GMM State using osmocom FSM
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/15385/1/include/osmocom/sgsn/gprs_gmm_state_fsm.h
File include/osmocom/sgsn/gprs_gmm_state_fsm.h:

https://gerrit.osmocom.org/#/c/15385/1/include/osmocom/sgsn/gprs_gmm_state_fsm.h@6
PS1, Line 6: gmm_state_fsm_states
> I find this naming confusing: 'state FSM states'? Maybe it's time to drop 
> this 'state' prefix since  […]
I'm simply following convention of naming _states and _events the fields of an 
osmocom FSM. It happens to be be by casuality that the machine definition is 
named "GMM state", so in this case it's expected to end up having this kind of 
naming.



--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15385
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Idecb43c10d66224d4f9ba9320825040ce6cf9a07
Gerrit-Change-Number: 15385
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Reviewer: pespin 
Gerrit-CC: fixeria 
Gerrit-Comment-Date: Mon, 02 Sep 2019 16:06:33 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria 
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: Implement GMM State using osmocom FSM

[fixeria]

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15385 )

Change subject: Implement GMM State using osmocom FSM
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/15385/1/include/osmocom/sgsn/gprs_gmm_state_fsm.h
File include/osmocom/sgsn/gprs_gmm_state_fsm.h:

https://gerrit.osmocom.org/#/c/15385/1/include/osmocom/sgsn/gprs_gmm_state_fsm.h@6
PS1, Line 6: gmm_state_fsm_states
I find this naming confusing: 'state FSM states'? Maybe it's time to drop this 
'state' prefix since you're rewriting the code anyway?



--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15385
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Idecb43c10d66224d4f9ba9320825040ce6cf9a07
Gerrit-Change-Number: 15385
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Reviewer: pespin 
Gerrit-CC: fixeria 
Gerrit-Comment-Date: Mon, 02 Sep 2019 15:46:21 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: Implement GMM State using osmocom FSM

[pespin]

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15385 )

Change subject: Implement GMM State using osmocom FSM
..


Patch Set 1:

I tested manually GPRS still works fine, and verifies all passing TTCN3 sgsn 
tests are still passing.


--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15385
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Idecb43c10d66224d4f9ba9320825040ce6cf9a07
Gerrit-Change-Number: 15385
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Reviewer: pespin 
Gerrit-CC: Jenkins Builder
Gerrit-Comment-Date: Mon, 02 Sep 2019 15:40:05 +
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: Implement GMM State using osmocom FSM

[pespin]

pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15385


Change subject: Implement GMM State using osmocom FSM
..

Implement GMM State using osmocom FSM

State machine inspired in the one from TS 24.008 4.1.3.3.1. Some state
transitions are inroduced in the code but are still commented out since
we lack some functionalitites or improvements in the code to handle
different scenarios.

Most of the logic is still outside of the FSM, but at least now the
states are handled in a sane way triggered by events.

Change-Id: Idecb43c10d66224d4f9ba9320825040ce6cf9a07
---
M include/osmocom/sgsn/Makefile.am
A include/osmocom/sgsn/gprs_gmm_state_fsm.h
M include/osmocom/sgsn/gprs_sgsn.h
M src/sgsn/Makefile.am
M src/sgsn/gprs_gmm.c
A src/sgsn/gprs_gmm_state_fsm.c
M src/sgsn/gprs_sgsn.c
M src/sgsn/sgsn_libgtp.c
M src/sgsn/sgsn_vty.c
M tests/sgsn/Makefile.am
M tests/sgsn/sgsn_test.c
11 files changed, 262 insertions(+), 53 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/85/15385/1

diff --git a/include/osmocom/sgsn/Makefile.am b/include/osmocom/sgsn/Makefile.am
index 0ab00fe..e243210 100644
--- a/include/osmocom/sgsn/Makefile.am
+++ b/include/osmocom/sgsn/Makefile.am
@@ -6,6 +6,7 @@
gprs_gb.h \
gprs_gb_parse.h \
gprs_gmm.h \
+   gprs_gmm_state_fsm.h \
gprs_gmm_attach.h \
gprs_mm_state_gb_fsm.h \
gprs_mm_state_iu_fsm.h \
diff --git a/include/osmocom/sgsn/gprs_gmm_state_fsm.h 
b/include/osmocom/sgsn/gprs_gmm_state_fsm.h
new file mode 100644
index 000..b288321
--- /dev/null
+++ b/include/osmocom/sgsn/gprs_gmm_state_fsm.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include 
+
+/* 3GPP TS 24.008 § 4.1.3.3 GMM mobility management states on the network side 
*/
+enum gmm_state_fsm_states {
+   ST_GMM_DEREGISTERED,/* 4.1.3.3.1.1 */
+   ST_GMM_COMMON_PROC_INIT,/* 4.1.3.3.1.2 */
+   ST_GMM_REGISTERED_NORMAL,   /* 4.1.3.3.2.1 */
+   ST_GMM_REGISTERED_SUSPENDED,/* 4.1.3.3.2.2 */
+   ST_GMM_DEREGISTERED_INIT,   /* 4.1.3.3.1.4 */
+};
+
+enum gmm_state_fsm_events {
+   E_GMM_COMMON_PROC_INIT_REQ,
+   /* E_GMM_COMMON_PROC_FAILED, NOT USED */
+   /* E_GMM_LOWER_LAYER_FAILED, NOT USED */
+   E_GMM_COMMON_PROC_SUCCESS,
+   E_GMM_ATTACH_SUCCESS,
+   /* E_GMM_NET_INIT_DETACH_REQ, NOT USED */
+   /* E_GMM_MS_INIT_DETACH_REQ, NOT USED */
+   /* E_GMM_DETACH_ACCEPTED, */
+   E_GMM_SUSPEND,
+   E_GMM_RESUME,
+   E_GMM_CLEANUP,
+};
+
+static inline bool gmm_state_fsm_is_registered(struct osmo_fsm_inst *fi)
+{
+   return fi->state == ST_GMM_REGISTERED_NORMAL ||
+  fi->state == ST_GMM_REGISTERED_SUSPENDED;
+}
+
+extern struct osmo_fsm gmm_state_fsm;
diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h
index 20e0e06..bf15d6b 100644
--- a/include/osmocom/sgsn/gprs_sgsn.h
+++ b/include/osmocom/sgsn/gprs_sgsn.h
@@ -23,15 +23,6 @@

 enum gsm48_gsm_cause;

-/* 3GPP TS 24.008 § 4.1.3.3 GMM mobility management states on the network side 
*/
-enum gprs_gmm_state {
-   GMM_DEREGISTERED,   /* 4.1.3.3.1.1 */
-   GMM_COMMON_PROC_INIT,   /* 4.1.3.3.1.2 */
-   GMM_REGISTERED_NORMAL,  /* 4.1.3.3.2.1 */
-   GMM_REGISTERED_SUSPENDED,   /* 4.1.3.3.2.2 */
-   GMM_DEREGISTERED_INIT,  /* 4.1.3.3.1.4 */
-};
-
 enum gprs_mm_ctr {
GMM_CTR_PKTS_SIG_IN,
GMM_CTR_PKTS_SIG_OUT,
@@ -128,7 +119,7 @@
enum sgsn_ran_type  ran_type;

charimsi[GSM23003_IMSI_MAX_DIGITS+1];
-   enum gprs_gmm_state gmm_state;
+   struct osmo_fsm_inst*gmm_state_fsm;
uint32_tp_tmsi;
uint32_tp_tmsi_old; /* old P-TMSI before new is 
confirmed */
uint32_tp_tmsi_sig;
diff --git a/src/sgsn/Makefile.am b/src/sgsn/Makefile.am
index a8da943..e8f1bd2 100644
--- a/src/sgsn/Makefile.am
+++ b/src/sgsn/Makefile.am
@@ -43,6 +43,7 @@
gprs_gb.c \
gprs_gmm_attach.c \
gprs_gmm.c \
+   gprs_gmm_state_fsm.c \
gprs_mm_state_gb_fsm.c \
gprs_mm_state_iu_fsm.c \
gprs_ranap.c \
diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c
index 399f7bf..d47f380 100644
--- a/src/sgsn/gprs_gmm.c
+++ b/src/sgsn/gprs_gmm.c
@@ -57,6 +57,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -211,7 +212,7 @@
LOGMMCTXP(LOGL_INFO, ctx, "Cleaning MM context due to %s\n", log_text);

/* Mark MM state as deregistered */
-   ctx->gmm_state = GMM_DEREGISTERED;
+   osmo_fsm_inst_dispatch(ctx->gmm_state_fsm, E_GMM_CLEANUP, NULL);

switch(ctx->ran_type) {
case MM_CTX_T_UTRAN_Iu:
@@ -967,7 +968,7 @@
memset(&sig_data, 0, sizeof(sig_data));
sig_data.mm = mmctx;
osmo_si

Change in ...osmo-sgsn[master]: src/gprs/Makefile.am: Move build of shared .c files to an internal lib

[pespin]

Hello laforge, Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/osmo-sgsn/+/15360

to look at the new patch set (#3).

Change subject: src/gprs/Makefile.am: Move build of shared .c files to an 
internal lib
..

src/gprs/Makefile.am: Move build of shared .c files to an internal lib

Build files shared by osmo-sgsn, osmo-gbpy and osmo-gtphub into a .la
library, so we can later split each application into its own subdir and
clearly identify what's used by who.

Due to a dependency error with .Po files,  I cannot depend on the specific
.o files directly in LDADD for each binary, but it works fine on follow up
commits when binaries are splitted into different makefiles, so it will be
done later.

Change-Id: Ib7665c530c086a5f3135c395bb8bf19ed4a882b6
---
M .gitignore
M debian/copyright
M src/gprs/Makefile.am
3 files changed, 27 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/60/15360/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15360
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Ib7665c530c086a5f3135c395bb8bf19ed4a882b6
Gerrit-Change-Number: 15360
Gerrit-PatchSet: 3
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-CC: fixeria 
Gerrit-MessageType: newpatchset

Change in ...pysim[master]: pysim-testdate: Add test data for Wavemobile-sim

[dexter]

Hello Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/pysim/+/15384

to look at the new patch set (#3).

Change subject: pysim-testdate: Add test data for Wavemobile-sim
..

pysim-testdate: Add test data for Wavemobile-sim

Change-Id: Id2baedf5ac6396a643f36444e8f570ad9c41fafb
---
A pysim-testdata/Wavemobile-SIM.data
A pysim-testdata/Wavemobile-SIM.ok
2 files changed, 53 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/84/15384/3
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/15384
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Id2baedf5ac6396a643f36444e8f570ad9c41fafb
Gerrit-Change-Number: 15384
Gerrit-PatchSet: 3
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset

Change in ...pysim[master]: pysim-testdate: Add test data for Wavemobile-sim

[dexter]

Hello Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/pysim/+/15384

to look at the new patch set (#2).

Change subject: pysim-testdate: Add test data for Wavemobile-sim
..

pysim-testdate: Add test data for Wavemobile-sim

Change-Id: Id2baedf5ac6396a643f36444e8f570ad9c41fafb
---
A pysim-testdata/Wavemobile-SIM.data
A pysim-testdata/Wavemobile-SIM.ok
2 files changed, 53 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/84/15384/2
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/15384
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Id2baedf5ac6396a643f36444e8f570ad9c41fafb
Gerrit-Change-Number: 15384
Gerrit-PatchSet: 2
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset

Change in ...pysim[master]: pysim-testdate: Add test data for Wavemobile-sim

[dexter]

dexter has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/pysim/+/15384


Change subject: pysim-testdate: Add test data for Wavemobile-sim
..

pysim-testdate: Add test data for Wavemobile-sim

Change-Id: Id2baedf5ac6396a643f36444e8f570ad9c41fafb
---
A pysim-testdata/wavemobile-SIM.data
A pysim-testdata/wavemobile-SIM.ok
2 files changed, 53 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/84/15384/1

diff --git a/pysim-testdata/wavemobile-SIM.data 
b/pysim-testdata/wavemobile-SIM.data
new file mode 100644
index 000..46690b4
--- /dev/null
+++ b/pysim-testdata/wavemobile-SIM.data
@@ -0,0 +1,5 @@
+MCC=001
+MNC=01
+IMSI=00101000102
+ADM=15E31383624FDC8A
+
diff --git a/pysim-testdata/wavemobile-SIM.ok b/pysim-testdata/wavemobile-SIM.ok
new file mode 100644
index 000..c17d2a4
--- /dev/null
+++ b/pysim-testdata/wavemobile-SIM.ok
@@ -0,0 +1,48 @@
+Using PC/SC reader (dev=0) interface
+Reading ...
+ICCID: 89445310150011013678
+IMSI: 00101000102
+SMSP: 
e10581005155f500
+PLMNsel: 
fff11fff
+PLMNwAcT:
+   fff11f # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, 
cdma2000 HRPD, cdma2000 1xRTT
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+
+OPLMNwAcT:
+   fff11f # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, 
cdma2000 HRPD, cdma2000 1xRTT
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+   ff # unused
+
+HPLMNAcT: Can't read file -- SW match failed! Expected 9000 and got 9404.
+ACC: abce
+MSISDN: Not available
+AD: 0002
+Done !
+

--
To view, visit https://gerrit.osmocom.org/c/pysim/+/15384
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Id2baedf5ac6396a643f36444e8f570ad9c41fafb
Gerrit-Change-Number: 15384
Gerrit-PatchSet: 1
Gerrit-Owner: dexter 
Gerrit-MessageType: newchange

Change in ...osmo-sip-connector[master]: mncc: check fd before closing a connection

[pespin]

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303 )

Change subject: mncc: check fd before closing a connection
..


Patch Set 5: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sip-connector
Gerrit-Branch: master
Gerrit-Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e
Gerrit-Change-Number: 15303
Gerrit-PatchSet: 5
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: neels 
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Comment-Date: Mon, 02 Sep 2019 12:31:36 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...osmo-sip-connector[master]: mncc: check fd before closing a connection

[dexter]

Hello fixeria, neels, Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303

to look at the new patch set (#5).

Change subject: mncc: check fd before closing a connection
..

mncc: check fd before closing a connection

The function close_connection() closes the fd without marking it as
closed. Lets set the fd to -1 and check at the beginning if it is
greater than zero. This prevents us from closing an already closed fd
again.

Related: OS#4159
Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e
---
M src/mncc.c
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector 
refs/changes/03/15303/5
--
To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sip-connector
Gerrit-Branch: master
Gerrit-Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e
Gerrit-Change-Number: 15303
Gerrit-PatchSet: 5
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: neels 
Gerrit-CC: laforge 
Gerrit-CC: pespin 
Gerrit-MessageType: newpatchset

Change in ...osmo-sgsn[master]: Move out gbproxy to its own subdir

[pespin]

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15361 )

Change subject: Move out gbproxy to its own subdir
..


Patch Set 2:

(1 comment)

https://gerrit.osmocom.org/#/c/15361/2/src/gbproxy/Makefile.am
File src/gbproxy/Makefile.am:

https://gerrit.osmocom.org/#/c/15361/2/src/gbproxy/Makefile.am@35
PS2, Line 35: $(top_builddir)/src/gprs/gprs_gb_parse.o \
:   $(top_builddir)/src/gprs/gprs_llc_parse.o \
:   $(top_builddir)/src/gprs/crc24.o \
:   $(top_builddir)/src/gprs/gprs_utils.o \
> Can we just link against 'libcommon.la' here? If no, please describe why in 
> the comment message.
Indeed, I'm introducing a licommon.la which in the end is not used, in order to 
have all .o files built on one target (to avoid several targets building same 
files coming from different subdirs, and issues associated to that). I'm open 
to other alternatives that you think can be better, but this one is good enough.

I could indeed link against libcommon.la here, but I prefer keeping it this way 
in order to keep information on exactly which files each application requires. 
Specially since some files may be splitted later since only 1 application is 
using a subset of it for instance, so we can shrink this common section without 
duplicating code.



--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15361
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I2cc98d3a276d953609aa9782a0112687791e
Gerrit-Change-Number: 15361
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-CC: fixeria 
Gerrit-Comment-Date: Mon, 02 Sep 2019 12:12:13 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria 
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: Move out gbproxy to its own subdir

[fixeria]

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15361 )

Change subject: Move out gbproxy to its own subdir
..


Patch Set 2:

(1 comment)

It looks strange that you're introducing a static library, but in the end 
nobody will link against it o_O. Maybe I am missing something...

https://gerrit.osmocom.org/#/c/15361/2/src/gbproxy/Makefile.am
File src/gbproxy/Makefile.am:

https://gerrit.osmocom.org/#/c/15361/2/src/gbproxy/Makefile.am@35
PS2, Line 35: $(top_builddir)/src/gprs/gprs_gb_parse.o \
:   $(top_builddir)/src/gprs/gprs_llc_parse.o \
:   $(top_builddir)/src/gprs/crc24.o \
:   $(top_builddir)/src/gprs/gprs_utils.o \
Can we just link against 'libcommon.la' here? If no, please describe why in the 
comment message.



--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15361
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I2cc98d3a276d953609aa9782a0112687791e
Gerrit-Change-Number: 15361
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-CC: fixeria 
Gerrit-Comment-Date: Mon, 02 Sep 2019 12:07:38 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: src/gprs/Makefile.am: Move build of shared .c files to an internal lib

[pespin]

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15360 )

Change subject: src/gprs/Makefile.am: Move build of shared .c files to an 
internal lib
..


Patch Set 2:

(2 comments)

https://gerrit.osmocom.org/#/c/15360/2/src/gprs/Makefile.am
File src/gprs/Makefile.am:

https://gerrit.osmocom.org/#/c/15360/2/src/gprs/Makefile.am@55
PS2, Line 55: $(LIBCARES_LIBS) \
> Duplicate, see above.
Thanks, I'll remove it.


https://gerrit.osmocom.org/#/c/15360/2/src/gprs/Makefile.am@56
PS2, Line 56: lrt
> Do we really need it?
Probably it's not needed, I'll try dropping it.



--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15360
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Ib7665c530c086a5f3135c395bb8bf19ed4a882b6
Gerrit-Change-Number: 15360
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-CC: fixeria 
Gerrit-Comment-Date: Mon, 02 Sep 2019 12:01:24 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria 
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: src/gprs/Makefile.am: Move build of shared .c files to an internal lib

[fixeria]

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15360 )

Change subject: src/gprs/Makefile.am: Move build of shared .c files to an 
internal lib
..


Patch Set 2:

(2 comments)

https://gerrit.osmocom.org/#/c/15360/2/src/gprs/Makefile.am
File src/gprs/Makefile.am:

https://gerrit.osmocom.org/#/c/15360/2/src/gprs/Makefile.am@55
PS2, Line 55: $(LIBCARES_LIBS) \
Duplicate, see above.


https://gerrit.osmocom.org/#/c/15360/2/src/gprs/Makefile.am@56
PS2, Line 56: lrt
Do we really need it?



--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15360
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Ib7665c530c086a5f3135c395bb8bf19ed4a882b6
Gerrit-Change-Number: 15360
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-CC: fixeria 
Gerrit-Comment-Date: Mon, 02 Sep 2019 11:56:12 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: enum gprs_gmm_state: Fix spec reference

[pespin]

pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15383


Change subject: enum gprs_gmm_state: Fix spec reference
..

enum gprs_gmm_state: Fix spec reference

Change-Id: I62121e46e5091e5b559397aa01f107ddc23e2c18
---
M include/osmocom/sgsn/gprs_sgsn.h
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/83/15383/1

diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h
index 8e8b762..20e0e06 100644
--- a/include/osmocom/sgsn/gprs_sgsn.h
+++ b/include/osmocom/sgsn/gprs_sgsn.h
@@ -23,7 +23,7 @@

 enum gsm48_gsm_cause;

-/* TS 04.08 4.1.3.3 GMM mobility management states on the network side */
+/* 3GPP TS 24.008 § 4.1.3.3 GMM mobility management states on the network side 
*/
 enum gprs_gmm_state {
GMM_DEREGISTERED,   /* 4.1.3.3.1.1 */
GMM_COMMON_PROC_INIT,   /* 4.1.3.3.1.2 */

--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15383
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I62121e46e5091e5b559397aa01f107ddc23e2c18
Gerrit-Change-Number: 15383
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-MessageType: newchange

Change in ...pysim[master]: this is a test, please ignore

[dexter]

dexter has abandoned this change. ( https://gerrit.osmocom.org/c/pysim/+/15379 )

Change subject: this is a test, please ignore
..


Abandoned
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/15379
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I67cc83da1054d692af29d4e87d982303e5ce4bfd
Gerrit-Change-Number: 15379
Gerrit-PatchSet: 1
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: abandon

Change in ...osmo-sgsn[master]: vty: Print MM state and RAN type in show mm-context

[fixeria]

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15357 )

Change subject: vty: Print MM state and RAN type in show mm-context
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15357
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Ia06c53f0cd2a6348237ed3abeb9367d965745aba
Gerrit-Change-Number: 15357
Gerrit-PatchSet: 3
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Comment-Date: Mon, 02 Sep 2019 11:50:16 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...pysim[master]: pySim-prog: Use CSV format with headers

[dexter]

dexter has posted comments on this change. ( 
https://gerrit.osmocom.org/c/pysim/+/15313 )

Change subject: pySim-prog: Use CSV format with headers
..


Patch Set 1:

(1 comment)

I think I found whats wrong. (See comment)

https://gerrit.osmocom.org/#/c/15313/1/pySim/cards.py
File pySim/cards.py:

https://gerrit.osmocom.org/#/c/15313/1/pySim/cards.py@572
PS1, Line 572:  self._scc.verify_chv(0x0A, p['adm1'])
I think this should be: self._scc.verify_chv(0x0A, h2b(p['adm1']))

This also explains the problems with sysmo-usim-tool. The authentication here 
fails, and then the tests for sysmo-usim-tool also block because 
sysmo-usim-tool detects that only 2 or less authentication attempts are left. 
PySim won't complain, after the 3rd run of the test the card will lock down.



--
To view, visit https://gerrit.osmocom.org/c/pysim/+/15313
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I0d317ea51d0cf582b82157eec6cdec074001a236
Gerrit-Change-Number: 15313
Gerrit-PatchSet: 1
Gerrit-Owner: laforge 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter 
Gerrit-CC: pespin 
Gerrit-Comment-Date: Mon, 02 Sep 2019 11:47:57 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: gmm: Move code handling GMM PTMSI Realloc Complete to its own function

[pespin]

pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15382


Change subject: gmm: Move code handling GMM PTMSI Realloc Complete to its own 
function
..

gmm: Move code handling GMM PTMSI Realloc Complete to its own function

Change-Id: I3b21a976c6683bea5419a33f0ccb8b56483d6e21
---
M src/sgsn/gprs_gmm.c
1 file changed, 17 insertions(+), 11 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/82/15382/1

diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c
index ea6daae..399f7bf 100644
--- a/src/sgsn/gprs_gmm.c
+++ b/src/sgsn/gprs_gmm.c
@@ -1789,6 +1789,22 @@
return 0;
 }

+/* 3GPP TS 24.008 § 9.4.8: P-TMSI reallocation complete */
+static int gsm48_rx_gmm_ptmsi_reall_compl(struct sgsn_mm_ctx *mmctx)
+{
+   LOGMMCTXP(LOGL_INFO, mmctx, "-> PTMSI REALLOCATION COMPLETE\n");
+   mmctx_timer_stop(mmctx, 3350);
+   mmctx->t3350_mode = GMM_T3350_MODE_NONE;
+   mmctx->p_tmsi_old = 0;
+   mmctx->pending_req = 0;
+   if (mmctx->ran_type == MM_CTX_T_GERAN_Gb) {
+   /* Unassign the old TLLI */
+   mmctx->gb.tlli = mmctx->gb.tlli_new;
+   //gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED, 
mmctx->gb.tlli_new, GPRS_ALGO_GEA0, NULL);
+   }
+   return 0;
+}
+
 /* 3GPP TS 24.008 § 9.4.20 Service request.
  * In Iu, a UE in PMM-IDLE mode can use GSM48_MT_GMM_SERVICE_REQ to switch back
  * to PMM-CONNECTED mode. */
@@ -2032,17 +2048,7 @@
case GSM48_MT_GMM_PTMSI_REALL_COMPL:
if (!mmctx)
goto null_mmctx;
-   LOGMMCTXP(LOGL_INFO, mmctx, "-> PTMSI REALLOCATION COMPLETE\n");
-   mmctx_timer_stop(mmctx, 3350);
-   mmctx->t3350_mode = GMM_T3350_MODE_NONE;
-   mmctx->p_tmsi_old = 0;
-   mmctx->pending_req = 0;
-   if (mmctx->ran_type == MM_CTX_T_GERAN_Gb) {
-   /* Unassign the old TLLI */
-   mmctx->gb.tlli = mmctx->gb.tlli_new;
-   //gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED, 
mmctx->gb.tlli_new, GPRS_ALGO_GEA0, NULL);
-   }
-   rc = 0;
+   rc = gsm48_rx_gmm_ptmsi_reall_compl(mmctx);
break;
case GSM48_MT_GMM_AUTH_CIPH_RESP:
if (!mmctx)

--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15382
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I3b21a976c6683bea5419a33f0ccb8b56483d6e21
Gerrit-Change-Number: 15382
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-MessageType: newchange

Change in ...osmo-sgsn[master]: gmm: Move code handling GMM Routing Area Update Complete to its own f...

[pespin]

pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15381


Change subject: gmm: Move code handling GMM Routing Area Update Complete to its 
own function
..

gmm: Move code handling GMM Routing Area Update Complete to its own function

Change-Id: I8e28ac03edf82374e804701ebe635e1171a2b36a
---
M src/sgsn/gprs_gmm.c
1 file changed, 32 insertions(+), 25 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/81/15381/1

diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c
index b2c70aa..ea6daae 100644
--- a/src/sgsn/gprs_gmm.c
+++ b/src/sgsn/gprs_gmm.c
@@ -1758,6 +1758,37 @@
return rc;
 }

+/* 3GPP TS 24.008 § 9.4.16: Routing area update complete */
+static int gsm48_rx_gmm_ra_upd_compl(struct sgsn_mm_ctx *mmctx)
+{
+   struct sgsn_signal_data sig_data;
+   /* only in case SGSN offered new P-TMSI */
+   LOGMMCTXP(LOGL_INFO, mmctx, "-> ROUTING AREA UPDATE COMPLETE\n");
+   mmctx_timer_stop(mmctx, 3350);
+   mmctx->t3350_mode = GMM_T3350_MODE_NONE;
+   mmctx->p_tmsi_old = 0;
+   mmctx->pending_req = 0;
+   mmctx->gmm_state = GMM_REGISTERED_NORMAL;
+   switch(mmctx->ran_type) {
+   case MM_CTX_T_UTRAN_Iu:
+   osmo_fsm_inst_dispatch(mmctx->iu.mm_state_fsm, E_PMM_RA_UPDATE, 
NULL);
+   break;
+   case MM_CTX_T_GERAN_Gb:
+   /* Unassign the old TLLI */
+   mmctx->gb.tlli = mmctx->gb.tlli_new;
+   gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED,
+ mmctx->gb.tlli_new);
+   osmo_fsm_inst_dispatch(mmctx->gb.mm_state_fsm, E_MM_RA_UPDATE, 
NULL);
+   break;
+   }
+
+   memset(&sig_data, 0, sizeof(sig_data));
+   sig_data.mm = mmctx;
+   osmo_signal_dispatch(SS_SGSN, S_SGSN_UPDATE, &sig_data);
+
+   return 0;
+}
+
 /* 3GPP TS 24.008 § 9.4.20 Service request.
  * In Iu, a UE in PMM-IDLE mode can use GSM48_MT_GMM_SERVICE_REQ to switch back
  * to PMM-CONNECTED mode. */
@@ -1893,7 +1924,6 @@
 int gsm0408_rcv_gmm(struct sgsn_mm_ctx *mmctx, struct msgb *msg,
   struct gprs_llc_llme *llme, bool drop_cipherable)
 {
-   struct sgsn_signal_data sig_data;
struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg);
int rc;

@@ -1997,30 +2027,7 @@
case GSM48_MT_GMM_RA_UPD_COMPL:
if (!mmctx)
goto null_mmctx;
-   /* only in case SGSN offered new P-TMSI */
-   LOGMMCTXP(LOGL_INFO, mmctx, "-> ROUTING AREA UPDATE 
COMPLETE\n");
-   mmctx_timer_stop(mmctx, 3350);
-   mmctx->t3350_mode = GMM_T3350_MODE_NONE;
-   mmctx->p_tmsi_old = 0;
-   mmctx->pending_req = 0;
-   mmctx->gmm_state = GMM_REGISTERED_NORMAL;
-   switch(mmctx->ran_type) {
-   case MM_CTX_T_UTRAN_Iu:
-   osmo_fsm_inst_dispatch(mmctx->iu.mm_state_fsm, 
E_PMM_RA_UPDATE, NULL);
-   break;
-   case MM_CTX_T_GERAN_Gb:
-   /* Unassign the old TLLI */
-   mmctx->gb.tlli = mmctx->gb.tlli_new;
-   gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED,
- mmctx->gb.tlli_new);
-   osmo_fsm_inst_dispatch(mmctx->gb.mm_state_fsm, 
E_MM_RA_UPDATE, NULL);
-   break;
-   }
-   rc = 0;
-
-   memset(&sig_data, 0, sizeof(sig_data));
-   sig_data.mm = mmctx;
-   osmo_signal_dispatch(SS_SGSN, S_SGSN_UPDATE, &sig_data);
+   rc = gsm48_rx_gmm_ra_upd_compl(mmctx);
break;
case GSM48_MT_GMM_PTMSI_REALL_COMPL:
if (!mmctx)

--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15381
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I8e28ac03edf82374e804701ebe635e1171a2b36a
Gerrit-Change-Number: 15381
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-MessageType: newchange

Change in ...osmo-sgsn[master]: gmm: Move code handling GMM Attach Complete to its own function

[pespin]

pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15380


Change subject: gmm: Move code handling GMM Attach Complete to its own function
..

gmm: Move code handling GMM Attach Complete to its own function

Change-Id: I2d8d947ab1eb4100f404b885461f7a30583c9ac6
---
M src/sgsn/gprs_gmm.c
1 file changed, 40 insertions(+), 33 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/80/15380/1

diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c
index edb7eea..b2c70aa 100644
--- a/src/sgsn/gprs_gmm.c
+++ b/src/sgsn/gprs_gmm.c
@@ -1343,6 +1343,45 @@

 }

+/* 3GPP TS 24.008 § 9.4.3 Attach complete */
+static int gsm48_rx_gmm_att_compl(struct sgsn_mm_ctx *mmctx)
+{
+   struct sgsn_signal_data sig_data;
+   /* only in case SGSN offered new P-TMSI */
+   LOGMMCTXP(LOGL_INFO, mmctx, "-> ATTACH COMPLETE\n");
+
+   #ifdef BUILD_IU
+   if (mmctx->iu.ue_ctx) {
+   ranap_iu_tx_release(mmctx->iu.ue_ctx, NULL);
+   }
+   #endif
+
+   mmctx_timer_stop(mmctx, 3350);
+   mmctx->t3350_mode = GMM_T3350_MODE_NONE;
+   mmctx->p_tmsi_old = 0;
+   mmctx->pending_req = 0;
+   mmctx->gmm_state = GMM_REGISTERED_NORMAL;
+   switch(mmctx->ran_type) {
+   case MM_CTX_T_UTRAN_Iu:
+   osmo_fsm_inst_dispatch(mmctx->iu.mm_state_fsm, E_PMM_PS_ATTACH, 
NULL);
+   break;
+   case MM_CTX_T_GERAN_Gb:
+   /* Unassign the old TLLI */
+   mmctx->gb.tlli = mmctx->gb.tlli_new;
+   gprs_llme_copy_key(mmctx, mmctx->gb.llme);
+   gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED,
+ mmctx->gb.tlli_new);
+   osmo_fsm_inst_dispatch(mmctx->gb.mm_state_fsm, 
E_MM_GPRS_ATTACH, NULL);
+   break;
+   }
+
+   osmo_fsm_inst_dispatch(mmctx->gmm_att_req.fsm, E_ATTACH_COMPLETE_RECV, 
0);
+   memset(&sig_data, 0, sizeof(sig_data));
+   sig_data.mm = mmctx;
+   osmo_signal_dispatch(SS_SGSN, S_SGSN_ATTACH, &sig_data);
+
+   return 0;
+}

 /* Checks if two attach request contain the IEs and IE values
  * return 0 if equal
@@ -1953,39 +1992,7 @@
case GSM48_MT_GMM_ATTACH_COMPL:
if (!mmctx)
goto null_mmctx;
-   /* only in case SGSN offered new P-TMSI */
-   LOGMMCTXP(LOGL_INFO, mmctx, "-> ATTACH COMPLETE\n");
-
-#ifdef BUILD_IU
-   if (mmctx->iu.ue_ctx) {
-   ranap_iu_tx_release(mmctx->iu.ue_ctx, NULL);
-   }
-#endif
-
-   mmctx_timer_stop(mmctx, 3350);
-   mmctx->t3350_mode = GMM_T3350_MODE_NONE;
-   mmctx->p_tmsi_old = 0;
-   mmctx->pending_req = 0;
-   mmctx->gmm_state = GMM_REGISTERED_NORMAL;
-   switch(mmctx->ran_type) {
-   case MM_CTX_T_UTRAN_Iu:
-   osmo_fsm_inst_dispatch(mmctx->iu.mm_state_fsm, 
E_PMM_PS_ATTACH, NULL);
-   break;
-   case MM_CTX_T_GERAN_Gb:
-   /* Unassign the old TLLI */
-   mmctx->gb.tlli = mmctx->gb.tlli_new;
-   gprs_llme_copy_key(mmctx, mmctx->gb.llme);
-   gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED,
- mmctx->gb.tlli_new);
-   osmo_fsm_inst_dispatch(mmctx->gb.mm_state_fsm, 
E_MM_GPRS_ATTACH, NULL);
-   break;
-   }
-   rc = 0;
-
-   osmo_fsm_inst_dispatch(mmctx->gmm_att_req.fsm, 
E_ATTACH_COMPLETE_RECV, 0);
-   memset(&sig_data, 0, sizeof(sig_data));
-   sig_data.mm = mmctx;
-   osmo_signal_dispatch(SS_SGSN, S_SGSN_ATTACH, &sig_data);
+   rc = gsm48_rx_gmm_att_compl(mmctx);
break;
case GSM48_MT_GMM_RA_UPD_COMPL:
if (!mmctx)

--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15380
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I2d8d947ab1eb4100f404b885461f7a30583c9ac6
Gerrit-Change-Number: 15380
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-MessageType: newchange

Change in ...pysim[master]: this is a test, please ignore

[dexter]

dexter has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/pysim/+/15379


Change subject: this is a test, please ignore
..

this is a test, please ignore

Change-Id: I67cc83da1054d692af29d4e87d982303e5ce4bfd
---
A testme
1 file changed, 0 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/79/15379/1

diff --git a/testme b/testme
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/testme

--
To view, visit https://gerrit.osmocom.org/c/pysim/+/15379
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I67cc83da1054d692af29d4e87d982303e5ce4bfd
Gerrit-Change-Number: 15379
Gerrit-PatchSet: 1
Gerrit-Owner: dexter 
Gerrit-MessageType: newchange

Change in ...osmo-sgsn[master]: Introduce FSM mm_state_gb_fsm

[pespin]

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15353 )

Change subject: Introduce FSM mm_state_gb_fsm
..


Patch Set 2:

While I agree that tests should be added at some point, the truth is that 
there's not much that can become tested (and hence broken) yet, since the MM 
state is not really used for much nowadays (it still needs to be further 
developed and code added).

So in a few works, imho it's impossible it becomes more broken than it was, and 
now we have a more solid code base to start implementing/fixing related bits...


--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15353
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I04004423e993107374d5a3549b8a93ac169251dd
Gerrit-Change-Number: 15353
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Comment-Date: Mon, 02 Sep 2019 10:21:27 +
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: Introduce FSM mm_state_iu_fsm

[pespin]

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15354 )

Change subject: Introduce FSM mm_state_iu_fsm
..


Patch Set 2:

While I agree that tests should be added at some point, the truth is that 
there's not much that can become tested (and hence broken) yet, since the PMM 
state is not really used for much nowadays (it still needs to be further 
developed and code added).

So in a few works, imho it's impossible it becomes more broken than it was, and 
now we have a more solid code base to start implementing/fixing related bits...


--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15354
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I4c9cf8c27194817c56e8949af0205e1cc14af317
Gerrit-Change-Number: 15354
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Comment-Date: Mon, 02 Sep 2019 10:18:42 +
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: sgsn_vty: Fix mmctx rate_ctr output indentation

[pespin]

pespin has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15356 )

Change subject: sgsn_vty: Fix mmctx rate_ctr output indentation
..

sgsn_vty: Fix mmctx rate_ctr output indentation

Change-Id: I1b89c179e1ba08b65e31727fdce90c7b578f4d6d
---
M src/gprs/sgsn_vty.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c
index 42b5121..0663131 100644
--- a/src/gprs/sgsn_vty.c
+++ b/src/gprs/sgsn_vty.c
@@ -533,7 +533,7 @@
pfx, get_value_string(gprs_mm_st_strs, mm->gmm_state),
osmo_rai_name(&mm->ra), mm->gb.cell_id, VTY_NEWLINE);

-   vty_out_rate_ctr_group(vty, " ", mm->ctrg);
+   vty_out_rate_ctr_group(vty, "  ", mm->ctrg);

if (pdp) {
struct sgsn_pdp_ctx *pdp;

--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15356
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I1b89c179e1ba08b65e31727fdce90c7b578f4d6d
Gerrit-Change-Number: 15356
Gerrit-PatchSet: 3
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...osmo-sgsn[master]: sgsn_cdr.c: Fix ip addr string buffer size

[pespin]

pespin has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15358 )

Change subject: sgsn_cdr.c: Fix ip addr string buffer size
..

sgsn_cdr.c: Fix ip addr string buffer size

INET(6)_ADDRSTRLEN already contains the required extra null byte at the
end, no need to add +1 to it.

Change-Id: I5a16659e007c6883fe21582cce5dac544e6d4bb9
---
M src/gprs/sgsn_cdr.c
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/gprs/sgsn_cdr.c b/src/gprs/sgsn_cdr.c
index 93ed0af..a50b4df 100644
--- a/src/gprs/sgsn_cdr.c
+++ b/src/gprs/sgsn_cdr.c
@@ -153,9 +153,9 @@
struct sgsn_pdp_ctx *pdp)
 {
char apni[(pdp->lib ? pdp->lib->apn_use.l : 0) + 1];
-   char ggsn_addr[INET_ADDRSTRLEN + 1];
-   char sgsn_addr[INET_ADDRSTRLEN + 1];
-   char eua_addr[INET6_ADDRSTRLEN + 1];
+   char ggsn_addr[INET_ADDRSTRLEN];
+   char sgsn_addr[INET_ADDRSTRLEN];
+   char eua_addr[INET6_ADDRSTRLEN];
struct tm tm;
struct timeval tv;
time_t duration;

--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15358
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I5a16659e007c6883fe21582cce5dac544e6d4bb9
Gerrit-Change-Number: 15358
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...osmo-sgsn[master]: sgsn_vty: Print correct Iu mmctx id in 'show mm-context'

[pespin]

pespin has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15355 )

Change subject: sgsn_vty: Print correct Iu mmctx id in 'show mm-context'
..

sgsn_vty: Print correct Iu mmctx id in 'show mm-context'

Change-Id: I79333bef4a4bf743fcad07812c9a213b368ff2b6
---
M src/gprs/sgsn_vty.c
1 file changed, 14 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c
index 0663131..1f7874f 100644
--- a/src/gprs/sgsn_vty.c
+++ b/src/gprs/sgsn_vty.c
@@ -525,10 +525,23 @@
 static void vty_dump_mmctx(struct vty *vty, const char *pfx,
   struct sgsn_mm_ctx *mm, int pdp)
 {
+   uint32_t id = 0;
+
+   switch(mm->ran_type) {
+   case MM_CTX_T_UTRAN_Iu:
+#if BUILD_IU
+   id = mm->iu.ue_ctx->conn_id;
+#endif
+   break;
+   case MM_CTX_T_GERAN_Gb:
+   id = mm->gb.tlli;
+   break;
+   }
+
vty_out(vty, "%sMM Context for IMSI %s, IMEI %s, P-TMSI %08x%s",
pfx, mm->imsi, mm->imei, mm->p_tmsi, VTY_NEWLINE);
vty_out(vty, "%s  MSISDN: %s, TLLI: %08x%s HLR: %s",
-   pfx, mm->msisdn, mm->gb.tlli, mm->hlr, VTY_NEWLINE);
+   pfx, mm->msisdn, id, mm->hlr, VTY_NEWLINE);
vty_out(vty, "%s  MM State: %s, Routeing Area: %s, Cell ID: %u%s",
pfx, get_value_string(gprs_mm_st_strs, mm->gmm_state),
osmo_rai_name(&mm->ra), mm->gb.cell_id, VTY_NEWLINE);

--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15355
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I79333bef4a4bf743fcad07812c9a213b368ff2b6
Gerrit-Change-Number: 15355
Gerrit-PatchSet: 3
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...osmo-bsc[master]: Cell Broadcast: CBSP and CBCH scheduling support

[laforge]

Hello Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/osmo-bsc/+/15373

to look at the new patch set (#3).

Change subject: Cell Broadcast: CBSP and CBCH scheduling support
..

Cell Broadcast: CBSP and CBCH scheduling support

This adds code to handle CBSP (Cell Broadcast Service Protocol)
from the CBC (Cell Broadcast Centre), as well as BSC-internal data
structures for scheduling the various SMSCB on the CBCH of each BTS.

There are currently one known shortcoming in the code: We don't yet
verify if keepalives are received within repetition period.

Change-Id: Ia0a0de862a104d0f447a5d6e56c7c83981b825c7
---
A doc/manuals/chapters/smscb.adoc
M doc/manuals/osmobsc-usermanual.adoc
M doc/manuals/vty/bsc_vty_reference.xml
M include/osmocom/bsc/Makefile.am
M include/osmocom/bsc/bsc_msc_data.h
M include/osmocom/bsc/debug.h
M include/osmocom/bsc/gsm_data.h
A include/osmocom/bsc/smscb.h
M include/osmocom/bsc/vty.h
M src/osmo-bsc/Makefile.am
M src/osmo-bsc/abis_rsl.c
M src/osmo-bsc/bsc_init.c
M src/osmo-bsc/bsc_vty.c
A src/osmo-bsc/cbch_scheduler.c
A src/osmo-bsc/cbsp_link.c
M src/osmo-bsc/gsm_data.c
M src/osmo-bsc/osmo_bsc_main.c
A src/osmo-bsc/smscb.c
M tests/handover/Makefile.am
19 files changed, 1,898 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/73/15373/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15373
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ia0a0de862a104d0f447a5d6e56c7c83981b825c7
Gerrit-Change-Number: 15373
Gerrit-PatchSet: 3
Gerrit-Owner: laforge 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-CC: pespin 
Gerrit-MessageType: newpatchset

Change in ...osmo-bsc[master]: Cell Broadcast: CBSP and CBCH scheduling support

[laforge]

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/15373 )

Change subject: Cell Broadcast: CBSP and CBCH scheduling support
..


Patch Set 2:

(1 comment)

https://gerrit.osmocom.org/#/c/15373/2/src/osmo-bsc/smscb.c
File src/osmo-bsc/smscb.c:

https://gerrit.osmocom.org/#/c/15373/2/src/osmo-bsc/smscb.c@142
PS2, Line 142:  static struct osmo_cell_global_id cgi;
> What about passing it as a parameter and filling it from there? This way 
> space is not lost for users […]
are we arguing about something like 16 estimated bytes for the entire program? 
For sure I'm against bloat, but we're not talking about anything worth 
considerng here.  Ease of development is more important thant those few bytes, 
for sure.



--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15373
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ia0a0de862a104d0f447a5d6e56c7c83981b825c7
Gerrit-Change-Number: 15373
Gerrit-PatchSet: 2
Gerrit-Owner: laforge 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-CC: pespin 
Gerrit-Comment-Date: Mon, 02 Sep 2019 09:59:44 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin 
Gerrit-MessageType: comment

Change in ...osmo-msc[master]: msc_vlr_tests: GSUP: don't care about extra IEs

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-msc/+/15343 )

Change subject: msc_vlr_tests: GSUP: don't care about extra IEs
..

msc_vlr_tests: GSUP: don't care about extra IEs

To not break the msc_vlr tests by new GSUP IEs added to some of the GSUP
messages, make msc_vlr_tests only match the start of the GSUP message and not
care about extra IEs. The extra IEs are anyway seen in the expected logs.

The reason to drop the msgb_eq_data_print() is because it is useless for
mismatching lengths. It will always print only the length mismatch, instead we
need to be able to compare with what was expected.

Change-Id: I38d51eeafab04ece83e4bb87bfaa967506f97b11
---
M tests/msc_vlr/msc_vlr_tests.c
1 file changed, 9 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved
  fixeria: Looks good to me, but someone else must approve



diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c
index 4ccaee9..3d69ae8 100644
--- a/tests/msc_vlr/msc_vlr_tests.c
+++ b/tests/msc_vlr/msc_vlr_tests.c
@@ -746,8 +746,16 @@
if (len < 1)
abort();

-   if (!msgb_eq_data_print(msg, buf, len))
+   /* Compare only the length expected. Extra data is fine, to not care 
about new GSUP IEs invented later. */
+   if (msg->len < len) {
+   fprintf(stderr, "ERROR: GSUP message too short, expected 
'%s'\n", gsup_tx_expected);
abort();
+   }
+
+   if (memcmp(msg->data, buf, len)) {
+   fprintf(stderr, "ERROR: GSUP message mismatch, expected it to 
start with '%s'\n", gsup_tx_expected);
+   abort();
+   }

talloc_free(msg);
gsup_tx_confirmed = true;

--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15343
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I38d51eeafab04ece83e4bb87bfaa967506f97b11
Gerrit-Change-Number: 15343
Gerrit-PatchSet: 4
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...osmo-msc[master]: msc_a.c, CC trans: change a comment to a debug log

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-msc/+/15345 )

Change subject: msc_a.c, CC trans: change a comment to a debug log
..

msc_a.c, CC trans: change a comment to a debug log

Change-Id: I5a3cc6219080910119b0c9ff11fc2b9eb96a06e5
---
M src/libmsc/msc_a.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved
  fixeria: Looks good to me, but someone else must approve



diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c
index b3e2e32..a082cb8 100644
--- a/src/libmsc/msc_a.c
+++ b/src/libmsc/msc_a.c
@@ -1653,7 +1653,7 @@
OSMO_ASSERT(cc_trans->type == TRANS_CC);

if (msc_a->cc.active_trans == cc_trans) {
-   /* Assignment for this trans already started earlier. */
+   LOG_MSC_A(msc_a, LOGL_DEBUG, "Assignment for this trans already 
started earlier\n");
return 0;
}


--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15345
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I5a3cc6219080910119b0c9ff11fc2b9eb96a06e5
Gerrit-Change-Number: 15345
Gerrit-PatchSet: 4
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...osmo-msc[master]: cosmetic: fix call_leg_ensure_ci() decl. arg name to match impl.

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-msc/+/15346 )

Change subject: cosmetic: fix call_leg_ensure_ci() decl. arg name to match impl.
..

cosmetic: fix call_leg_ensure_ci() decl. arg name to match impl.

Change-Id: I576bc5c1fd63fe8048a7a6a2d06763fc3221fa49
---
M include/osmocom/msc/call_leg.h
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved
  fixeria: Looks good to me, approved



diff --git a/include/osmocom/msc/call_leg.h b/include/osmocom/msc/call_leg.h
index f35816c..a225b66 100644
--- a/include/osmocom/msc/call_leg.h
+++ b/include/osmocom/msc/call_leg.h
@@ -74,7 +74,7 @@
 int call_leg_ensure_rtp_alloc(struct call_leg *cl, enum rtp_direction dir, 
uint32_t call_id,
  struct gsm_trans *for_trans);
 int call_leg_ensure_ci(struct call_leg *cl, enum rtp_direction dir, uint32_t 
call_id, struct gsm_trans *for_trans,
-  const enum mgcp_codecs *codec_if_known, const struct 
osmo_sockaddr_str *remote_port_if_known);
+  const enum mgcp_codecs *codec_if_known, const struct 
osmo_sockaddr_str *remote_addr_if_known);
 struct osmo_sockaddr_str *call_leg_local_ip(struct call_leg *cl, enum 
rtp_direction dir);

 void call_leg_rtp_stream_gone(struct call_leg *cl, struct rtp_stream *rtps);

--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15346
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I576bc5c1fd63fe8048a7a6a2d06763fc3221fa49
Gerrit-Change-Number: 15346
Gerrit-PatchSet: 4
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...osmo-msc[master]: gsm48_tch_rtp_create(): check against NULL mgcp_info

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-msc/+/15344 )

Change subject: gsm48_tch_rtp_create(): check against NULL mgcp_info
..

gsm48_tch_rtp_create(): check against NULL mgcp_info

osmo_mgcpc_ep_ci_get_rtp_info() might return a NULL mgcp_info, guard against
that.

Fixes: CID#203651
Change-Id: I98fe5860c49751ade1af10d99487aba259504f23
---
M src/libmsc/gsm_04_08_cc.c
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved
  fixeria: Looks good to me, but someone else must approve



diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c
index 1ec3342..e83caa2 100644
--- a/src/libmsc/gsm_04_08_cc.c
+++ b/src/libmsc/gsm_04_08_cc.c
@@ -1700,7 +1700,10 @@

/* Payload Type number */
mgcp_info = osmo_mgcpc_ep_ci_get_rtp_info(rtp_cn->ci);
-   payload_type = map_codec_to_pt(mgcp_info->ptmap, mgcp_info->ptmap_len, 
rtp_cn->codec);
+   if (mgcp_info && mgcp_info->ptmap_len)
+   payload_type = map_codec_to_pt(mgcp_info->ptmap, 
mgcp_info->ptmap_len, rtp_cn->codec);
+   else
+   payload_type = rtp_cn->codec;

rtp_cn_local = call_leg_local_ip(cl, RTP_TO_CN);
if (!rtp_cn_local) {

--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15344
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I98fe5860c49751ade1af10d99487aba259504f23
Gerrit-Change-Number: 15344
Gerrit-PatchSet: 4
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...osmo-sgsn[master]: sgsn_vty: Print correct Iu mmctx id in 'show mm-context'

[pespin]

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15355 )

Change subject: sgsn_vty: Print correct Iu mmctx id in 'show mm-context'
..


Patch Set 3:

Re-adding previous +2 after rebase.


--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15355
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I79333bef4a4bf743fcad07812c9a213b368ff2b6
Gerrit-Change-Number: 15355
Gerrit-PatchSet: 3
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Mon, 02 Sep 2019 09:49:37 +
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: sgsn_vty: Fix mmctx rate_ctr output indentation

[pespin]

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15356 )

Change subject: sgsn_vty: Fix mmctx rate_ctr output indentation
..


Patch Set 3:

Re-adding previous +2 after rebase.


--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15356
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I1b89c179e1ba08b65e31727fdce90c7b578f4d6d
Gerrit-Change-Number: 15356
Gerrit-PatchSet: 3
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Mon, 02 Sep 2019 09:49:18 +
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: sgsn_cdr.c: Fix ip addr string buffer size

[pespin]

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15358 )

Change subject: sgsn_cdr.c: Fix ip addr string buffer size
..


Patch Set 2: Code-Review+2

Re-adding previous +2 after rebase.


--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15358
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I5a16659e007c6883fe21582cce5dac544e6d4bb9
Gerrit-Change-Number: 15358
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Mon, 02 Sep 2019 09:48:43 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: Move out sgsn to its own subdir

[pespin]

Hello laforge, Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/osmo-sgsn/+/15363

to look at the new patch set (#4).

Change subject: Move out sgsn to its own subdir
..

Move out sgsn to its own subdir

Change-Id: I16fccc0eadf588599b9e5578d0f4dbaf9df81737
---
M configure.ac
M debian/copyright
M osmoappdesc.py
M src/Makefile.am
M src/gprs/Makefile.am
A src/sgsn/Makefile.am
R src/sgsn/gprs_gb.c
R src/sgsn/gprs_gmm.c
R src/sgsn/gprs_gmm_attach.c
R src/sgsn/gprs_llc.c
R src/sgsn/gprs_llc_vty.c
R src/sgsn/gprs_llc_xid.c
R src/sgsn/gprs_mm_state_gb_fsm.c
R src/sgsn/gprs_mm_state_iu_fsm.c
R src/sgsn/gprs_ranap.c
R src/sgsn/gprs_sgsn.c
R src/sgsn/gprs_sndcp.c
R src/sgsn/gprs_sndcp_comp.c
R src/sgsn/gprs_sndcp_dcomp.c
R src/sgsn/gprs_sndcp_pcomp.c
R src/sgsn/gprs_sndcp_vty.c
R src/sgsn/gprs_sndcp_xid.c
R src/sgsn/gprs_subscriber.c
R src/sgsn/sgsn_auth.c
R src/sgsn/sgsn_cdr.c
R src/sgsn/sgsn_ctrl.c
R src/sgsn/sgsn_libgtp.c
R src/sgsn/sgsn_main.c
R src/sgsn/sgsn_vty.c
R src/sgsn/slhc.c
R src/sgsn/v42bis.c
M tests/Makefile.am
M tests/ctrl_test_runner.py
M tests/sgsn/Makefile.am
M tests/slhc/Makefile.am
M tests/sndcp_xid/Makefile.am
M tests/v42bis/Makefile.am
M tests/vty_test_runner.py
M tests/xid/Makefile.am
39 files changed, 144 insertions(+), 112 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/63/15363/4
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15363
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I16fccc0eadf588599b9e5578d0f4dbaf9df81737
Gerrit-Change-Number: 15363
Gerrit-PatchSet: 4
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-MessageType: newpatchset

Change in ...osmo-sgsn[master]: sgsn_cdr.c: Fix ip addr string buffer size

[pespin]

Hello laforge, Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/osmo-sgsn/+/15358

to look at the new patch set (#2).

Change subject: sgsn_cdr.c: Fix ip addr string buffer size
..

sgsn_cdr.c: Fix ip addr string buffer size

INET(6)_ADDRSTRLEN already contains the required extra null byte at the
end, no need to add +1 to it.

Change-Id: I5a16659e007c6883fe21582cce5dac544e6d4bb9
---
M src/gprs/sgsn_cdr.c
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/58/15358/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15358
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I5a16659e007c6883fe21582cce5dac544e6d4bb9
Gerrit-Change-Number: 15358
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-MessageType: newpatchset

Change in ...osmo-sgsn[master]: Split enum gprs_pmm_state into Iu and Gb counterparts

[pespin]

pespin has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15337 )

Change subject: Split enum gprs_pmm_state into Iu and Gb counterparts
..

Split enum gprs_pmm_state into Iu and Gb counterparts

Those two state sets are not part of the same state machine, and are
used in different scenarios, so let's split them and handle them in Gb
and Iu specific parts of struct sgsn_mm_ctx. This is required in order
to improve related code (for instance, use osmocom fsm).

Change-Id: I6100d607da316da0595886c6968704dd9ccfbde9
---
M include/osmocom/sgsn/gprs_gmm.h
M include/osmocom/sgsn/gprs_sgsn.h
M src/gprs/gprs_gb.c
M src/gprs/gprs_gmm.c
M src/gprs/gprs_ranap.c
M src/gprs/gprs_sgsn.c
6 files changed, 43 insertions(+), 36 deletions(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  fixeria: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/sgsn/gprs_gmm.h b/include/osmocom/sgsn/gprs_gmm.h
index 9316351..6c72cda 100644
--- a/include/osmocom/sgsn/gprs_gmm.h
+++ b/include/osmocom/sgsn/gprs_gmm.h
@@ -49,9 +49,9 @@

 void pdp_ctx_detach_mm_ctx(struct sgsn_pdp_ctx *pdp);

-void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state);
+void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_mm_state_iu state);
 void mmctx_state_timer_start(struct sgsn_mm_ctx *mm, unsigned int T);
-void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state);
+void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_mm_state_gb state);

 void msgid2mmctx(struct sgsn_mm_ctx *mm, const struct msgb *msg);
 #endif /* _GPRS_GMM_H */
diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h
index eea9fb0..f64e07b 100644
--- a/include/osmocom/sgsn/gprs_sgsn.h
+++ b/include/osmocom/sgsn/gprs_sgsn.h
@@ -32,14 +32,17 @@
GMM_DEREGISTERED_INIT,  /* 4.1.3.3.1.4 */
 };

-/* TS 23.060 6.1.1 and 6.1.2 Mobility management states A/Gb and Iu mode */
-enum gprs_pmm_state {
-   PMM_DETACHED,
-   PMM_CONNECTED,
-   PMM_IDLE,
+/* TS 23.060 6.1.1 Mobility Management States (A/Gb mode) */
+enum gprs_mm_state_gb {
MM_IDLE,
MM_READY,
-   MM_STANDBY,
+   MM_STANDBY
+};
+/* TS 23.060 6.1.2 Mobility Management States (Iu mode) */
+enum gprs_mm_state_iu {
+   PMM_DETACHED,
+   PMM_CONNECTED,
+   PMM_IDLE
 };

 enum gprs_mm_ctr {
@@ -138,7 +141,6 @@

charimsi[GSM23003_IMSI_MAX_DIGITS+1];
enum gprs_gmm_state gmm_state;
-   enum gprs_pmm_state pmm_state;  /* Iu: page when in PMM-IDLE 
mode */
uint32_tp_tmsi;
uint32_tp_tmsi_old; /* old P-TMSI before new is 
confirmed */
uint32_tp_tmsi_sig;
@@ -158,9 +160,11 @@
uint32_ttlli;
uint32_ttlli_new;

+   /* TS 23.060 6.1.1 Mobility Management States (A/Gb mode) */
+   enum gprs_mm_state_gb   mm_state;
/* timer for mm state. state=READY: T3314 (aka TS 23.060 "READY 
timer") */
struct osmo_timer_list  state_timer;
-   unsigned intstate_T;/* T number but 
only used for pmm_states */
+   unsigned intstate_T;/* T number but 
only used for mm_state */
} gb;
struct {
int new_key;
@@ -175,6 +179,8 @@
/* Voice Support Match Indicator */
struct ranap_ue_conn_ctx*ue_ctx;
struct service_info service;
+   /* TS 23.060 6.1.2 Mobility Management States (Iu mode) */
+   enum gprs_mm_state_iu   mm_state;
} iu;
struct {
struct osmo_fsm_inst *fsm;
diff --git a/src/gprs/gprs_gb.c b/src/gprs/gprs_gb.c
index 29bfc53..43af434 100644
--- a/src/gprs/gprs_gb.c
+++ b/src/gprs/gprs_gb.c
@@ -35,7 +35,7 @@
 /* Update the MM context state */
 static void gsm0408_gprs_notify_pdu_gb(struct sgsn_mm_ctx *mmctx)
 {
-   switch (mmctx->pmm_state) {
+   switch (mmctx->gb.mm_state) {
case MM_STANDBY:
mmctx_set_mm_state(mmctx, MM_READY);
break;
diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c
index 33ade4d..badb881 100644
--- a/src/gprs/gprs_gmm.c
+++ b/src/gprs/gprs_gmm.c
@@ -102,16 +102,20 @@
},
 };

-static const struct value_string gprs_pmm_state_names[] = {
-   OSMO_VALUE_STRING(PMM_DETACHED),
-   OSMO_VALUE_STRING(PMM_CONNECTED),
-   OSMO_VALUE_STRING(PMM_IDLE),
+static const struct value_string gprs_mm_state_gb_names[] = {
OSMO_VALUE_STRING(MM_IDLE),
OSMO_VALUE_STRING(MM_READY),
OSMO_VALUE_STRING(MM_STANDBY),
{ 0, NULL }
 };

+static const struct value_string gprs_mm_state_iu_names[] = {
+   OSM

Change in ...osmo-sgsn[master]: Move lots of Iu/ranap specific code into its own file

[pespin]

pespin has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15335 )

Change subject: Move lots of Iu/ranap specific code into its own file
..

Move lots of Iu/ranap specific code into its own file

RANAP related functionalities were splitted among several files
(gprs_gmm.c, gprs_sgsn.c and sgsn_libgtp.c). Let's move it into its own
file to shrink complexity/size of existing files.
It also allows to keep a lot of conditionally enabled code (BUILD_IU)
and its dependencies (osmo-iuh) together.

Change-Id: I549042aaff045a378de77d657cc396ee08f22f33
---
M include/osmocom/sgsn/Makefile.am
M include/osmocom/sgsn/gprs_gmm.h
A include/osmocom/sgsn/gprs_ranap.h
M include/osmocom/sgsn/sgsn.h
M src/gprs/Makefile.am
M src/gprs/gprs_gmm.c
A src/gprs/gprs_ranap.c
M src/gprs/gprs_sgsn.c
M src/gprs/sgsn_libgtp.c
M src/gprs/sgsn_main.c
M tests/sgsn/Makefile.am
11 files changed, 274 insertions(+), 238 deletions(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  osmith: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/sgsn/Makefile.am b/include/osmocom/sgsn/Makefile.am
index cbf7c51..b4cd5db 100644
--- a/include/osmocom/sgsn/Makefile.am
+++ b/include/osmocom/sgsn/Makefile.am
@@ -8,6 +8,7 @@
gprs_gmm_attach.h \
gprs_llc.h \
gprs_llc_xid.h \
+   gprs_ranap.h \
gprs_sgsn.h \
gprs_sndcp_comp.h \
gprs_sndcp_dcomp.h \
diff --git a/include/osmocom/sgsn/gprs_gmm.h b/include/osmocom/sgsn/gprs_gmm.h
index ffcebd3..047bd77 100644
--- a/include/osmocom/sgsn/gprs_gmm.h
+++ b/include/osmocom/sgsn/gprs_gmm.h
@@ -17,8 +17,10 @@

 int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme,
   bool drop_cipherable);
-int gsm0408_gprs_rcvmsg_iu(struct msgb *msg, struct gprs_ra_id *ra_id,
-  uint16_t *sai);
+int gsm0408_rcv_gsm(struct sgsn_mm_ctx *mmctx, struct msgb *msg,
+  struct gprs_llc_llme *llme);
+int gsm0408_rcv_gmm(struct sgsn_mm_ctx *mmctx, struct msgb *msg,
+  struct gprs_llc_llme *llme, bool drop_cipherable);
 int gsm0408_gprs_force_reattach(struct sgsn_mm_ctx *mmctx);
 int gsm0408_gprs_force_reattach_oldmsg(struct msgb *msg,
   struct gprs_llc_llme *llme);
@@ -33,8 +35,6 @@

 time_t gprs_max_time_to_idle(void);

-int iu_rab_act_ps(uint8_t rab_id, struct sgsn_pdp_ctx *pdp);
-
 int gsm48_tx_gmm_id_req(struct sgsn_mm_ctx *mm, uint8_t id_type);
 int gsm48_tx_gmm_att_rej(struct sgsn_mm_ctx *mm,
uint8_t gmm_cause);
@@ -42,9 +42,12 @@

 int gprs_gmm_attach_req_ies(struct msgb *a, struct msgb *b);

+int gsm48_gmm_authorize(struct sgsn_mm_ctx *ctx);
 /* TODO: move extract_subscr_* when gsm48_gmm_authorize() got removed */
 void extract_subscr_msisdn(struct sgsn_mm_ctx *ctx);
 void extract_subscr_hlr(struct sgsn_mm_ctx *ctx);

 void pdp_ctx_detach_mm_ctx(struct sgsn_pdp_ctx *pdp);
+
+void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state);
 #endif /* _GPRS_GMM_H */
diff --git a/include/osmocom/sgsn/gprs_ranap.h 
b/include/osmocom/sgsn/gprs_ranap.h
new file mode 100644
index 000..b300130
--- /dev/null
+++ b/include/osmocom/sgsn/gprs_ranap.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include 
+#include 
+
+#ifdef BUILD_IU
+#include 
+#include 
+#include 
+
+void activate_pdp_rabs(struct sgsn_mm_ctx *ctx);
+int sgsn_ranap_iu_event(struct ranap_ue_conn_ctx *ctx, enum 
ranap_iu_event_type type, void *data);
+int iu_rab_act_ps(uint8_t rab_id, struct sgsn_pdp_ctx *pdp);
+
+int gsm0408_gprs_rcvmsg_iu(struct msgb *msg, struct gprs_ra_id *ra_id, 
uint16_t *sai);
+#endif
+
+struct ranap_ue_conn_ctx;
+/* On RANAP, Returns pointer to he associated ranap_ue_conn_ctx in msg, filled
+ * in by osmo-iuh's iu_recv_cb().
+ * On Gb, returns NULL */
+#define MSG_IU_UE_CTX(msg) ((struct ranap_ue_conn_ctx *)(msg)->dst)
+#define MSG_IU_UE_CTX_SET(msg, val) (msg)->dst = (val)
diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h
index 78803c7..e1c5c4a 100644
--- a/include/osmocom/sgsn/sgsn.h
+++ b/include/osmocom/sgsn/sgsn.h
@@ -161,7 +161,7 @@
 /* Main input function for Gb proxy */
 int sgsn_rcvmsg(struct msgb *msg, struct gprs_nsvc *nsvc, uint16_t ns_bvci);

-
+/* sgsn_libgtp.c */
 struct sgsn_pdp_ctx *sgsn_create_pdp_ctx(struct sgsn_ggsn_ctx *ggsn,
 struct sgsn_mm_ctx *mmctx,
 uint16_t nsapi,
@@ -169,6 +169,7 @@
 int sgsn_delete_pdp_ctx(struct sgsn_pdp_ctx *pctx);
 void sgsn_pdp_upd_gtp_u(struct sgsn_pdp_ctx *pdp, void *addr, size_t alen);
 void sgsn_ggsn_echo_req(struct sgsn_ggsn_ctx *ggc);
+int send_act_pdp_cont_acc(struct sgsn_pdp_ctx *pctx);

 /* gprs_sndcp.c */

diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am
index ba5dfd6..384b893 100644
--- a/src/gp

Change in ...osmo-sgsn[master]: gprs_gmm.c: Replace inet_ntoa with inet_ntop

[pespin]

pespin has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15352 )

Change subject: gprs_gmm.c: Replace inet_ntoa with inet_ntop
..

gprs_gmm.c: Replace inet_ntoa with inet_ntop

inet_ntop manual states:
"inet_ntoa(3) is now considered to be deprecated in favor of
inet_ntop()".

Change-Id: I0c708d047122f349acf46797a9e5973040e7ae04
---
M src/gprs/gprs_gmm.c
1 file changed, 8 insertions(+), 3 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  osmith: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c
index badb881..b28a4a1 100644
--- a/src/gprs/gprs_gmm.c
+++ b/src/gprs/gprs_gmm.c
@@ -118,10 +118,12 @@

 static void mmctx_change_gtpu_endpoints_to_sgsn(struct sgsn_mm_ctx *mm_ctx)
 {
+   char buf[INET_ADDRSTRLEN];
struct sgsn_pdp_ctx *pdp;
llist_for_each_entry(pdp, &mm_ctx->pdp_list, list) {
LOGMMCTXP(LOGL_INFO, mm_ctx, "Changing GTP-U endpoints %s -> 
%s\n",
- sgsn_gtp_ntoa(&pdp->lib->gsnlu), 
inet_ntoa(sgsn->cfg.gtp_listenaddr.sin_addr));
+ sgsn_gtp_ntoa(&pdp->lib->gsnlu),
+ inet_ntop(AF_INET, 
&sgsn->cfg.gtp_listenaddr.sin_addr, buf, sizeof(buf)));
sgsn_pdp_upd_gtp_u(pdp,
   &sgsn->cfg.gtp_listenaddr.sin_addr,
   sizeof(sgsn->cfg.gtp_listenaddr.sin_addr));
@@ -2479,6 +2481,7 @@
struct sgsn_ggsn_ctx *ggsn;
struct sgsn_ggsn_lookup *lookup = arg;
struct in_addr *addr = NULL;
+   char buf[INET_ADDRSTRLEN];

/* The context is gone while we made a request */
if (!lookup->mmctx) {
@@ -2535,7 +2538,8 @@
}
ggsn->remote_addr = *addr;
LOGMMCTXP(LOGL_NOTICE, lookup->mmctx,
-   "Selected %s as GGSN.\n", inet_ntoa(*addr));
+ "Selected %s as GGSN.\n",
+ inet_ntop(AF_INET, addr, buf, sizeof(buf)));

/* forget about the ggsn look-up */
lookup->mmctx->ggsn_lookup = NULL;
@@ -2571,6 +2575,7 @@
char *hostname;
int rc;
struct gprs_llc_lle *lle;
+   char buf[INET_ADDRSTRLEN];

LOGMMCTXP(LOGL_INFO, mmctx, "-> ACTIVATE PDP CONTEXT REQ: SAPI=%u 
NSAPI=%u ",
act_req->req_llc_sapi, act_req->req_nsapi);
@@ -2599,7 +2604,7 @@
if (req_pdpa_len >= 6) {
struct in_addr ia;
ia.s_addr = ntohl(*((uint32_t *) (req_pdpa+2)));
-   DEBUGPC(DMM, "%s ", inet_ntoa(ia));
+   DEBUGPC(DMM, "%s ", inet_ntop(AF_INET, &ia, buf, 
sizeof(buf)));
}
break;
case 0x57:

--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15352
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I0c708d047122f349acf46797a9e5973040e7ae04
Gerrit-Change-Number: 15352
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...osmo-sgsn[master]: Merge common allocation steps for Gb and Iu ctx

[pespin]

pespin has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15338 )

Change subject: Merge common allocation steps for Gb and Iu ctx
..

Merge common allocation steps for Gb and Iu ctx

This way it's easier to add new common functionalitites without
forgetting to add it on both sides, and simplifies the code.

Change-Id: Ib6c0427ac7b35295cf1caf2f28cb2a5c155b9d9c
---
M src/gprs/gprs_sgsn.c
1 file changed, 27 insertions(+), 30 deletions(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  osmith: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c
index 2116590..6acc66e 100644
--- a/src/gprs/gprs_sgsn.c
+++ b/src/gprs/gprs_sgsn.c
@@ -214,9 +214,8 @@

 }

-/* Allocate a new SGSN MM context for GERAN_Gb */
-struct sgsn_mm_ctx *sgsn_mm_ctx_alloc_gb(uint32_t tlli,
-   const struct gprs_ra_id *raid)
+/* Allocate a new SGSN MM context, generic part */
+struct sgsn_mm_ctx *sgsn_mm_ctx_alloc(uint32_t rate_ctr_id)
 {
struct sgsn_mm_ctx *ctx;

@@ -224,16 +223,9 @@
if (!ctx)
return NULL;

-   memcpy(&ctx->ra, raid, sizeof(ctx->ra));
-   ctx->ran_type = MM_CTX_T_GERAN_Gb;
-   ctx->gb.tlli = tlli;
ctx->gmm_state = GMM_DEREGISTERED;
-   ctx->gb.mm_state = MM_IDLE;
ctx->auth_triplet.key_seq = GSM_KEY_SEQ_INVAL;
-   ctx->ciph_algo = sgsn->cfg.cipher;
-   LOGMMCTXP(LOGL_DEBUG, ctx, "Allocated with %s cipher.\n",
- get_value_string(gprs_cipher_names, ctx->ciph_algo));
-   ctx->ctrg = rate_ctr_group_alloc(ctx, &mmctx_ctrg_desc, tlli);
+   ctx->ctrg = rate_ctr_group_alloc(ctx, &mmctx_ctrg_desc, rate_ctr_id);
if (!ctx->ctrg) {
LOGMMCTXP(LOGL_ERROR, ctx, "Cannot allocate counter group\n");
talloc_free(ctx);
@@ -246,40 +238,45 @@

return ctx;
 }
+/* Allocate a new SGSN MM context for GERAN_Gb */
+struct sgsn_mm_ctx *sgsn_mm_ctx_alloc_gb(uint32_t tlli,
+const struct gprs_ra_id *raid)
+{
+   struct sgsn_mm_ctx *ctx;

-/* Allocate a new SGSN MM context */
+   ctx = sgsn_mm_ctx_alloc(tlli);
+   if (!ctx)
+   return NULL;
+
+   memcpy(&ctx->ra, raid, sizeof(ctx->ra));
+   ctx->ran_type = MM_CTX_T_GERAN_Gb;
+   ctx->gb.tlli = tlli;
+   ctx->gb.mm_state = MM_IDLE;
+   ctx->ciph_algo = sgsn->cfg.cipher;
+
+   LOGMMCTXP(LOGL_DEBUG, ctx, "Allocated with %s cipher.\n",
+ get_value_string(gprs_cipher_names, ctx->ciph_algo));
+   return ctx;
+}
+
+/* Allocate a new SGSN MM context for UTRAN_Iu */
 struct sgsn_mm_ctx *sgsn_mm_ctx_alloc_iu(void *uectx)
 {
 #if BUILD_IU
struct sgsn_mm_ctx *ctx;
struct ranap_ue_conn_ctx *ue_ctx = uectx;

-   ctx = talloc_zero(tall_sgsn_ctx, struct sgsn_mm_ctx);
+   ctx = sgsn_mm_ctx_alloc(ue_ctx->conn_id);
if (!ctx)
return NULL;

+   /* Need to get RAID from IU conn */
+   ctx->ra = ue_ctx->ra_id;
ctx->ran_type = MM_CTX_T_UTRAN_Iu;
ctx->iu.ue_ctx = ue_ctx;
ctx->iu.ue_ctx->rab_assign_addr_enc = sgsn->cfg.iu.rab_assign_addr_enc;
ctx->iu.new_key = 1;
-   ctx->gmm_state = GMM_DEREGISTERED;
ctx->iu.mm_state = PMM_DETACHED;
-   ctx->auth_triplet.key_seq = GSM_KEY_SEQ_INVAL;
-   ctx->ctrg = rate_ctr_group_alloc(ctx, &mmctx_ctrg_desc, 
ue_ctx->conn_id);
-   if (!ctx->ctrg) {
-   LOGMMCTXP(LOGL_ERROR, ctx, "Cannot allocate counter group for 
%s.%u\n",
- mmctx_ctrg_desc.group_name_prefix, ue_ctx->conn_id);
-   talloc_free(ctx);
-   return NULL;
-   }
-   ctx->gmm_att_req.fsm = osmo_fsm_inst_alloc(&gmm_attach_req_fsm, ctx, 
ctx, LOGL_DEBUG, "gb_gmm_req");
-
-   /* Need to get RAID from IU conn */
-   ctx->ra = ctx->iu.ue_ctx->ra_id;
-
-   INIT_LLIST_HEAD(&ctx->pdp_list);
-
-   llist_add(&ctx->list, &sgsn_mm_ctxts);

return ctx;
 #else

--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15338
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Ib6c0427ac7b35295cf1caf2f28cb2a5c155b9d9c
Gerrit-Change-Number: 15338
Gerrit-PatchSet: 3
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...osmo-sgsn[master]: Move llc->MM/SM Gb specific glue code to its own file

[pespin]

pespin has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15336 )

Change subject: Move llc->MM/SM Gb specific glue code to its own file
..

Move llc->MM/SM Gb specific glue code to its own file

Now that we have RANAP/Iu handling specificities in its own file, let's
have also Gb specific glue code for messages coming from llc up to MM/SM
layer in its own file. This way same entry points in gprs_gmm.c are used
by Gb and Iu: gsm0408_rcv_gmm() (for MM) and gsm0408_rcv_gsm() (for SM).

Change-Id: Iaf57922a0970c1d03f6f1d6337d27ae3d4aaf32c
---
M include/osmocom/sgsn/Makefile.am
A include/osmocom/sgsn/gprs_gb.h
M include/osmocom/sgsn/gprs_gmm.h
M src/gprs/Makefile.am
A src/gprs/gprs_gb.c
M src/gprs/gprs_gmm.c
M tests/sgsn/Makefile.am
7 files changed, 110 insertions(+), 62 deletions(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  osmith: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/sgsn/Makefile.am b/include/osmocom/sgsn/Makefile.am
index b4cd5db..b91c9f1 100644
--- a/include/osmocom/sgsn/Makefile.am
+++ b/include/osmocom/sgsn/Makefile.am
@@ -3,6 +3,7 @@
crc24.h \
debug.h \
gb_proxy.h \
+   gprs_gb.h \
gprs_gb_parse.h \
gprs_gmm.h \
gprs_gmm_attach.h \
diff --git a/include/osmocom/sgsn/gprs_gb.h b/include/osmocom/sgsn/gprs_gb.h
new file mode 100644
index 000..3bc3676
--- /dev/null
+++ b/include/osmocom/sgsn/gprs_gb.h
@@ -0,0 +1,9 @@
+#pragma once
+
+#include 
+
+#include 
+#include 
+
+int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme,
+  bool drop_cipherable);
diff --git a/include/osmocom/sgsn/gprs_gmm.h b/include/osmocom/sgsn/gprs_gmm.h
index 047bd77..9316351 100644
--- a/include/osmocom/sgsn/gprs_gmm.h
+++ b/include/osmocom/sgsn/gprs_gmm.h
@@ -50,4 +50,8 @@
 void pdp_ctx_detach_mm_ctx(struct sgsn_pdp_ctx *pdp);

 void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state);
+void mmctx_state_timer_start(struct sgsn_mm_ctx *mm, unsigned int T);
+void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state);
+
+void msgid2mmctx(struct sgsn_mm_ctx *mm, const struct msgb *msg);
 #endif /* _GPRS_GMM_H */
diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am
index 384b893..85ba906 100644
--- a/src/gprs/Makefile.am
+++ b/src/gprs/Makefile.am
@@ -60,6 +60,7 @@
$(NULL)

 osmo_sgsn_SOURCES = \
+   gprs_gb.c \
gprs_gmm_attach.c \
gprs_gmm.c \
gprs_ranap.c \
diff --git a/src/gprs/gprs_gb.c b/src/gprs/gprs_gb.c
new file mode 100644
index 000..29bfc53
--- /dev/null
+++ b/src/gprs/gprs_gb.c
@@ -0,0 +1,91 @@
+/* Messages on the Gb interface (A/Gb mode) */
+
+/* (C) 2009-2015 by Harald Welte 
+ * (C) 2010 by On-Waves
+ * (C) 2019 by sysmocom s.f.m.c. GmbH 
+ *
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see .
+ *
+ */
+
+#include 
+
+#include 
+#include 
+
+#include "bscconfig.h"
+
+#include 
+#include 
+#include 
+
+/* Update the MM context state */
+static void gsm0408_gprs_notify_pdu_gb(struct sgsn_mm_ctx *mmctx)
+{
+   switch (mmctx->pmm_state) {
+   case MM_STANDBY:
+   mmctx_set_mm_state(mmctx, MM_READY);
+   break;
+   case MM_READY: /* RE-arm the timer upon receival of Gb PDUs */
+   mmctx_state_timer_start(mmctx, 3314);
+   break;
+   default:
+   break;
+   }
+}
+
+/* Main entry point for incoming 04.08 GPRS messages from Gb */
+int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme,
+  bool drop_cipherable)
+{
+   struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg);
+   uint8_t pdisc = gsm48_hdr_pdisc(gh);
+   struct sgsn_mm_ctx *mmctx;
+   struct gprs_ra_id ra_id;
+   int rc = -EINVAL;
+
+   bssgp_parse_cell_id(&ra_id, msgb_bcid(msg));
+   mmctx = sgsn_mm_ctx_by_tlli(msgb_tlli(msg), &ra_id);
+   if (mmctx) {
+   msgid2mmctx(mmctx, msg);
+   rate_ctr_inc(&mmctx->ctrg->ctr[GMM_CTR_PKTS_SIG_IN]);
+   mmctx->gb.llme = llme;
+   }
+
+   /* MMCTX can be NULL */
+
+   if (mmctx)
+   gsm0408_gprs_notify_pdu_gb(mmctx);

Change in ...osmo-bsc[master]: Cell Broadcast: CBSP and CBCH scheduling support

[pespin]

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/15373 )

Change subject: Cell Broadcast: CBSP and CBCH scheduling support
..


Patch Set 2:

(5 comments)

https://gerrit.osmocom.org/#/c/15373/2/doc/manuals/chapters/smscb.adoc
File doc/manuals/chapters/smscb.adoc:

https://gerrit.osmocom.org/#/c/15373/2/doc/manuals/chapters/smscb.adoc@43
PS2, Line 43: configuration more simple, ti also can operate in TCP client mode,
typo: ti->it.


https://gerrit.osmocom.org/#/c/15373/2/doc/manuals/chapters/smscb.adoc@44
PS2, Line 44: connecting to the CBC.  This way the BSCs all need to know the 
CBC IP
1- Extra space after dot.
2- "This way the BSCs all need to know IS the CBC IP address".


https://gerrit.osmocom.org/#/c/15373/2/doc/manuals/chapters/smscb.adoc@45
PS2, Line 45: address, but not vice-versa
Missing dot.


https://gerrit.osmocom.org/#/c/15373/2/src/osmo-bsc/smscb.c
File src/osmo-bsc/smscb.c:

https://gerrit.osmocom.org/#/c/15373/2/src/osmo-bsc/smscb.c@44
PS2, Line 44: /* replace the old head of an entire list with e new head; 
effectively moves the entire
"a new head"


https://gerrit.osmocom.org/#/c/15373/2/src/osmo-bsc/smscb.c@142
PS2, Line 142:  static struct osmo_cell_global_id cgi;
What about passing it as a parameter and filling it from there? This way space 
is not lost for users who don't plan to use CBCH.



--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15373
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ia0a0de862a104d0f447a5d6e56c7c83981b825c7
Gerrit-Change-Number: 15373
Gerrit-PatchSet: 2
Gerrit-Owner: laforge 
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin 
Gerrit-Comment-Date: Mon, 02 Sep 2019 09:41:21 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: gprs_gmm.c: Replace inet_ntoa with inet_ntop

[osmith]

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15352 )

Change subject: gprs_gmm.c: Replace inet_ntoa with inet_ntop
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15352
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I0c708d047122f349acf46797a9e5973040e7ae04
Gerrit-Change-Number: 15352
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Mon, 02 Sep 2019 09:25:05 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: Merge common allocation steps for Gb and Iu ctx

[osmith]

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15338 )

Change subject: Merge common allocation steps for Gb and Iu ctx
..


Patch Set 2: Code-Review+2

(1 comment)

https://gerrit.osmocom.org/#/c/15338/2//COMMIT_MSG
Commit Message:

https://gerrit.osmocom.org/#/c/15338/2//COMMIT_MSG@9
PS2, Line 9: functionalitites
functionalities



--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15338
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Ib6c0427ac7b35295cf1caf2f28cb2a5c155b9d9c
Gerrit-Change-Number: 15338
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Mon, 02 Sep 2019 09:22:41 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: Move llc->MM/SM Gb specific glue code to its own file

[osmith]

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15336 )

Change subject: Move llc->MM/SM Gb specific glue code to its own file
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15336
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Iaf57922a0970c1d03f6f1d6337d27ae3d4aaf32c
Gerrit-Change-Number: 15336
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Mon, 02 Sep 2019 09:16:30 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...pysim[master]: make writing SMSP optional

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/pysim/+/15312 )

Change subject: make writing SMSP optional
..

make writing SMSP optional

Change-Id: Ic5fdd397244cfe73b5b6a12883316072cc10f7b4
---
M pySim/cards.py
1 file changed, 8 insertions(+), 5 deletions(-)

Approvals:
  Jenkins Builder: Verified
  neels: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/pySim/cards.py b/pySim/cards.py
index cb42d83..55282aa 100644
--- a/pySim/cards.py
+++ b/pySim/cards.py
@@ -394,8 +394,9 @@
data, sw = self._scc.update_binary('6f78', 
lpad(p['acc'], 4))

# EF.SMSP
-   r = self._scc.select_file(['3f00', '7f10', '6f42'])
-   data, sw = self._scc.update_record('6f42', 1, lpad(p['smsp'], 
80))
+if p.get('smsp'):
+   r = self._scc.select_file(['3f00', '7f10', '6f42'])
+   data, sw = self._scc.update_record('6f42', 1, 
lpad(p['smsp'], 80))

# Set the Ki using proprietary command
pdu = '80d4020010' + p['ki']
@@ -535,7 +536,8 @@
r = self._scc.select_file(['3f00', '7f10'])

# write EF.SMSP
-   data, sw = self._scc.update_record('6f42', 1, lpad(p['smsp'], 
80))
+if p.get('smsp'):
+   data, sw = self._scc.update_record('6f42', 1, 
lpad(p['smsp'], 80))

def erase(self):
return
@@ -614,8 +616,9 @@
print("Programming AD failed with code %s"%sw)

# EF.SMSP
-   r = self._scc.select_file(['3f00', '7f10'])
-   data, sw = self._scc.update_record('6f42', 1, lpad(p['smsp'], 
104), force_len=True)
+   if p.get('smsp'):
+   r = self._scc.select_file(['3f00', '7f10'])
+   data, sw = self._scc.update_record('6f42', 1, 
lpad(p['smsp'], 104), force_len=True)

def erase(self):
return

--
To view, visit https://gerrit.osmocom.org/c/pysim/+/15312
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ic5fdd397244cfe73b5b6a12883316072cc10f7b4
Gerrit-Change-Number: 15312
Gerrit-PatchSet: 1
Gerrit-Owner: laforge 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-MessageType: merged

Change in ...osmo-msc[master]: log, cosmetic: add "RR" to "Ciphering Mode Complete"

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-msc/+/15318 )

Change subject: log, cosmetic: add "RR" to "Ciphering Mode Complete"
..

log, cosmetic: add "RR" to "Ciphering Mode Complete"

Distinguish the enclosed DTAP RR Ciphering Mode Complete message from the outer
BSSMAP Cipher Mode Complete message in the DEBUG log.

Change-Id: I80c69b491e2ddb932bc4295a01caaf6a903b1fe4
---
M src/libmsc/gsm_04_08.c
M tests/msc_vlr/msc_vlr_test_gsm_ciph.err
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c
index 086116f..0bdc4fb 100644
--- a/src/libmsc/gsm_04_08.c
+++ b/src/libmsc/gsm_04_08.c
@@ -1185,7 +1185,7 @@
if (!mi)
return 0;

-   LOG_MSC_A(msc_a, LOGL_DEBUG, "Ciphering Mode Complete contains Mobile 
Identity: %s\n",
+   LOG_MSC_A(msc_a, LOGL_DEBUG, "RR Ciphering Mode Complete contains 
Mobile Identity: %s\n",
  osmo_mi_name(mi->val, mi->len));

if (!vsub)
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err 
b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
index 7b9970d..4585e0f 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
@@ -1785,7 +1785,7 @@
 DVLR upd_hlr_vlr_fsm(IMSI-90170004620:GERAN-A:LU){UPD_HLR_VLR_S_INIT}: 
state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DBSSAP msc_a(IMSI-90170004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: 
DTAP
 DRLL msc_a(IMSI-90170004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 
04.08 message: RR GSM48_MT_RR_CIPH_M_COMPL
-DBSSAP msc_a(IMSI-90170004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Ciphering 
Mode Complete contains Mobile Identity: IMEI-SV-4234234234234275F
+DBSSAP msc_a(IMSI-90170004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RR 
Ciphering Mode Complete contains Mobile Identity: IMEI-SV-4234234234234275F
 DVLR set IMEISV on subscriber; IMSI=90170004620 IMEISV=4234234234234275
 DVLR set IMEI on subscriber; IMSI=90170004620 IMEI=42342342342342
 DVLR vlr_lu_fsm(IMSI-90170004620:GERAN-A:LU){VLR_ULA_S_WAIT_HLR_UPD}: 
Received Event VLR_ULA_E_ID_IMEISV

--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15318
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I80c69b491e2ddb932bc4295a01caaf6a903b1fe4
Gerrit-Change-Number: 15318
Gerrit-PatchSet: 4
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-MessageType: merged

Change in ...pysim[master]: make writing SMSP optional

[laforge]

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/pysim/+/15312 )

Change subject: make writing SMSP optional
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/pysim/+/15312
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ic5fdd397244cfe73b5b6a12883316072cc10f7b4
Gerrit-Change-Number: 15312
Gerrit-PatchSet: 1
Gerrit-Owner: laforge 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Comment-Date: Mon, 02 Sep 2019 09:15:29 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...simtrace2[master]: USB: place version string in interface

[laforge]

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/simtrace2/+/15176 )

Change subject: USB: place version string in interface
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/15176
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: I99361e313979711f4f45ad424a52faa3ddd7c558
Gerrit-Change-Number: 15176
Gerrit-PatchSet: 1
Gerrit-Owner: tsaitgaist 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Comment-Date: Mon, 02 Sep 2019 09:14:50 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...simtrace2[master]: USB: place version string in interface

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/simtrace2/+/15176 )

Change subject: USB: place version string in interface
..

USB: place version string in interface

previously the version string was in the iConfiguration field of a
dedicated USB configuration.
this configuration had no interface, but the USB specification
requires at least one interface.
an interface has been added to this configuration.
the version string is now in the iInterface field, and the
iConfiguration field contains "firmware version".
the USB specification does not require an end-point, and none are
present.

Change-Id: I99361e313979711f4f45ad424a52faa3ddd7c558
---
M firmware/libcommon/source/usb.c
1 file changed, 39 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/firmware/libcommon/source/usb.c b/firmware/libcommon/source/usb.c
index 9d3072f..e75646e 100644
--- a/firmware/libcommon/source/usb.c
+++ b/firmware/libcommon/source/usb.c
@@ -62,6 +62,7 @@
CARDEM_USIM4_INTF_STR,
// runtime strings
SERIAL_STR,
+   VERSION_CONF_STR,
VERSION_STR,
// count
STRING_DESC_CNT
@@ -69,7 +70,7 @@

 /** array of static (from usb_strings) and runtime (serial, version) USB 
strings
  */
-static const unsigned char *usb_strings_extended[ARRAY_SIZE(usb_strings) + 2];
+static const unsigned char *usb_strings_extended[ARRAY_SIZE(usb_strings) + 3];

 /* USB string for the serial (using 128-bit device ID) */
 static unsigned char usb_string_serial[] = {
@@ -110,6 +111,26 @@
 };

 /* USB string for the version */
+static const unsigned char usb_string_version_conf[] = {
+   USBStringDescriptor_LENGTH(16),
+   USBGenericDescriptor_STRING,
+   USBStringDescriptor_UNICODE('f'),
+   USBStringDescriptor_UNICODE('i'),
+   USBStringDescriptor_UNICODE('r'),
+   USBStringDescriptor_UNICODE('m'),
+   USBStringDescriptor_UNICODE('w'),
+   USBStringDescriptor_UNICODE('a'),
+   USBStringDescriptor_UNICODE('r'),
+   USBStringDescriptor_UNICODE('e'),
+   USBStringDescriptor_UNICODE(' '),
+   USBStringDescriptor_UNICODE('v'),
+   USBStringDescriptor_UNICODE('e'),
+   USBStringDescriptor_UNICODE('r'),
+   USBStringDescriptor_UNICODE('s'),
+   USBStringDescriptor_UNICODE('i'),
+   USBStringDescriptor_UNICODE('o'),
+   USBStringDescriptor_UNICODE('n'),
+};
 static const char git_version[] = GIT_VERSION;
 static unsigned char usb_string_version[2 + ARRAY_SIZE(git_version) * 2 - 2];

@@ -582,21 +603,34 @@
 typedef struct _SIMTraceDriverConfigurationDescriptorVersion {
/** Standard configuration descriptor. */
USBConfigurationDescriptor configuration;
+   USBInterfaceDescriptor version;
 } __attribute__ ((packed)) SIMTraceDriverConfigurationDescriptorVersion;

 static const SIMTraceDriverConfigurationDescriptorVersion
configurationDescriptorVersion = {
-   /* Standard configuration descriptor */
+   /* Standard configuration descriptor for the interface descriptor*/
.configuration = {
.bLength= sizeof(USBConfigurationDescriptor),
.bDescriptorType= USBGenericDescriptor_CONFIGURATION,
.wTotalLength   = 
sizeof(SIMTraceDriverConfigurationDescriptorVersion),
-   .bNumInterfaces = 0,
+   .bNumInterfaces = 1,
.bConfigurationValue= CFG_NUM_VERSION,
-   .iConfiguration = VERSION_STR,
+   .iConfiguration = VERSION_CONF_STR,
.bmAttributes   = USBD_BMATTRIBUTES,
.bMaxPower  = USBConfigurationDescriptor_POWER(100),
},
+   /* Interface standard descriptor just holding the version information */
+   .version = {
+   .bLength = sizeof(USBInterfaceDescriptor),
+   .bDescriptorType= USBGenericDescriptor_INTERFACE,
+   .bInterfaceNumber   = 0,
+   .bAlternateSetting  = 0,
+   .bNumEndpoints  = 0,
+   .bInterfaceClass= USB_CLASS_PROPRIETARY,
+   .bInterfaceSubClass = 0xff,
+   .bInterfaceProtocol = 0,
+   .iInterface = VERSION_STR,
+   },
 };

 const USBConfigurationDescriptor *configurationDescriptorsArr[] = {
@@ -693,6 +727,7 @@
usb_strings_extended[i] = usb_strings[i];
}
usb_strings_extended[SERIAL_STR] = usb_string_serial;
+   usb_strings_extended[VERSION_CONF_STR] = usb_string_version_conf;
usb_strings_extended[VERSION_STR] = usb_string_version;

// Initialize standard USB driver

--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/15176
To unsubscribe, or for 

Change in ...libosmocore[master]: codec/ecu: Introduce new generic Error Concealment Unit abstraction

[laforge]

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libosmocore/+/15026 )

Change subject: codec/ecu: Introduce new generic Error Concealment Unit 
abstraction
..


Patch Set 4: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15026
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I4d33c9c7c2d4c7462ff38a49c178b65accae1915
Gerrit-Change-Number: 15026
Gerrit-PatchSet: 4
Gerrit-Owner: laforge 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Comment-Date: Mon, 02 Sep 2019 09:13:49 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...libosmocore[master]: codec/ecu: Introduce new generic Error Concealment Unit abstraction

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/libosmocore/+/15026 )

Change subject: codec/ecu: Introduce new generic Error Concealment Unit 
abstraction
..

codec/ecu: Introduce new generic Error Concealment Unit abstraction

We don't want to expose the details of a given ECU implementation to
the user (e.g. osmo-bts), but have a generic abstraction layer where
an ECU implementation can simply register a few call-back functions
with the generic core.

As the developer and copyright holder of the related code, I hereby
state that any ECU implementation using 'struct osmo_ecu_ops' and
registering with the 'osmo_ecu_register()' function shall not be
considered as a derivative work under any applicable copyright law;
the copyleft terms of GPLv2 shall hence not apply to any such ECU
implementation.

The intent of the above exception is to allow anyone to combine
third party Error Concealment Unit implementations with libosmocore,
including but not limited to such published by ETSI.

Change-Id: I4d33c9c7c2d4c7462ff38a49c178b65accae1915
---
M include/osmocom/codec/ecu.h
M src/codec/Makefile.am
A src/codec/ecu.c
M src/codec/ecu_fr.c
M tests/codec/codec_ecu_fr_test.c
M tests/codec/codec_ecu_fr_test.ok
6 files changed, 447 insertions(+), 1 deletion(-)

Approvals:
  laforge: Looks good to me, approved
  fixeria: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/include/osmocom/codec/ecu.h b/include/osmocom/codec/ecu.h
index ec0a2f8..ec94670 100644
--- a/include/osmocom/codec/ecu.h
+++ b/include/osmocom/codec/ecu.h
@@ -13,3 +13,57 @@

 void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, const uint8_t *frame);
 int osmo_ecu_fr_conceal(struct osmo_ecu_fr_state *state, uint8_t *frame);
+
+enum osmo_ecu_codec {
+   OSMO_ECU_CODEC_HR,
+   OSMO_ECU_CODEC_FR,
+   OSMO_ECU_CODEC_EFR,
+   OSMO_ECU_CODEC_AMR,
+   _NUM_OSMO_ECU_CODECS
+};
+
+/***
+ * Generic ECU abstraction layer below
+ ***/
+
+/* As the developer and copyright holder of the related code, I hereby
+ * state that any ECU implementation using 'struct osmo_ecu_ops' and
+ * registering with the 'osmo_ecu_register()' function shall not be
+ * considered as a derivative work under any applicable copyright law;
+ * the copyleft terms of GPLv2 shall hence not apply to any such ECU
+ * implementation.
+ *
+ * The intent of the above exception is to allow anyone to combine third
+ * party Error Concealment Unit implementations with libosmocodec.
+ * including but not limited to such published by ETSI.
+ *
+ *   -- Harald Welte  on August 1, 2019.
+ */
+
+struct osmo_ecu_state {
+   enum osmo_ecu_codec codec;
+   uint8_t data[0];
+};
+
+/* initialize an ECU instance */
+struct osmo_ecu_state *osmo_ecu_init(void *ctx, enum osmo_ecu_codec codec);
+
+/* destroy an ECU instance */
+void osmo_ecu_destroy(struct osmo_ecu_state *st);
+
+/* process a received frame a substitute/erroneous frame */
+int osmo_ecu_frame_in(struct osmo_ecu_state *st, bool bfi,
+ const uint8_t *frame, unsigned int frame_bytes);
+
+/* generate output data for a substitute/erroneous frame */
+int osmo_ecu_frame_out(struct osmo_ecu_state *st, uint8_t *frame_out);
+
+struct osmo_ecu_ops {
+   struct osmo_ecu_state * (*init)(void *ctx, enum osmo_ecu_codec codec);
+   void (*destroy)(struct osmo_ecu_state *);
+   int (*frame_in)(struct osmo_ecu_state *st, bool bfi,
+   const uint8_t *frame, unsigned int frame_bytes);
+   int (*frame_out)(struct osmo_ecu_state *st, uint8_t *frame_out);
+};
+
+int osmo_ecu_register(const struct osmo_ecu_ops *ops, enum osmo_ecu_codec 
codec);
diff --git a/src/codec/Makefile.am b/src/codec/Makefile.am
index b522d43..c9d7a22 100644
--- a/src/codec/Makefile.am
+++ b/src/codec/Makefile.am
@@ -13,6 +13,6 @@

 lib_LTLIBRARIES = libosmocodec.la

-libosmocodec_la_SOURCES = gsm610.c gsm620.c gsm660.c gsm690.c ecu_fr.c
+libosmocodec_la_SOURCES = gsm610.c gsm620.c gsm660.c gsm690.c ecu.c ecu_fr.c
 libosmocodec_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
 libosmocodec_la_LIBADD = $(top_builddir)/src/libosmocore.la
diff --git a/src/codec/ecu.c b/src/codec/ecu.c
new file mode 100644
index 000..db7148c
--- /dev/null
+++ b/src/codec/ecu.c
@@ -0,0 +1,118 @@
+/* Core infrastructure for ECU implementations */
+
+/* (C) 2019 by Harald Welte 
+ *
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY W

Change in ...libosmocore[master]: MAXPATHLEN set if not defined

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/libosmocore/+/14797 )

Change subject: MAXPATHLEN set if not defined
..

MAXPATHLEN set if not defined

Change-Id: I1dce8ace228814b5a7246a00b31309ab9461d266
---
M src/vty/command.c
M src/vty/vty.c
2 files changed, 10 insertions(+), 0 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/vty/command.c b/src/vty/command.c
index 454a10c..35169eb 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -47,6 +47,11 @@
 #include 
 #include 

+#ifndef MAXPATHLEN
+  #define MAXPATHLEN 4096
+#endif
+
+
 /*! \addtogroup command
  *  @{
  *  VTY command handling
diff --git a/src/vty/vty.c b/src/vty/vty.c
index aa23fa0..babe0ef 100644
--- a/src/vty/vty.c
+++ b/src/vty/vty.c
@@ -67,6 +67,11 @@
 #include 
 #include 

+#ifndef MAXPATHLEN
+  #define MAXPATHLEN 4096
+#endif
+
+
 /* \addtogroup vty
  * @{
  * \file vty.c */

--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14797
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I1dce8ace228814b5a7246a00b31309ab9461d266
Gerrit-Change-Number: 14797
Gerrit-PatchSet: 3
Gerrit-Owner: Hoernchen 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Ruben Undheim 
Gerrit-Reviewer: laforge 
Gerrit-CC: pespin 
Gerrit-MessageType: merged

Change in ...osmo-sgsn[master]: Move lots of Iu/ranap specific code into its own file

[osmith]

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15335 )

Change subject: Move lots of Iu/ranap specific code into its own file
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15335
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I549042aaff045a378de77d657cc396ee08f22f33
Gerrit-Change-Number: 15335
Gerrit-PatchSet: 3
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Mon, 02 Sep 2019 09:11:51 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: sgsn: gtp: Drop related pdp contexts on echo timeout against GGSN

[pespin]

pespin has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15308 )

Change subject: sgsn: gtp: Drop related pdp contexts on echo timeout against 
GGSN
..

sgsn: gtp: Drop related pdp contexts on echo timeout against GGSN

Change-Id: I7e97bac1c13a2c26203eb64e590fd75d77eb44bd
---
M include/osmocom/sgsn/gprs_sgsn.h
M src/gprs/gprs_sgsn.c
M src/gprs/sgsn_libgtp.c
3 files changed, 16 insertions(+), 7 deletions(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  osmith: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h
index 17cafa3..eea9fb0 100644
--- a/include/osmocom/sgsn/gprs_sgsn.h
+++ b/include/osmocom/sgsn/gprs_sgsn.h
@@ -402,6 +402,7 @@
 struct sgsn_ggsn_ctx *sgsn_ggsn_ctx_find_alloc(uint32_t id);
 void sgsn_ggsn_ctx_drop_pdp(struct sgsn_pdp_ctx *pctx);
 int sgsn_ggsn_ctx_drop_all_pdp_except(struct sgsn_ggsn_ctx *ggsn, struct 
sgsn_pdp_ctx *except);
+int sgsn_ggsn_ctx_drop_all_pdp(struct sgsn_ggsn_ctx *ggsn);
 void sgsn_ggsn_ctx_add_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx 
*pdp);
 void sgsn_ggsn_ctx_remove_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx 
*pdp);
 void sgsn_ggsn_ctx_check_echo_timer(struct sgsn_ggsn_ctx *ggc);
diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c
index 7174bd5..829204e 100644
--- a/src/gprs/gprs_sgsn.c
+++ b/src/gprs/gprs_sgsn.c
@@ -759,6 +759,11 @@
return num;
 }

+int sgsn_ggsn_ctx_drop_all_pdp(struct sgsn_ggsn_ctx *ggsn)
+{
+   return sgsn_ggsn_ctx_drop_all_pdp_except(ggsn, NULL);
+}
+
 void sgsn_ggsn_ctx_add_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp)
 {
llist_add(&pdp->ggsn_list, &ggc->pdp_list);
diff --git a/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c
index 79d5543..a8ad527 100644
--- a/src/gprs/sgsn_libgtp.c
+++ b/src/gprs/sgsn_libgtp.c
@@ -469,7 +469,8 @@

 void sgsn_ggsn_echo_req(struct sgsn_ggsn_ctx *ggc)
 {
-   gtp_echo_req(ggc->gsn, ggc->gtp_version, NULL, &ggc->remote_addr);
+   LOGGGSN(ggc, LOGL_INFO, "GTP Tx Echo Request\n");
+   gtp_echo_req(ggc->gsn, ggc->gtp_version, ggc, &ggc->remote_addr);
 }

 #ifdef BUILD_IU
@@ -579,13 +580,15 @@
 }

 /* Confirmation of an GTP ECHO request */
-static int echo_conf(struct pdp_t *pdp, void *cbp, int recovery)
+static int echo_conf(void *cbp, bool timeout)
 {
-   if (recovery < 0) {
-   LOGP(DGPRS, LOGL_NOTICE, "GTP Echo Request timed out\n");
+   struct sgsn_ggsn_ctx *ggc = (struct sgsn_ggsn_ctx *)cbp;
+   if (timeout) {
+   LOGGGSN(ggc, LOGL_NOTICE, "GTP Echo Request timed out\n");
/* FIXME: if version == 1, retry with version 0 */
+   sgsn_ggsn_ctx_drop_all_pdp(ggc);
} else {
-   DEBUGP(DGPRS, "GTP Rx Echo Response\n");
+   LOGGGSN(ggc, LOGL_INFO, "GTP Rx Echo Response\n");
}
return 0;
 }
@@ -630,8 +633,8 @@

switch (type) {
case GTP_ECHO_REQ:
-   /* libgtp hands us the RECOVERY number instead of a cause */
-   return echo_conf(pdp, cbp, cause);
+   /* libgtp hands us the RECOVERY number instead of a cause (EOF 
on timeout) */
+   return echo_conf(cbp, cause == EOF);
case GTP_CREATE_PDP_REQ:
return create_pdp_conf(pdp, cbp, cause);
case GTP_DELETE_PDP_REQ:

--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15308
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I7e97bac1c13a2c26203eb64e590fd75d77eb44bd
Gerrit-Change-Number: 15308
Gerrit-PatchSet: 4
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-CC: fixeria 
Gerrit-MessageType: merged

Change in ...osmo-sgsn[master]: sgsn: gtp: Drop related pdp contexts on echo timeout against GGSN

[osmith]

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15308 )

Change subject: sgsn: gtp: Drop related pdp contexts on echo timeout against 
GGSN
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15308
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I7e97bac1c13a2c26203eb64e590fd75d77eb44bd
Gerrit-Change-Number: 15308
Gerrit-PatchSet: 3
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-CC: fixeria 
Gerrit-Comment-Date: Mon, 02 Sep 2019 09:04:58 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...osmo-ttcn3-hacks[master]: sgsn: Proper shutdown of RAN_Adapter components

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15295 )

Change subject: sgsn: Proper shutdown of RAN_Adapter components
..

sgsn: Proper shutdown of RAN_Adapter components

Otherwise TTCN3 errors sproadically during shutdown:

SCCP_Emulation.ttcn:5661 Receive operation on port SCCP_SP_PORT succeeded, 
message from SGSN_Test_0-RAN(414)
...
SCCP_Emulation.ttcn:5293 Sent on MTP3_SCCP_PORT to SGSN_Test_0-M3UA(415) 
@SCCP_Types.ASP_MTP3_TRANSFERreq_sccp
SCCP_Emulation.ttcn:5293 Outgoing message was mapped to 
@MTP3asp_Types.ASP_MTP3_TRANSFERreq
SCCP_Emulation.ttcn:5293 Dynamic test case error: Sending data on the 
connection of port MTP3_SCCP_PORT to 415:MTP3_SP_PORT failed. (Broken pipe)
SCCP_Emulation.ttcn:5293 setverdict(error): none -> error
"""

Similar shutdown is already done in f_cleanup() of SCCP_Tests.ttcn.

Related: OS#4176
Change-Id: I471eb851e5d41de5d8d974ec81be27024d7d313a
---
M library/RAN_Adapter.ttcnpp
M sgsn/SGSN_Tests.ttcn
2 files changed, 88 insertions(+), 0 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp
index e995e8d..f84fd34 100644
--- a/library/RAN_Adapter.ttcnpp
+++ b/library/RAN_Adapter.ttcnpp
@@ -47,6 +47,7 @@
MSC_SCCP_MTP3_parameters sccp_pars,
SCCP_PAR_Address sccp_addr_own,
SCCP_PAR_Address sccp_addr_peer,
+   RAN_Transport transport,

/* handler mode */
RAN_Emulation_CT vc_RAN
@@ -79,6 +80,7 @@
};
ba.sccp_addr_own := valueof(ts_SccpAddr_PC_SSN(cfg.own_pc, cfg.own_ssn, 
cfg.sio, cfg.sccp_service_type));
ba.sccp_addr_peer := valueof(ts_SccpAddr_PC_SSN(cfg.peer_pc, 
cfg.peer_ssn, cfg.sio, cfg.sccp_service_type));
+   ba.transport := cfg.transport;
 }


@@ -92,6 +94,8 @@
ba.vc_SCCP := SCCP_CT.create(id & "-SCCP");
if (isvalue(ops)) {
ba.vc_RAN := RAN_Emulation_CT.create(id & "-RAN");
+   } else {
+   ba.vc_RAN := null;
}
select (cfg.transport) {
case (BSSAP_TRANSPORT_AoIP, RANAP_TRANSPORT_IuCS) {
@@ -186,5 +190,27 @@
ba.vc_SCCP.start(SCCPStart(ba.sccp_pars));
 }

+function f_ran_adapter_cleanup(inout RAN_Adapter ba) {
+   if (ba.vc_RAN != null) {
+   if (ba.transport == RANAP_TRANSPORT_IuCS) {
+#ifdef RAN_EMULATION_RANAP
+   disconnect(ba.vc_RAN:RANAP, ba.vc_SCCP:SCCP_SP_PORT);
+#endif
+   } else {
+#ifdef RAN_EMULATION_BSSAP
+   disconnect(ba.vc_RAN:BSSAP, ba.vc_SCCP:SCCP_SP_PORT);
+#endif
+   }
+   ba.vc_RAN.stop;
+   }
+   if (ba.transport == BSSAP_TRANSPORT_AoIP or
+   ba.transport == RANAP_TRANSPORT_IuCS) {
+   unmap(ba.vc_M3UA:SCTP_PORT, system:sctp);
+   disconnect(ba.vc_M3UA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT);
+   ba.vc_M3UA.stop;
+   }
+   ba.vc_SCCP.stop;
+}
+

 }
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index b68df85..c9309dd 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -332,6 +332,14 @@
f_vty_enable_echo_interval(g_use_echo);
 }

+function f_cleanup() runs on test_CT {
+   var integer i;
+   for (i := 0; i < NUM_RNC; i := i+1) {
+   f_ran_adapter_cleanup(g_ranap[i]);
+   }
+   self.stop;
+}
+
 private function RncUnitdataCallback(RANAP_PDU ranap)
 runs on RAN_Emulation_CT return template RANAP_PDU {
var template RANAP_PDU resp := omit;
@@ -458,6 +466,7 @@
 testcase TC_wait_ns_up() runs on test_CT {
f_init();
f_sleep(20.0);
+   f_cleanup();
 }

 function f_send_llc(template (value) PDU_LLC llc_pdu, integer gb_index := 0) 
runs on BSSGP_ConnHdlr {
@@ -688,6 +697,7 @@
f_sleep(1.0);
vc_conn := f_start_handler(refers(f_TC_attach), testcasename(), g_gb, 
1);
vc_conn.done;
+   f_cleanup();
 }

 testcase TC_attach_mnc3() runs on test_CT {
@@ -696,6 +706,7 @@
f_sleep(1.0);
vc_conn := f_start_handler(refers(f_TC_attach), testcasename(), g_gb, 
1001);
vc_conn.done;
+   f_cleanup();
 }

 private function f_TC_attach_umts_aka_umts_res(charstring id) runs on 
BSSGP_ConnHdlr {
@@ -708,6 +719,7 @@
f_sleep(1.0);
vc_conn := f_start_handler(refers(f_TC_attach_umts_aka_umts_res), 
testcasename(), g_gb, 1002);
vc_conn.done;
+   f_cleanup();
 }

 private function f_TC_attach_umts_aka_gsm_sres(charstring id) runs on 
BSSGP_ConnHdlr {
@@ -720,6 +732,7 @@
f_sleep(1.0);
vc_conn := f_start_handler(refers(f_TC_attach_umts_aka_gsm_sres), 
testcasename(), g_gb, 1003);
vc_conn.done;
+   f_cleanup();
 }

 /* MS never responds to ID REQ, expect ATTACH REJECT */
@@ -746,6 +759,7 @@
f_init();
vc_conn := f_start_handler(refers(f_TC_attach_aut

Change in ...osmo-ttcn3-hacks[master]: sgsn: Proper shutdown of RAN_Adapter components

[laforge]

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15295 )

Change subject: sgsn: Proper shutdown of RAN_Adapter components
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15295
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I471eb851e5d41de5d8d974ec81be27024d7d313a
Gerrit-Change-Number: 15295
Gerrit-PatchSet: 3
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Mon, 02 Sep 2019 09:04:52 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...osmo-ggsn[master]: gtp_error_ind_conf(): fix: guard against an unknown GTP version

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-ggsn/+/15368 )

Change subject: gtp_error_ind_conf(): fix: guard against an unknown GTP version
..

gtp_error_ind_conf(): fix: guard against an unknown GTP version

This change fixes the following compiler warnings (found by Clang):

  gtp.c:2747:13: warning: variable 'pdp' is used uninitialized
  whenever 'if' condition is false
  [-Wsometimes-uninitialized]
 } else if (version == 1) {

  gtp.c:2781:14: note: uninitialized use occurs here
 OSMO_ASSERT(pdp);
 ^^^

Shall not happen in general, but let's make Clang happy.

Change-Id: Id471b22afd4c45435589a4edda0a804e66be3a7a
---
M gtp/gtp.c
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/gtp/gtp.c b/gtp/gtp.c
index 7cb82b6..3979165 100644
--- a/gtp/gtp.c
+++ b/gtp/gtp.c
@@ -2743,6 +2743,9 @@
GTP_LOGPKG(LOGL_ERROR, peer, pack, len, "Unknown PDP 
context\n");
return EOF;
}
+   } else {
+   LOGP(DLGTP, LOGL_ERROR, "Unknown version: %d\n", version);
+   return EOF;
}

GTP_LOGPKG(LOGL_ERROR, peer, pack, len,

--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15368
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: Id471b22afd4c45435589a4edda0a804e66be3a7a
Gerrit-Change-Number: 15368
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...osmo-ggsn[master]: gtp/gtp.c: cosmetic: use get_tid() where we need TID

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-ggsn/+/15369 )

Change subject: gtp/gtp.c: cosmetic: use get_tid() where we need TID
..

gtp/gtp.c: cosmetic: use get_tid() where we need TID

Change-Id: I39e92f25ed51665c8a615826ed52f35024bdd54b
---
M gtp/gtp.c
1 file changed, 3 insertions(+), 6 deletions(-)

Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/gtp/gtp.c b/gtp/gtp.c
index 3979165..22c95b5 100644
--- a/gtp/gtp.c
+++ b/gtp/gtp.c
@@ -1423,11 +1423,8 @@
pdp = &pdp_buf;
memset(pdp, 0, sizeof(struct pdp_t));

-   if (version == 0) {
-   uint64_t tid = be64toh(((union gtp_packet *)pack)->gtp0.h.tid);
-
-   pdp_set_imsi_nsapi(pdp, tid);
-   }
+   if (version == 0)
+   pdp_set_imsi_nsapi(pdp, get_tid(pack));
 
pdp->seq = seq;
pdp->sa_peer = *peer;
@@ -2712,7 +2709,7 @@

/* Find the context in question */
if (version == 0) {
-   if (gtp_pdp_tidget(gsn, &pdp, be64toh(((union gtp_packet 
*)pack)->gtp0.h.tid))) {
+   if (gtp_pdp_tidget(gsn, &pdp, get_tid(pack))) {
gsn->err_unknownpdp++;
GTP_LOGPKG(LOGL_ERROR, peer, pack, len,
"Unknown PDP context\n");

--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15369
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: I39e92f25ed51665c8a615826ed52f35024bdd54b
Gerrit-Change-Number: 15369
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...osmo-ggsn[master]: gtp_update_pdp_ind(): fix NULL-pointer dereference

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-ggsn/+/15367 )

Change subject: gtp_update_pdp_ind(): fix NULL-pointer dereference
..

gtp_update_pdp_ind(): fix NULL-pointer dereference

As stated in the comment above, we need to use the tunnel identifier
to find a GTP context, and derive both IMSI and NSAPI from that TID,
when speaking GTP version 0.

This change fixes the following warnings (found with Clang):

  gtp.c:2115:22: warning: variable 'pdp' is uninitialized
  when used here [-Wuninitialized]
 pdp_set_imsi_nsapi(pdp, tid);
^^^

  gtp.c:2118:34: warning: variable 'imsi' is uninitialized
  when used here [-Wuninitialized]
 if (gtp_pdp_getimsi(gsn, &pdp, imsi, nsapi))


  gtp.c:2118:40: warning: variable 'nsapi' is uninitialized
  when used here [-Wuninitialized]
 if (gtp_pdp_getimsi(gsn, &pdp, imsi, nsapi))
  ^

Change-Id: I8f1c8d0ba2e8189d97fe1bb5c872680e5ad1cd7a
---
M gtp/gtp.c
1 file changed, 4 insertions(+), 5 deletions(-)

Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/gtp/gtp.c b/gtp/gtp.c
index 88248d1..7cb82b6 100644
--- a/gtp/gtp.c
+++ b/gtp/gtp.c
@@ -2084,12 +2084,8 @@
/* For GTP1 we must use imsi and nsapi if imsi is present. Otherwise */
/* we have to use the tunnel endpoint identifier */
if (version == 0) {
-   uint64_t tid = be64toh(((union gtp_packet *)pack)->gtp0.h.tid);
-
-   pdp_set_imsi_nsapi(pdp, tid);
-
/* Find the context in question */
-   if (gtp_pdp_getimsi(gsn, &pdp, imsi, nsapi)) {
+   if (gtp_pdp_tidget(gsn, &pdp, get_tid(pack))) {
gsn->err_unknownpdp++;
GTP_LOGPKG(LOGL_ERROR, peer, pack,
len, "Unknown PDP context\n");
@@ -2097,6 +2093,9 @@
   len, NULL,
   GTPCAUSE_NON_EXIST);
}
+
+   /* Update IMSI and NSAPI */
+   pdp_set_imsi_nsapi(pdp, get_tid(pack));
} else if (version == 1) {
/* NSAPI (mandatory) */
if (gtpie_gettv1(ie, GTPIE_NSAPI, 0, &nsapi)) {

--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15367
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: I8f1c8d0ba2e8189d97fe1bb5c872680e5ad1cd7a
Gerrit-Change-Number: 15367
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...osmo-sgsn[master]: Introduce log helper LOGGGSN and log category DGTP

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15307 )

Change subject: Introduce log helper LOGGGSN and log category DGTP
..

Introduce log helper LOGGGSN and log category DGTP

It will be used in forthcoming commits.

Change-Id: I30f46f44af1d0eee324b1a995c1dad2e1315af7c
---
M include/osmocom/sgsn/debug.h
M include/osmocom/sgsn/gprs_sgsn.h
M src/gprs/sgsn_main.c
3 files changed, 13 insertions(+), 1 deletion(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  osmith: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/sgsn/debug.h b/include/osmocom/sgsn/debug.h
index 4d0fc69..29d500d 100644
--- a/include/osmocom/sgsn/debug.h
+++ b/include/osmocom/sgsn/debug.h
@@ -39,6 +39,7 @@
DVLR,
DIUCS,
DSIGTRAN,
+   DGTP,
Debug_LastEntry,
 };

diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h
index 48c063d..17cafa3 100644
--- a/include/osmocom/sgsn/gprs_sgsn.h
+++ b/include/osmocom/sgsn/gprs_sgsn.h
@@ -3,6 +3,7 @@

 #include 
 #include 
+#include 

 #include 
 #include 
@@ -405,6 +406,11 @@
 void sgsn_ggsn_ctx_remove_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx 
*pdp);
 void sgsn_ggsn_ctx_check_echo_timer(struct sgsn_ggsn_ctx *ggc);

+#define LOGGGSN(ggc, level, fmt, args...) { \
+   char _buf[INET_ADDRSTRLEN]; \
+   LOGP(DGTP, level, "GGSN(%" PRIu32 ":%s): " fmt, (ggc)->id, 
inet_ntop(AF_INET, &(ggc)->remote_addr, _buf, sizeof(_buf)), ## args); \
+   } while (0)
+
 struct apn_ctx {
struct llist_head list;
struct sgsn_ggsn_ctx *ggsn;
diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c
index 4232e23..9f2e111 100644
--- a/src/gprs/sgsn_main.c
+++ b/src/gprs/sgsn_main.c
@@ -340,7 +340,12 @@
.name = "DV42BIS",
.description = "V.42bis data compression (SNDCP)",
.enabled = 1, .loglevel = LOGL_NOTICE,
-   }
+   },
+   [DGTP] = {
+   .name = "DGTP",
+   .description = "GPRS Tunnelling Protocol (GTP)",
+   .enabled = 1, .loglevel = LOGL_NOTICE,
+   },
 };

 static const struct log_info gprs_log_info = {

--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15307
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I30f46f44af1d0eee324b1a995c1dad2e1315af7c
Gerrit-Change-Number: 15307
Gerrit-PatchSet: 4
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-CC: fixeria 
Gerrit-MessageType: merged

Change in ...osmo-gsm-manuals[master]: tests/Makefile.am: always put glossary at the end

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15351 )

Change subject: tests/Makefile.am: always put glossary at the end
..

tests/Makefile.am: always put glossary at the end

Make sure that glossary.adoc is the last file, when building the test
pdf with all common chapters included. Otherwise, newer asciidoc
versions will complain that we cannot have subchapters after the
glossary began:

asciidoc: ERROR: mgcp_extension_osmux.adoc: line 2: glossary section cannot 
contain sub-sections

Related: OS#4183
Change-Id: I91e857255b1b6d5b8708cc7f7b303a58403120d3
---
M tests/Makefile.am
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/tests/Makefile.am b/tests/Makefile.am
index b2f579d..6eba2c5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,10 +6,11 @@
 # Do not install any of the test pdfs
 OSMO_GSM_MANUALS_NO_INSTALL = 1

-# Generate adoc file that includes all chapters
+# Generate adoc file that includes all chapters (OS#4183: glossary.adoc must 
be the last file)
 ASCIIDOC = test-usermanual.adoc
 ASCIIDOC_DEPS =
-COMMON_CHAPTERS = $(shell find $(OSMO_GSM_MANUALS_DIR)/common/chapters -name 
'*.adoc')
+COMMON_CHAPTERS = $(shell find $(OSMO_GSM_MANUALS_DIR)/common/chapters -name 
'*.adoc' | grep -v glossary\.adoc) \
+ $(OSMO_GSM_MANUALS_DIR)/common/chapters/glossary.adoc
 $(ASCIIDOC): $(COMMON_CHAPTERS)
echo ":gfdl-enabled:" > $@
echo ":program-name: Test" >> $@

--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15351
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Change-Id: I91e857255b1b6d5b8708cc7f7b303a58403120d3
Gerrit-Change-Number: 15351
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...osmo-gsm-manuals[master]: tests/Makefile.am: always put glossary at the end

[laforge]

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15351 )

Change subject: tests/Makefile.am: always put glossary at the end
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15351
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Change-Id: I91e857255b1b6d5b8708cc7f7b303a58403120d3
Gerrit-Change-Number: 15351
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Mon, 02 Sep 2019 09:02:11 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...osmo-ttcn3-hacks[master]: sgsn: update configs for running without docker

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15350 )

Change subject: sgsn: update configs for running without docker
..

sgsn: update configs for running without docker

Base on docker-playground.git's ttcn3-sgsn-test/*.cfg files, change IPs
to 127.0.0.* (keep last octet), log to stderr. The reasoning behind the
IP change is, that using almost the same IP as in the docker configs
makes it easier to compare the configs.

Change-Id: I15b5a943e9c665dfd4eb6b30bff84afc8adeb4a2
---
M sgsn/SGSN_Tests.cfg
M sgsn/osmo-sgsn.cfg
A sgsn/osmo-stp.cfg
3 files changed, 71 insertions(+), 6 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved



diff --git a/sgsn/SGSN_Tests.cfg b/sgsn/SGSN_Tests.cfg
index 8782845..5167750 100644
--- a/sgsn/SGSN_Tests.cfg
+++ b/sgsn/SGSN_Tests.cfg
@@ -9,8 +9,30 @@
 [LOGGING]

 [TESTPORT_PARAMETERS]
+*.SGSNVTY.CTRL_HOSTNAME := "127.0.0.10"

 [MODULE_PARAMETERS]
+SGSN_Tests.mp_nsconfig := {
+   {
+   local_ip := "127.0.0.103",
+   remote_ip := "127.0.0.10"
+   },
+   {
+   local_ip := "127.0.0.103",
+   remote_ip := "127.0.0.10"
+   },
+   {
+   local_ip := "127.0.0.103",
+   remote_ip := "127.0.0.10"
+   }
+}
+SGSN_Tests.mp_ranap_cfg := {
+   {
+   sctp_addr := { 23908, "127.0.0.103", 2905, "127.0.0.200" }
+   }
+}
+SGSN_Tests.mp_hlr_ip := "127.0.0.103"
+SGSN_Tests.mp_ggsn_ip := "127.0.0.103"

 [MAIN_CONTROLLER]

diff --git a/sgsn/osmo-sgsn.cfg b/sgsn/osmo-sgsn.cfg
index 09da510..7ac50bc 100644
--- a/sgsn/osmo-sgsn.cfg
+++ b/sgsn/osmo-sgsn.cfg
@@ -28,10 +28,17 @@
 !
 line vty
  no login
- bind 127.0.0.1
+ bind 127.0.0.10
 ctrl
- bind 127.0.0.1
+ bind 127.0.0.10
 !
+cs7 instance 0
+ point-code 0.23.4
+ asp asp-clnt-OsmoSGSN-A 2905 0 m3ua
+  remote-ip 127.0.0.200
+ as as-clnt-OsmoSGSN-A m3ua
+  asp asp-clnt-OsmoSGSN-A
+  routing-key 3 0.23.4
 ns
  timer tns-block 3
  timer tns-block-retries 3
@@ -40,15 +47,15 @@
  timer tns-test 30
  timer tns-alive 3
  timer tns-alive-retries 10
- encapsulation udp local-ip 127.0.0.1
+ encapsulation udp local-ip 127.0.0.10
  encapsulation udp local-port 23000
  encapsulation framerelay-gre enabled 0
 bssgp
 sgsn
- gtp local-ip 127.0.0.1
- ggsn 0 remote-ip 127.0.0.2
+ gtp local-ip 127.0.0.10
+ ggsn 0 remote-ip 127.0.0.103
  ggsn 0 gtp-version 1
- gsup remote-ip 127.0.0.1
+ gsup remote-ip 127.0.0.103
  gsup remote-port 4222
  auth-policy remote
  gsup oap-id 0
diff --git a/sgsn/osmo-stp.cfg b/sgsn/osmo-stp.cfg
new file mode 100644
index 000..b42f967
--- /dev/null
+++ b/sgsn/osmo-stp.cfg
@@ -0,0 +1,36 @@
+!
+! OsmoSTP (0.8.1) configuration saved from vty
+!!
+!
+log gsmtap 127.0.0.1
+ logging level set-all debug
+!
+log stderr
+ logging color 1
+ logging filter all 1
+ logging print level 1
+ logging print category 1
+ logging print category-hex 0
+ logging print file basename last
+ logging print extended-timestamp 1
+ logging level set-all debug
+!
+line vty
+ no login
+!
+cs7 instance 0
+ xua rkm routing-key-allocation dynamic-permitted
+ asp virt-rnc0-0 23908 2905 m3ua
+  local-ip 127.0.0.200
+  remote-ip 127.0.0.103
+ as virt-rnc0 m3ua
+  asp virt-rnc0-0
+  routing-key 2 0.24.3
+ route-table system
+  update route 0.24.3 7.255.7 linkset virt-rnc0
+ listen m3ua 2905
+  local-ip 127.0.0.200
+  accept-asp-connections dynamic-permitted
+ listen ipa 5000
+  local-ip 127.0.0.200
+  accept-asp-connections dynamic-permitted

--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15350
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I15b5a943e9c665dfd4eb6b30bff84afc8adeb4a2
Gerrit-Change-Number: 15350
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...osmo-ttcn3-hacks[master]: BSSGP_Emulation: as_unblocked: fix SIG broadcast

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15348 )

Change subject: BSSGP_Emulation: as_unblocked: fix SIG broadcast
..

BSSGP_Emulation: as_unblocked: fix SIG broadcast

I am not aware that this caused breakage anywhere. But from reading the
patch, this is a regression that needs to be fixed.

Fixes: 955aa94504510139a12d223071cf49ef90788a3d ("BSSGP_Emulation: Abandon 
"BssgpDecoded" intermediate structure")
Change-Id: I36a9a4d61be52a4d86ac1cbf6e6976cf01cff7c6
---
M library/BSSGP_Emulation.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn
index f8b9f06..44946c1 100644
--- a/library/BSSGP_Emulation.ttcn
+++ b/library/BSSGP_Emulation.ttcn
@@ -593,7 +593,7 @@
// TITAN DOESN'T DO THIS, *SIGH*: "BSSGP_SP.send(dec) 
to all component;"
for (var integer i := 0; i < sizeof(ClientTable); i := 
i+1) {
if (isbound(ClientTable[i].comp_ref)) {
-   f_send_bssgp_dec(dec, vc_conn, 
BSSGP_SP_SIG);
+   f_send_bssgp_dec(dec, 
ClientTable[i].comp_ref, BSSGP_SP_SIG);
}
}
}

--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15348
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I36a9a4d61be52a4d86ac1cbf6e6976cf01cff7c6
Gerrit-Change-Number: 15348
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...osmo-ttcn3-hacks[master]: BSSGP_Emulation: add BssgpDecodeDepth

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15377 )

Change subject: BSSGP_Emulation: add BssgpDecodeDepth
..

BSSGP_Emulation: add BssgpDecodeDepth

Make the decoding level (BSSGP, LLC, SNDCP, L3) configurable, so the
existing PCU tests, that expect messages only decoded to the BSSGP
level, can pass again. Move the SNDCP decoding in f_dec_bssgp above the
L3 decoding, so f_dec_bssgp goes through the layers in the reverse order
of f_send_bssgp_dec.

I have verified, that all testsuites using the BSSGP Emulation (SGSN,
PCU, PCU-SNS) are still working with this patch.

Related: OS#4180
Fixes: 955aa94504510139a12d223071cf49ef90788a3d ("BSSGP_Emulation: Abandon 
"BssgpDecoded" intermediate structure")
Change-Id: I8f76385528c1de98c557cee451c0e0dfd182b605
---
M library/BSSGP_Emulation.ttcn
M pcu/PCU_Tests.ttcn
M sgsn/SGSN_Tests.ttcn
3 files changed, 38 insertions(+), 19 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn
index 44946c1..e3023ed 100644
--- a/library/BSSGP_Emulation.ttcn
+++ b/library/BSSGP_Emulation.ttcn
@@ -164,11 +164,19 @@
n_u_rx_last := -
 }

+type enumerated BssgpDecodeDepth {
+   BSSGP_DECODE_DEPTH_BSSGP,
+   BSSGP_DECODE_DEPTH_LLC,
+   BSSGP_DECODE_DEPTH_SNDCP,
+   BSSGP_DECODE_DEPTH_L3
+};
+
 type record BssgpConfig {
Nsvci nsei,
Nsvci bvci,
BssgpCellId cell_id,
-   boolean sgsn_role
+   boolean sgsn_role,
+   BssgpDecodeDepth depth
 };

 function f_BnsUdReq(template PDU_BSSGP pdu, BssgpBvci bvci)
@@ -706,25 +714,32 @@
};

/* Decode LLC, if it is a PDU that contains LLC */
-   if (ischosen(bssgp.pDU_BSSGP_DL_UNITDATA)) {
-   dec.llc := 
dec_PDU_LLC(bssgp.pDU_BSSGP_DL_UNITDATA.lLC_PDU.lLC_PDU);
-   } else if (ischosen(bssgp.pDU_BSSGP_UL_UNITDATA)) {
-   dec.llc := 
dec_PDU_LLC(bssgp.pDU_BSSGP_UL_UNITDATA.lLC_PDU.lLC_PDU);
-   }
-
-   /* Decode L3, if it is a LLC PDU containing L3 */
-   if (isvalue(dec.llc) and match(dec.llc, tr_LLC_UI_L3)) {
-   if (g_cfg.sgsn_role) {
-   dec.l3_mo := 
dec_PDU_L3_MS_SGSN(dec.llc.pDU_LLC_UI.information_field_UI);
-   } else {
-   dec.l3_mt := 
dec_PDU_L3_SGSN_MS(dec.llc.pDU_LLC_UI.information_field_UI);
+   if (g_cfg.depth >= BSSGP_DECODE_DEPTH_LLC) {
+   if (ischosen(bssgp.pDU_BSSGP_DL_UNITDATA)) {
+   dec.llc := 
dec_PDU_LLC(bssgp.pDU_BSSGP_DL_UNITDATA.lLC_PDU.lLC_PDU);
+   } else if (ischosen(bssgp.pDU_BSSGP_UL_UNITDATA)) {
+   dec.llc := 
dec_PDU_LLC(bssgp.pDU_BSSGP_UL_UNITDATA.lLC_PDU.lLC_PDU);
}
}

/* Decode SNDCP, if it is a LLC PDU containing user plane data */
-   if (isvalue(dec.llc) and match(dec.llc, tr_LLC_UI_USER)) {
-   dec.sndcp := 
dec_PDU_SN(dec.llc.pDU_LLC_UI.information_field_UI);
+   if (g_cfg.depth >= BSSGP_DECODE_DEPTH_SNDCP) {
+   if (isvalue(dec.llc) and match(dec.llc, tr_LLC_UI_USER)) {
+   dec.sndcp := 
dec_PDU_SN(dec.llc.pDU_LLC_UI.information_field_UI);
+   }
}
+
+   /* Decode L3, if it is a LLC PDU containing L3 */
+   if (g_cfg.depth >= BSSGP_DECODE_DEPTH_L3) {
+   if (isvalue(dec.llc) and match(dec.llc, tr_LLC_UI_L3)) {
+   if (g_cfg.sgsn_role) {
+   dec.l3_mo := 
dec_PDU_L3_MS_SGSN(dec.llc.pDU_LLC_UI.information_field_UI);
+   } else {
+   dec.l3_mt := 
dec_PDU_L3_SGSN_MS(dec.llc.pDU_LLC_UI.information_field_UI);
+   }
+   }
+   }
+
return dec;
 }

diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index a88dfed..0f43f28 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -44,7 +44,8 @@
},
cell_id := 20960
},
-   sgsn_role := true
+   sgsn_role := true,
+   depth := BSSGP_DECODE_DEPTH_BSSGP
};

NSConfiguration mp_nsconfig := {
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index db7d54b..b68df85 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -286,7 +286,8 @@
},
cell_id := 20960
},
-   sgsn_role := false
+   sgsn_role := false,
+   depth := BSSGP_DECODE_DEPTH_L3
};
g_gb[1].cfg := {
nsei := 97,
@@ -299,7 +300,8 @@
},
cell_id := 20961
},
-   sgsn_role := fal

Change in ...osmo-ttcn3-hacks[master]: pcu/GPRS_TBF.ttcn: less verbose logging

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15349 )

Change subject: pcu/GPRS_TBF.ttcn: less verbose logging
..

pcu/GPRS_TBF.ttcn: less verbose logging

Reduce the formatted log size of TC_ul_tbf from ~140 MB to ~8 MB.

Related: OS#3925
Change-Id: Ibccfc399a6e8b50e4f01b5f167c47fbbde4533ed
---
M pcu/GPRS_TBF.ttcn
1 file changed, 0 insertions(+), 3 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/pcu/GPRS_TBF.ttcn b/pcu/GPRS_TBF.ttcn
index 9fbe191..1c9a75b 100644
--- a/pcu/GPRS_TBF.ttcn
+++ b/pcu/GPRS_TBF.ttcn
@@ -144,8 +144,6 @@
us.cur_index := us.cur_index + len;
us.total_bytes_remain := us.total_bytes_remain - len;

-   log("copy_from_llc: ", ret, " us: ", us);
-
/* if we completed this PDU, move on to the next, resetting the index */
if (us.cur_index >= pdu_len) {
us.cur_pdu := us.cur_pdu +1;
@@ -307,7 +305,6 @@
var integer blk_len_net := f_gprs_blocksize(cs) - hdr_size;
var integer num_remain := f_div_round_up(us.total_bytes_remain, 
blk_len_net);
var integer cv := f_calc_cv(num_remain + sizeof(us.rlc_sent), us.bsn_p, 
us.num_ts, us.tbf.initial_cs, 14 /* FIXME */);
-   log("CV=", cv, ", num_rmain=", num_remain, " from ", us);
return cv;
 }


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15349
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ibccfc399a6e8b50e4f01b5f167c47fbbde4533ed
Gerrit-Change-Number: 15349
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...osmo-ttcn3-hacks[master]: pcu: add configs for running without docker

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14960 )

Change subject: pcu: add configs for running without docker
..

pcu: add configs for running without docker

Base on docker-playground.git's ttcn3-pcu-test/*.cfg files, change IPs
to 127.0.0.1, log to stderr, adjust pcu-socket path.

Change-Id: Iff3e5e6cf0c608680c8c5f9f83e8bc1032274ea9
---
A pcu/PCU_Tests_SNS.cfg
A pcu/osmo-bsc.cfg
A pcu/osmo-bts.cfg
A pcu/osmo-pcu-sns.cfg
A pcu/osmo-pcu.cfg
5 files changed, 346 insertions(+), 0 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved



diff --git a/pcu/PCU_Tests_SNS.cfg b/pcu/PCU_Tests_SNS.cfg
new file mode 100644
index 000..1419e1e
--- /dev/null
+++ b/pcu/PCU_Tests_SNS.cfg
@@ -0,0 +1,24 @@
+[ORDERED_INCLUDE]
+# Common configuration, shared between test suites
+"../Common.cfg"
+# testsuite specific configuration, not expected to change
+"./PCU_Tests.default"
+
+[LOGGING]
+
+[MODULE_PARAMETERS]
+PCU_Tests.mp_nsconfig := {
+   local_ip := "127.0.0.1",
+   local_udp_port := 23000,
+   remote_ip := "127.0.0.1",
+   remote_udp_port := 22000,
+   nsvci := 1234,
+   nsei := 1234
+}
+
+[TESTPORT_PARAMETERS]
+
+[MAIN_CONTROLLER]
+
+[EXECUTE]
+PCU_Tests_RAW_SNS.control
diff --git a/pcu/osmo-bsc.cfg b/pcu/osmo-bsc.cfg
new file mode 100644
index 000..c561955
--- /dev/null
+++ b/pcu/osmo-bsc.cfg
@@ -0,0 +1,194 @@
+!
+! OsmoBSC (1.1.2.236-5f22) configuration saved from vty
+!!
+password foo
+!
+log gsmtap 127.0.0.1
+ logging level set-all debug
+!
+
+log stderr
+ logging color 1
+ logging filter all 1
+ logging print level 1
+ logging print category 1
+ logging print category-hex 0
+ logging print file basename last
+ logging print extended-timestamp 1
+ logging level set-all debug
+ #~ logging level hodec info
+ #~ logging level ho info
+ #~ logging level nm info
+ #~ logging level meas info
+ #~ logging level lmi info
+ #~ logging level linp notice
+ #~ logging level lss7 notice
+ #~ logging level lsccp notice
+ #~ logging level lsua notice
+ #~ logging level lm3ua notice
+
+stats interval 5
+!
+line vty
+ no login
+ bind 127.0.0.1
+!
+e1_input
+ e1_line 0 driver ipa
+ e1_line 0 port 0
+ no e1_line 0 keepalive
+ ipa bind 127.0.0.1
+cs7 instance 0
+ point-code 0.23.3
+ asp asp-clnt-msc-0 2905 0 m3ua
+ as as-clnt-msc-0 m3ua
+  asp asp-clnt-msc-0
+  routing-key 2 0.23.3
+network
+ network country code 262
+ mobile network code 42
+ encryption a5 0
+ neci 1
+ paging any use tch 0
+ handover 0
+ handover1 window rxlev averaging 10
+ handover1 window rxqual averaging 1
+ handover1 window rxlev neighbor averaging 10
+ handover1 power budget interval 6
+ handover1 power budget hysteresis 3
+ handover1 maximum distance 
+ periodic location update 30
+ bts 0
+  type sysmobts
+  band DCS1800
+  cell_identity 20960
+  location_area_code 13135
+  dtx uplink force
+  dtx downlink
+  base_station_id_code 63
+  ms max power 15
+  cell reselection hysteresis 4
+  rxlev access min 0
+  radio-link-timeout 32
+  channel allocator ascending
+  rach tx integer 9
+  rach max transmission 7
+  channel-descrption attach 1
+  channel-descrption bs-pa-mfrms 5
+  channel-descrption bs-ag-blks-res 1
+  early-classmark-sending forbidden
+  early-classmark-sending-3g allowed
+  ip.access unit_id 1234 0
+  ip.access rsl-ip 127.0.0.1
+  oml ip.access stream_id 255 line 0
+  neighbor-list mode manual-si5
+  neighbor-list add arfcn 100
+  neighbor-list add arfcn 200
+  si5 neighbor-list add arfcn 10
+  si5 neighbor-list add arfcn 20
+  codec-support fr
+  gprs mode gprs
+  gprs 11bit_rach_support_for_egprs 0
+  gprs routing area 0
+  gprs network-control-order nc0
+  gprs cell bvci 1234
+  gprs cell timer blocking-timer 3
+  gprs cell timer blocking-retries 3
+  gprs cell timer unblocking-retries 3
+  gprs cell timer reset-timer 3
+  gprs cell timer reset-retries 3
+  gprs cell timer suspend-timer 10
+  gprs cell timer suspend-retries 3
+  gprs cell timer resume-timer 10
+  gprs cell timer resume-retries 3
+  gprs cell timer capability-update-timer 10
+  gprs cell timer capability-update-retries 3
+  gprs nsei 1234
+  gprs ns timer tns-block 3
+  gprs ns timer tns-block-retries 3
+  gprs ns timer tns-reset 3
+  gprs ns timer tns-reset-retries 3
+  gprs ns timer tns-test 30
+  gprs ns timer tns-alive 3
+  gprs ns timer tns-alive-retries 10
+  gprs nsvc 0 nsvci 1234
+  gprs nsvc 0 local udp port 22000
+  gprs nsvc 0 remote udp port 23000
+  gprs nsvc 0 remote ip 127.0.0.1
+  no force-combined-si
+  trx 0
+   rf_locked 0
+   arfcn 871
+   nominal power 23
+   max_power_red 20
+   rsl e1 tei 0
+   timeslot 0
+phys_chan_config CCCH+SDCCH4
+hopping enabled 0
+   timeslot 1
+phys_chan_config TCH/H
+hopping enabled 0
+   timeslot 2
+phys_chan_config TCH/H
+hopping enabled 0
+   timeslot 3
+phys_chan_config TCH/H
+hopping enabled 0

Change in ...osmo-ttcn3-hacks[master]: BSSGP_Emulation: add BssgpDecodeDepth

[laforge]

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15377 )

Change subject: BSSGP_Emulation: add BssgpDecodeDepth
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15377
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I8f76385528c1de98c557cee451c0e0dfd182b605
Gerrit-Change-Number: 15377
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Mon, 02 Sep 2019 09:01:43 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...osmo-ttcn3-hacks[master]: pcu/GPRS_TBF.ttcn: less verbose logging

[laforge]

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15349 )

Change subject: pcu/GPRS_TBF.ttcn: less verbose logging
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15349
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ibccfc399a6e8b50e4f01b5f167c47fbbde4533ed
Gerrit-Change-Number: 15349
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Mon, 02 Sep 2019 09:00:25 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...osmo-ttcn3-hacks[master]: BSSGP_Emulation: as_unblocked: fix SIG broadcast

[laforge]

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15348 )

Change subject: BSSGP_Emulation: as_unblocked: fix SIG broadcast
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15348
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I36a9a4d61be52a4d86ac1cbf6e6976cf01cff7c6
Gerrit-Change-Number: 15348
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Mon, 02 Sep 2019 09:00:14 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: Introduce log helper LOGGGSN and log category DGTP

[osmith]

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15307 )

Change subject: Introduce log helper LOGGGSN and log category DGTP
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15307
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I30f46f44af1d0eee324b1a995c1dad2e1315af7c
Gerrit-Change-Number: 15307
Gerrit-PatchSet: 3
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-CC: fixeria 
Gerrit-Comment-Date: Mon, 02 Sep 2019 09:00:27 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: gprs_gmm: clarify comment of Iu follow-on request

[laforge]

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15173 )

Change subject: gprs_gmm: clarify comment of Iu follow-on request
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15173
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Ib6b3a1b250de373656310a3c8f88d1d39bdcee60
Gerrit-Change-Number: 15173
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Mon, 02 Sep 2019 08:59:40 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: gprs_gmm: clarify comment of Iu follow-on request

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15173 )

Change subject: gprs_gmm: clarify comment of Iu follow-on request
..

gprs_gmm: clarify comment of Iu follow-on request

Change-Id: Ib6b3a1b250de373656310a3c8f88d1d39bdcee60
---
M src/gprs/gprs_gmm.c
1 file changed, 10 insertions(+), 2 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c
index d232156..185cd9a 100644
--- a/src/gprs/gprs_gmm.c
+++ b/src/gprs/gprs_gmm.c
@@ -1404,7 +1404,11 @@
goto err_inval;
cur += msnc_len;

-   /* TODO: In iu mode - handle follow-on request */
+   /* TODO: In iu mode - handle follow-on request.
+* The follow-on request can be signaled in an Attach Request on IuPS.
+* This means the MS/UE asks to keep the PS connection open for further 
requests
+* after the Attach Request succeed.
+* The SGSN can decide if it close the connection or not. Both are spec 
conform. */

/* aTTACH Type 10.5.5.2 */
att_type = *cur++ & 0x07;
@@ -1742,7 +1746,11 @@
enum gsm48_gmm_cause reject_cause = GMM_CAUSE_PROTO_ERR_UNSPEC;
int rc;

-   /* TODO: In iu mode - handle follow-on request */
+   /* TODO: In iu mode - handle follow-on request.
+* The follow-on request can be signaled in an Attach Request on IuPS.
+* This means the MS/UE asks to keep the PS connection open for further 
requests
+* after the Attach Request succeed.
+* The SGSN can decide if it close the connection or not. Both are spec 
conform. */

/* Update Type 10.5.5.18 */
upd_type = *cur++ & 0x07;

--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15173
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Ib6b3a1b250de373656310a3c8f88d1d39bdcee60
Gerrit-Change-Number: 15173
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...osmo-sgsn[master]: gprs_gmm: only update gb/iu cell information when Iu/Gb present

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15172 )

Change subject: gprs_gmm: only update gb/iu cell information when Iu/Gb present
..

gprs_gmm: only update gb/iu cell information when Iu/Gb present

This function should not do the transistion of Iu/Gb. Only copy simple data

Change-Id: Id52761f3ea655a2d0cc663a950154c6b7c1b5f7a
---
M src/gprs/gprs_gmm.c
1 file changed, 16 insertions(+), 10 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c
index e44b3ec..d232156 100644
--- a/src/gprs/gprs_gmm.c
+++ b/src/gprs/gprs_gmm.c
@@ -375,17 +375,23 @@
 /* Store BVCI/NSEI in MM context */
 static void msgid2mmctx(struct sgsn_mm_ctx *mm, const struct msgb *msg)
 {
-   mm->gb.bvci = msgb_bvci(msg);
-   mm->gb.nsei = msgb_nsei(msg);
-   /* In case a Iu connection is reconnected we need to update the ue ctx 
*/
-   mm->iu.ue_ctx = MSG_IU_UE_CTX(msg);
-   if (mm->ran_type == MM_CTX_T_UTRAN_Iu
-   && mm->iu.ue_ctx) {
-#ifdef BUILD_IU
-   mm->iu.ue_ctx->rab_assign_addr_enc =
-   sgsn->cfg.iu.rab_assign_addr_enc;
-#endif
+   /* check for Iu or Gb */
+   if (!MSG_IU_UE_CTX(msg)) {
+   mm->gb.bvci = msgb_bvci(msg);
+   mm->gb.nsei = msgb_nsei(msg);
}
+#ifdef BUILD_IU
+   else {
+   /* In case a Iu connection is reconnected we need to update the 
ue ctx */
+   /* FIXME: the old ue_ctx have to be freed/disconnected */
+   mm->iu.ue_ctx = MSG_IU_UE_CTX(msg);
+   if (mm->ran_type == MM_CTX_T_UTRAN_Iu
+   && mm->iu.ue_ctx) {
+   mm->iu.ue_ctx->rab_assign_addr_enc =
+   sgsn->cfg.iu.rab_assign_addr_enc;
+   }
+   }
+#endif
 }

 /* Store BVCI/NSEI in MM context */

--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15172
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Id52761f3ea655a2d0cc663a950154c6b7c1b5f7a
Gerrit-Change-Number: 15172
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...osmo-sgsn[master]: gprs_gmm: gsm48_rx_gmm_att_req(): refactor duplicated code

[laforge]

laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15174 )

Change subject: gprs_gmm: gsm48_rx_gmm_att_req(): refactor duplicated code
..

gprs_gmm: gsm48_rx_gmm_att_req(): refactor duplicated code

Change-Id: I709f847802a975e1a75d0b87ac5125240cfd0854
---
M src/gprs/gprs_gmm.c
1 file changed, 6 insertions(+), 10 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c
index 185cd9a..00335e8 100644
--- a/src/gprs/gprs_gmm.c
+++ b/src/gprs/gprs_gmm.c
@@ -1460,11 +1460,6 @@
}
osmo_strlcpy(ctx->imsi, mi_string, sizeof(ctx->imsi));
}
-   if (ctx->ran_type == MM_CTX_T_GERAN_Gb) {
-   ctx->gb.tlli = msgb_tlli(msg);
-   ctx->gb.llme = llme;
-   }
-   msgid2mmctx(ctx, msg);
break;
case GSM_MI_TYPE_TMSI:
memcpy(&tmsi, mi+1, 4);
@@ -1485,11 +1480,6 @@
}
ctx->p_tmsi = tmsi;
}
-   if (ctx->ran_type == MM_CTX_T_GERAN_Gb) {
-   ctx->gb.tlli = msgb_tlli(msg);
-   ctx->gb.llme = llme;
-   }
-   msgid2mmctx(ctx, msg);
break;
default:
LOGMMCTXP(LOGL_NOTICE, ctx, "Rejecting ATTACH REQUEST with "
@@ -1497,6 +1487,12 @@
reject_cause = GMM_CAUSE_MS_ID_NOT_DERIVED;
goto rejected;
}
+
+   if (ctx->ran_type == MM_CTX_T_GERAN_Gb) {
+   ctx->gb.tlli = msgb_tlli(msg);
+   ctx->gb.llme = llme;
+   }
+   msgid2mmctx(ctx, msg);
/* Update MM Context with currient RA and Cell ID */
ctx->ra = ra_id;
if (ctx->ran_type == MM_CTX_T_GERAN_Gb)

--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15174
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I709f847802a975e1a75d0b87ac5125240cfd0854
Gerrit-Change-Number: 15174
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...osmo-sgsn[master]: gprs_gmm: gsm48_rx_gmm_att_req(): refactor duplicated code

[laforge]

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15174 )

Change subject: gprs_gmm: gsm48_rx_gmm_att_req(): refactor duplicated code
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15174
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I709f847802a975e1a75d0b87ac5125240cfd0854
Gerrit-Change-Number: 15174
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Mon, 02 Sep 2019 08:58:17 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...osmo-sgsn[master]: gprs_gmm: only update gb/iu cell information when Iu/Gb present

[laforge]

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/15172 )

Change subject: gprs_gmm: only update gb/iu cell information when Iu/Gb present
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15172
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Id52761f3ea655a2d0cc663a950154c6b7c1b5f7a
Gerrit-Change-Number: 15172
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Mon, 02 Sep 2019 08:58:52 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...osmo-bsc[master]: doc: update bsc_vty_reference.xml

[pespin]

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/15378 )

Change subject: doc: update bsc_vty_reference.xml
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15378
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I6244a0de8802f437b5b291c76b4fc7bd4262baf8
Gerrit-Change-Number: 15378
Gerrit-PatchSet: 1
Gerrit-Owner: laforge 
Gerrit-Reviewer: pespin 
Gerrit-CC: Jenkins Builder
Gerrit-Comment-Date: Mon, 02 Sep 2019 08:57:09 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment