[PATCH] osmo-ttcn3-hacks[master]: */regen_makefile.sh: drop multiple naming of main ttcn file

[Neels Hofmeyr]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/7771

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

*/regen_makefile.sh: drop multiple naming of main ttcn file

In FILES="*.ttcn", the main FOO_Tests.ttcn is already included, no need to name
it a second time.

Change-Id: I94f37d64198ce2e36c5cd8892ccd33987e1fba32
---
M bsc-nat/regen_makefile.sh
M bsc/regen_makefile.sh
M bts/regen_makefile.sh
M ggsn_tests/regen_makefile.sh
M hlr/regen_makefile.sh
M lapdm/regen_makefile.sh
M mgw/regen_makefile.sh
M msc/regen_makefile.sh
M pcu/regen_makefile.sh
M selftest/regen_makefile.sh
M sgsn/regen_makefile.sh
M sip/regen_makefile.sh
M sysinfo/regen_makefile.sh
13 files changed, 13 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/71/7771/2

diff --git a/bsc-nat/regen_makefile.sh b/bsc-nat/regen_makefile.sh
index 5c25366..bf452df 100755
--- a/bsc-nat/regen_makefile.sh
+++ b/bsc-nat/regen_makefile.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 
-MAIN=IPA_Test.ttcn
-
 FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc 
IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc 
RTP_EncDec.cc SDP_EncDec.cc *.c MGCP_CodecPort_CtrlFunctDef.cc"
 
 export CPPFLAGS_TTCN3="-DIPA_EMULATION_SCCP -DIPA_EMULATION_MGCP 
-DUSE_MTP3_DISTRIBUTOR"
 
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh $FILES
diff --git a/bsc/regen_makefile.sh b/bsc/regen_makefile.sh
index 1e52252..dd96183 100755
--- a/bsc/regen_makefile.sh
+++ b/bsc/regen_makefile.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 
-MAIN=BSC_Tests.ttcn
-
 FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc 
IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc SCTPasp_PT.cc 
RTP_EncDec.cc SDP_EncDec.cc RTP_CodecPort_CtrlFunctDef.cc 
MGCP_CodecPort_CtrlFunctDef.cc IuUP_EncDec.cc Native_FunctionDefs.cc 
TELNETasp_PT.cc *.c"
 
 export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL -DIPA_EMULATION_MGCP 
-DUSE_MTP3_DISTRIBUTOR"
 
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh $FILES
diff --git a/bts/regen_makefile.sh b/bts/regen_makefile.sh
index 9ed5a06..10d1d90 100755
--- a/bts/regen_makefile.sh
+++ b/bts/regen_makefile.sh
@@ -4,4 +4,4 @@
 
 export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL"
 
-../regen-makefile.sh BTS_Tests.ttcn $FILES
+../regen-makefile.sh $FILES
diff --git a/ggsn_tests/regen_makefile.sh b/ggsn_tests/regen_makefile.sh
index 6db1a3d..0ae60d9 100755
--- a/ggsn_tests/regen_makefile.sh
+++ b/ggsn_tests/regen_makefile.sh
@@ -2,4 +2,4 @@
 
 FILES="*.ttcn IPL4asp_PT.cc  IPL4asp_discovery.cc  TCCConversion.cc  
TCCInterface.cc GTPC_EncDec.cc GTPU_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc 
ICMPv6_EncDec.cc IP_EncDec.cc Native_FunctionDefs.cc UDP_EncDec.cc 
ICMP_EncDec.cc TELNETasp_PT.cc"
 
-../regen-makefile.sh GGSN_Tests.ttcn $FILES
+../regen-makefile.sh $FILES
diff --git a/hlr/regen_makefile.sh b/hlr/regen_makefile.sh
index 56f6671..73b4ec6 100755
--- a/hlr/regen_makefile.sh
+++ b/hlr/regen_makefile.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 
-MAIN="HLR_Tests.ttcn"
-
 FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc 
IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc TELNETasp_PT.cc"
 
 export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL"
 
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh $FILES
diff --git a/lapdm/regen_makefile.sh b/lapdm/regen_makefile.sh
index bb02fe8..99ecb92 100755
--- a/lapdm/regen_makefile.sh
+++ b/lapdm/regen_makefile.sh
@@ -2,4 +2,4 @@
 
 FILES="*.ttcn UD_PT.cc UD_PT.hh RLCMAC_EncDec.cc 
L1CTL_PortType_CtrlFunctDef.cc"
 
-../regen-makefile.sh L1CTL_Test.ttcn $FILES
+../regen-makefile.sh $FILES
diff --git a/mgw/regen_makefile.sh b/mgw/regen_makefile.sh
index 2b7d1f4..2aec794 100755
--- a/mgw/regen_makefile.sh
+++ b/mgw/regen_makefile.sh
@@ -2,4 +2,4 @@
 
 FILES="*.ttcn SDP_EncDec.cc *.c MGCP_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc 
IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RTP_EncDec.cc 
RTP_CodecPort_CtrlFunctDef.cc IuUP_EncDec.cc "
 
-../regen-makefile.sh MGCP_Test.ttcn $FILES
+../regen-makefile.sh $FILES
diff --git a/msc/regen_makefile.sh b/msc/regen_makefile.sh
index 29b3f05..8abd3e0 100755
--- a/msc/regen_makefile.sh
+++ b/msc/regen_makefile.sh
@@ -4,4 +4,4 @@
 
 export CPPFLAGS_TTCN3="-DIPA_EMULATION_MGCP -DIPA_EMULATION_GSUP 
-DUSE_MTP3_DISTRIBUTOR"
 
-../regen-makefile.sh MSC_Tests.ttcn $FILES
+../regen-makefile.sh $FILES
diff --git a/pcu/regen_makefile.sh b/pcu/regen_makefile.sh
index 7eefd2c..f09e350 100755
--- a/pcu/regen_makefile.sh
+++ b/pcu/regen_makefile.sh
@@ -2,4 +2,4 @@
 
 FILES="*.ttcn BSSGP_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc 
TCCConversion.cc TCCInterface.cc NS_CodecPort_CtrlFunctDef.cc UD_PT.cc 
RLCMAC_EncDec.cc LLC_EncDec.cc L1CTL_PortType_CtrlFunctDef.cc"
 
-../regen-makefile.sh PCU_Tests.ttcn $FILES
+../regen-makefile.sh $FILES
diff --git a/selftest/regen_makefile.sh b/selftest/regen_makefile.sh
index 2503fca..14e6510 100755
--- a/selftest/regen_makefile.sh
+++ 

osmo-ttcn3-hacks[master]: */regen_makefile.sh: drop multiple naming of main ttcn file

[Neels Hofmeyr]

Patch Set 2:

Is there any reason why the main file should be listed first? Couldn't see any 
adverse effects in running the BSC tests without that.

-- 
To view, visit https://gerrit.osmocom.org/7771
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I94f37d64198ce2e36c5cd8892ccd33987e1fba32
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

[PATCH] osmo-ttcn3-hacks[master]: bsc/regen_makefile.sh: drop multiple naming of BSC_Tests.ttcn

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/7771

bsc/regen_makefile.sh: drop multiple naming of BSC_Tests.ttcn

Change-Id: I94f37d64198ce2e36c5cd8892ccd33987e1fba32
---
M bsc/regen_makefile.sh
1 file changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/71/7771/1

diff --git a/bsc/regen_makefile.sh b/bsc/regen_makefile.sh
index 1e52252..dd96183 100755
--- a/bsc/regen_makefile.sh
+++ b/bsc/regen_makefile.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 
-MAIN=BSC_Tests.ttcn
-
 FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc 
IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc SCTPasp_PT.cc 
RTP_EncDec.cc SDP_EncDec.cc RTP_CodecPort_CtrlFunctDef.cc 
MGCP_CodecPort_CtrlFunctDef.cc IuUP_EncDec.cc Native_FunctionDefs.cc 
TELNETasp_PT.cc *.c"
 
 export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL -DIPA_EMULATION_MGCP 
-DUSE_MTP3_DISTRIBUTOR"
 
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh $FILES

-- 
To view, visit https://gerrit.osmocom.org/7771
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I94f37d64198ce2e36c5cd8892ccd33987e1fba32
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 

Jenkins build is back to normal : master-osmo-bts » lc15,origin/nrw/litecell15-next,default,osmocom-master-debian9 #501

[jenkins]

See 

Build failed in Jenkins: master-osmo-bts » lc15, origin/nrw/litecell15-next,default,osmocom-master-debian9 #500

[jenkins]

See 


--
[...truncated 112.74 KB...]
+ project=libosmo-abis
+ branch=master
+ git branch -a
+ grep -c remotes/origin/master$
+ [ x1 != x0 ]
+ branch=origin/master
+ test -d libosmo-abis
+ cd libosmo-abis
+ git fetch --tags origin
+ git fetch origin
+ deps= osmo-clean-workspace.sh
+ chmod -R +w .
+ git checkout -f HEAD
+ git clean -dxf
+ [ -d  ]
+ [ -d layer1-headers ]
+ git checkout -f origin/master
HEAD is now at 43b5b69... configure.ac: Fix condition check for 
RTP_SIGNAL_PTR_CAST define
+ git rev-parse HEAD
43b5b69bb890441c7285541b36ef986063eab8cb
+ cd libosmo-abis
+ mkdir -p 

+ autoreconf --install --force
libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
configure.ac:20: installing './compile'
configure.ac:22: installing './config.guess'
configure.ac:22: installing './config.sub'
configure.ac:8: installing './install-sh'
configure.ac:8: installing './missing'
src/Makefile.am: installing './depcomp'
+ ./configure 
--prefix=
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports nested variables... yes
checking whether make supports nested variables... (cached) yes
checking whether make sets $(MAKE)... (cached) yes
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables... 
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking whether gcc understands -c and -o together... yes
checking for style of include used by make... GNU
checking dependency style of gcc... gcc3
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking how to print strings... printf
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu 
format... func_convert_file_noop
checking how to convert x86_64-pc-linux-gnu file names to toolchain format... 
func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for ar... ar
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from gcc object... ok
checking for sysroot... no
checking for a working dd... /bin/dd
checking how to truncate binary pipes... /bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking how to run the C preprocessor... gcc -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking for dlfcn.h... yes
checking for objdir... .libs
checking if gcc supports -fno-rtti -fno-exceptions... no
checking for gcc option to produce PIC... -fPIC -DPIC
checking if gcc PIC flag -fPIC -DPIC works... yes
checking if gcc static flag -static works... yes
checking if gcc supports -c -o file.o... yes

Jenkins build is back to normal : master-osmo-iuh » a1=default,a2=default,a3=default,osmocom-master-debian9 #909

[jenkins]

See 

[MERGED] osmo-msc[master]: fix BSC Clear Request

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: fix BSC Clear Request
..


fix BSC Clear Request

On receiving a Clear Request, don't send a Clear Command "out of band", let the
FSM do the release handling by invoking msc_subscr_conn_mo_close().

Fixes: ttcn3 MSC_Tests.TC_lu_clear_request
Change-Id: I168b889ac7989641cc679b781dcffb87ff13a710
---
M src/libmsc/a_iface_bssap.c
1 file changed, 2 insertions(+), 8 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c
index 87ccf05..6d5848a 100644
--- a/src/libmsc/a_iface_bssap.c
+++ b/src/libmsc/a_iface_bssap.c
@@ -216,8 +216,6 @@
 static int bssmap_rx_clear_rqst(struct gsm_subscriber_connection *conn,
struct msgb *msg, struct tlv_parsed *tp)
 {
-   int rc;
-   struct msgb *msg_resp;
uint8_t cause;
 
LOGPCONN(conn, LOGL_INFO, "Rx BSSMAP CLEAR REQUEST\n");
@@ -228,13 +226,9 @@
}
cause = TLVP_VAL(tp, GSM0808_IE_CAUSE)[0];
 
-   /* Respond with clear command */
-   msg_resp = gsm0808_create_clear_command(GSM0808_CAUSE_CALL_CONTROL);
-   rc = osmo_sccp_tx_data_msg(conn->a.scu, conn->a.conn_id, msg_resp);
+   msc_subscr_conn_mo_close(conn, cause);
 
-   msc_clear_request(conn, cause);
-
-   return rc;
+   return 0;
 }
 
 /* Endpoint to handle BSSMAP clear complete */

-- 
To view, visit https://gerrit.osmocom.org/7707
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I168b889ac7989641cc679b781dcffb87ff13a710
Gerrit-PatchSet: 3
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] osmo-msc[master]: cosmetic: embed compl_l3_type in FSM id

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: cosmetic: embed compl_l3_type in FSM id
..


cosmetic: embed compl_l3_type in FSM id

In the subscr_conn_fsm instance's ID, include the Complete Layer 3 type, so
that we can see on the first glance whether a state transition belongs to MO or
MT.

The huge patch is due to the cosmetic change affecting nearly every single log
line in the msc_vlr_tests, by nature of changing the FSM's ID.

Related: OS#3122
Change-Id: I2a7e27e0f16df1872dcda64cb928c3b8528ea3f7
---
M src/libmsc/subscr_conn.c
M tests/msc_vlr/msc_vlr_test_authen_reuse.err
M tests/msc_vlr/msc_vlr_test_call.err
M tests/msc_vlr/msc_vlr_test_gsm_authen.err
M tests/msc_vlr/msc_vlr_test_gsm_ciph.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
M tests/msc_vlr/msc_vlr_test_no_authen.err
M tests/msc_vlr/msc_vlr_test_reject_concurrency.err
M tests/msc_vlr/msc_vlr_test_rest.err
M tests/msc_vlr/msc_vlr_test_umts_authen.err
12 files changed, 7,132 insertions(+), 7,132 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified




-- 
To view, visit https://gerrit.osmocom.org/7708
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a7e27e0f16df1872dcda64cb928c3b8528ea3f7
Gerrit-PatchSet: 3
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] osmo-msc[master]: refactor subscr_conn and subscr_conn_fsm de-/alloc

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: refactor subscr_conn and subscr_conn_fsm de-/alloc
..


refactor subscr_conn and subscr_conn_fsm de-/alloc

Refactor:

1. Glue the gsm_subscriber_connection alloc to the subscr_conn_fsm.
2. Add separate AUTH_CIPH state to the FSM.
3. Use conn->use_count to trigger conn release.
4. Add separate RELEASING state to the FSM.
5. Add rate counters for each of the three Complete Layer 3 types.

Details:

1. Glue the gsm_subscriber_connection alloc to the subscr_conn_fsm.

Historically, a gsm_subscriber_connection was allocated in libbsc land, and
only upon Complete Layer 3 did libmsc add the fsm instance. After splitting
openbsc.git into a separate osmo-msc, this is no longer necessary, hence:

Closely tie gsm_subscriber_connection allocation to the subscr_conn_fsm
instance: talloc the conn as a child of the FSM instance, and discard the conn
as soon as the FSM terminates.

2. Add separate AUTH_CIPH state to the FSM.

Decoding the Complete Layer 3 message is distinctly separate from waiting for
the VLR FSMs to conclude. Use the NEW state as "we don't know if this is a
valid message yet", and the AUTH_CIPH state as "evaluating, don't release".

A profound effect of this: should we for any odd reason fail to leave the FSM's
NEW state, the conn will be released right at the end of msc_compl_l3(),
without needing to trigger release in each code path.

3. Use conn->use_count to trigger conn release.

Before, the FSM itself would hold a use count on the conn, and hence we would
need to ask it whether it is ready to release the conn yet by dispatching
events, to achieve a use_count decrement.

Instead, unite the FSM instance and conn, and do not hold a use count by the
FSM. Hence, trigger an FSM "UNUSED" event only when the use_count reaches zero.
As long as use counts are done correctly, the FSM will terminate correctly.

These exceptions:

- The new AUTH_CIPH state explicitly ignores UNUSED events, since we expect the
  use count to reach zero while evaluating Authentication and Ciphering. (I
  experimented with holding a use count by AUTH_CIPH onenter() and releasing by
  onleave(), but the use count and thus the conn are released before the next
  state can initiate transactions that would increment the use count again.
  Same thing for the VLR FSMs holding a use count, they should be done before
  we advance to the next state. The easiest is to simply expect zero use count
  during the AUTH_CIPH state.)

- A CM Service Request means that even though the MSC would be through with all
  it wants to do, we shall still wait for a request to follow from the MS.
  Hence the FSM holds a use count on itself while a CM Service is pending.

- While waiting for a Release/Clear Complete, the FSM holds a use count on
  itself.

4. Add separate RELEASING state to the FSM.

If we decide to release for other reasons than a use count reaching zero, we
still need to be able to wait for the msc_dtap() use count on the conn to
release.

(An upcoming patch will further use the RELEASING state to properly wait for
Clear Complete / Release Complete messages.)

5. Add rate counters for each of the three Complete Layer 3 types.

Besides LU, also count CM Service Request and Paging Response
acceptance/rejections. Without these counters, only very few of the auth+ciph
outcomes actually show in the counters.

Related: OS#3122
Change-Id: I55feb379e176a96a831e105b86202b17a0ffe889
---
M include/osmocom/msc/gsm_data.h
M include/osmocom/msc/osmo_msc.h
M src/libmsc/gsm_04_08.c
M src/libmsc/msc_ifaces.c
M src/libmsc/osmo_msc.c
M src/libmsc/subscr_conn.c
M src/libmsc/transaction.c
M tests/msc_vlr/msc_vlr_test_authen_reuse.err
M tests/msc_vlr/msc_vlr_test_call.err
M tests/msc_vlr/msc_vlr_test_gsm_authen.err
M tests/msc_vlr/msc_vlr_test_gsm_ciph.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
M tests/msc_vlr/msc_vlr_test_no_authen.err
M tests/msc_vlr/msc_vlr_test_reject_concurrency.err
M tests/msc_vlr/msc_vlr_test_rest.c
M tests/msc_vlr/msc_vlr_test_rest.err
M tests/msc_vlr/msc_vlr_test_umts_authen.err
M tests/msc_vlr/msc_vlr_tests.c
20 files changed, 3,580 insertions(+), 2,937 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified




-- 
To view, visit https://gerrit.osmocom.org/7705
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I55feb379e176a96a831e105b86202b17a0ffe889
Gerrit-PatchSet: 3
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] osmo-msc[master]: CC: intentionally release T308 on BSSMAP Clear Request from BSC

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: CC: intentionally release T308 on BSSMAP Clear Request from BSC
..


CC: intentionally release T308 on BSSMAP Clear Request from BSC

So far we hit a running T308 during CC release when caused by a BSSMAP Clear
Request, and we loudly log that as error.

However, now I understand that T308 is a direct cause of the dispatch of a REL
IND towards MNCC, which is used to indicate teardown to MNCC. So during
_gsm48_cc_trans_free(), we first clear all timers, then invoke
mncc_release_ind() which starts another timer (useful for graceful CC Release,
but in this code path the intention is immediate release). Simply immediately
cancel the timer again and release the conn.

A separate question is whether a BSSMAP Clear Request should be less aggressive
in releasing the connections; i.e. instead of calling trans_free() all around,
to rather ask each transaction to "please stop soon", somehow.

Related: OS#3062
Change-Id: I231fdb574a086a206321148474cbdc7ca9cf39f0
---
M src/libmsc/gsm_04_08.c
M src/libmsc/transaction.c
M tests/msc_vlr/msc_vlr_test_call.err
3 files changed, 4 insertions(+), 10 deletions(-)

Approvals:
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c
index e5ddb44..f29c0b6 100644
--- a/src/libmsc/gsm_04_08.c
+++ b/src/libmsc/gsm_04_08.c
@@ -1422,6 +1422,9 @@
mncc_release_ind(trans->net, trans, trans->callref,
 GSM48_CAUSE_LOC_PRN_S_LU,
 GSM48_CC_CAUSE_RESOURCE_UNAVAIL);
+   /* This is a final freeing of the transaction. The MNCC release 
may have triggered the
+* T308 release timer, but we don't have the luxury of graceful 
CC Release here. */
+   gsm48_stop_cc_timer(trans);
}
if (trans->cc.state != GSM_CSTATE_NULL)
new_cc_state(trans, GSM_CSTATE_NULL);
diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c
index 66b929a..147099e 100644
--- a/src/libmsc/transaction.c
+++ b/src/libmsc/transaction.c
@@ -122,15 +122,6 @@
switch (trans->protocol) {
case GSM48_PDISC_CC:
_gsm48_cc_trans_free(trans);
-   if (osmo_timer_pending(>cc.timer)) {
-   LOGP(DCC, LOGL_ERROR,
-"%s Timer 0x%x is still running while discarding 
transaction"
-" -- this is a bug: we were still expecting a 
response but"
-" are freeing the transaction anyway\n",
-vlr_subscr_name(trans->conn->vsub), 
trans->cc.Tcurrent);
-   osmo_timer_del(>cc.timer);
-   trans->cc.Tcurrent = 0;
-   }
conn_usage_token = MSC_CONN_USE_TRANS_CC;
break;
case GSM48_PDISC_SMS:
diff --git a/tests/msc_vlr/msc_vlr_test_call.err 
b/tests/msc_vlr/msc_vlr_test_call.err
index 6142464..1b8002b 100644
--- a/tests/msc_vlr/msc_vlr_test_call.err
+++ b/tests/msc_vlr/msc_vlr_test_call.err
@@ -1085,8 +1085,8 @@
 DMNCC transmit message MNCC_REL_CNF
 DCC Sending 'MNCC_REL_CNF' to MNCC.
   MSC --> MNCC: callref 0x423: MNCC_REL_CNF
+DCC stopping pending timer T308
 DCC (ti 00 sub MSISDN:42342) new state RELEASE_REQ -> NULL
-DCC MSISDN:42342 Timer 0x308 is still running while discarding transaction -- 
this is a bug: we were still expecting a response but are freeing the 
transaction anyway
 DREF VLR subscr MSISDN:42342 usage decreases to: 2
 DREF MSISDN:42342: MSC conn use - trans_cc == 1 (0x4)
 - Iu Release --RAN_UTRAN_IU--> MS

-- 
To view, visit https://gerrit.osmocom.org/7704
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I231fdb574a086a206321148474cbdc7ca9cf39f0
Gerrit-PatchSet: 3
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 

osmo-msc[master]: properly receive BSSMAP Clear Complete and Iu Release Complete

[Harald Welte]

Patch Set 2: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7706
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie4c6aaba3866d6e5b98004e8870a215e8cf8ffc1
Gerrit-PatchSet: 2
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

osmo-msc[master]: refactor subscr_conn and subscr_conn_fsm de-/alloc

[Harald Welte]

Patch Set 2: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7705
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I55feb379e176a96a831e105b86202b17a0ffe889
Gerrit-PatchSet: 2
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

osmo-msc[master]: CC: intentionally release T308 on BSSMAP Clear Request from BSC

[Harald Welte]

Patch Set 2:

If the bsc tells us the (radio) connection is gone , there would be no point in 
giving transactions more time to clean up.

-- 
To view, visit https://gerrit.osmocom.org/7704
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I231fdb574a086a206321148474cbdc7ca9cf39f0
Gerrit-PatchSet: 2
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-HasComments: No

osmo-msc[master]: CC: intentionally release T308 on BSSMAP Clear Request from BSC

[Harald Welte]

Patch Set 2: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7704
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I231fdb574a086a206321148474cbdc7ca9cf39f0
Gerrit-PatchSet: 2
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-HasComments: No

[MERGED] osmo-ttcn3-hacks[master]: mask timestamps and source file nrs in expected-results.xml ...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: mask timestamps and source file nrs in expected-results.xml 
files
..


mask timestamps and source file nrs in expected-results.xml files

Prepare for upcoming updates with concise diffs.

Change-Id: Ic9f006aa8db1b477598605e0525faeb229b03641
---
M bsc/expected-results.xml
M ggsn_tests/expected-results.xml
M hlr/expected-results.xml
M mgw/expected-results.xml
M msc/expected-results.xml
M sgsn/expected-results.xml
M sip/expected-results.xml
M sysinfo/expected-results.xml
8 files changed, 278 insertions(+), 278 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml
index 18a9a20..a2f9d47 100644
--- a/bsc/expected-results.xml
+++ b/bsc/expected-results.xml
@@ -1,95 +1,95 @@
 
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 Timeout expecting { msg_disc := { msg_group 
:= RSL_MDISC_CCHAN (6), transparent := false }, msg_type := RSL_MT_PAGING_CMD 
(21), ies := { { iei := ?, body := { chan_nr := { u := { ch0 := 
RSL_CHAN_NR_PCH_AGCH (18) }, tn := ? } } }, { iei := ?, body := { paging_group 
:= ? } }, { iei := ?, body := { ms_identity := { len := ?, payload := ? } } }, 
* } }
-  BSC_Tests.ttcn:2203 BSC_Tests control part
-  BSC_Tests.ttcn:1131 TC_paging_imsi_nochan_lai testcase
+  BSC_Tests.ttcn:MASKED BSC_Tests control part
+  BSC_Tests.ttcn:MASKED TC_paging_imsi_nochan_lai testcase
 
   
-  
+  
 
   
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
 Received PAGING after A-RESET
-  BSC_Tests.ttcn:2212 BSC_Tests control part
-  BSC_Tests.ttcn:1306 TC_paging_imsi_a_reset testcase
+  BSC_Tests.ttcn:MASKED BSC_Tests control part
+  BSC_Tests.ttcn:MASKED TC_paging_imsi_a_reset testcase
 
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 Timeout of T_guard
-  BSC_Tests.ttcn:2230 BSC_Tests control part
-  BSC_Tests.ttcn:2056 TC_bssmap_clear_does_not_cause_bssmap_reset testcase
+  BSC_Tests.ttcn:MASKED BSC_Tests control part
+  BSC_Tests.ttcn:MASKED TC_bssmap_clear_does_not_cause_bssmap_reset 
testcase
 
   
-  
+  
 Timeout of T_guard
-  BSC_Tests.ttcn:2231 BSC_Tests control part
-  BSC_Tests.ttcn:2115 TC_ms_rel_ind_does_not_cause_bssmap_reset testcase
+  BSC_Tests.ttcn:MASKED BSC_Tests control part
+  BSC_Tests.ttcn:MASKED TC_ms_rel_ind_does_not_cause_bssmap_reset testcase
 
   
 
diff --git a/ggsn_tests/expected-results.xml b/ggsn_tests/expected-results.xml
index bff953a..1e5da38 100644
--- a/ggsn_tests/expected-results.xml
+++ b/ggsn_tests/expected-results.xml
@@ -1,14 +1,14 @@
 
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
diff --git a/hlr/expected-results.xml b/hlr/expected-results.xml
index 4d95479..94ea7cd 100644
--- a/hlr/expected-results.xml
+++ b/hlr/expected-results.xml
@@ -1,18 +1,18 @@
 
-
-  
+
+  
 Unexpected SAI ERROR Cause
-  HLR_Tests.ttcn:562 HLR_Tests control part
-  HLR_Tests.ttcn:364 TC_gsup_sai_err_invalid_imsi testcase
+  HLR_Tests.ttcn:MASKED HLR_Tests control part
+  HLR_Tests.ttcn:MASKED TC_gsup_sai_err_invalid_imsi testcase
 
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
diff --git a/mgw/expected-results.xml b/mgw/expected-results.xml
index c67d5d9..0e9f0e8 100644
--- a/mgw/expected-results.xml
+++ b/mgw/expected-results.xml
@@ -1,36 +1,36 @@
 
-
-  
+
+  
 no verdict
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
-  MGCP_Test.ttcn:887 MGCP_Test control part
-  MGCP_Test.ttcn:436 TC_crcx_illegal_double_lco testcase
+  MGCP_Test.ttcn:MASKED MGCP_Test control part
+  MGCP_Test.ttcn:MASKED TC_crcx_illegal_double_lco testcase
 
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
diff --git a/msc/expected-results.xml b/msc/expected-results.xml
index ebda8a4..54d1f5f 100644
--- a/msc/expected-results.xml
+++ b/msc/expected-results.xml
@@ -1,110 +1,110 @@
 
-
-  
-  
-  
-  
+
+  
+  
+  
+  
 Timeout waiting for ClearCommand/Release
-  MSC_Tests.ttcn:1832 MSC_Tests control part
-  MSC_Tests.ttcn:502 TC_lu_imsi_reject testcase
+  MSC_Tests.ttcn:MASKED MSC_Tests control part
+  MSC_Tests.ttcn:MASKED TC_lu_imsi_reject testcase
 
   
-  
+  
 Timeout waiting for ClearCommand/Release
-  

osmo-ttcn3-hacks[master]: add update_expected_results_from_jenkins.sh

[Harald Welte]

Patch Set 3: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7754
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib3ad8554fc59112c11325425ccd70ca1dbd8c123
Gerrit-PatchSet: 3
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

[MERGED] osmo-ci[master]: ansible: gsm-tester-bts: add OBS osmocom:nightly to install ...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: ansible: gsm-tester-bts: add OBS osmocom:nightly to install 
osmocom utilities
..


ansible: gsm-tester-bts: add OBS osmocom:nightly to install osmocom utilities

Useful for admininistrators.

Change-Id: I7b704d402c83db54401d1c06acb715cce821f2e4
---
A ansible/roles/gsm-tester-bts/files/Release.key
M ansible/roles/gsm-tester-bts/tasks/main.yml
2 files changed, 39 insertions(+), 0 deletions(-)

Approvals:
  lynxis lazus: Verified
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/ansible/roles/gsm-tester-bts/files/Release.key 
b/ansible/roles/gsm-tester-bts/files/Release.key
new file mode 100644
index 000..e656238
--- /dev/null
+++ b/ansible/roles/gsm-tester-bts/files/Release.key
@@ -0,0 +1,20 @@
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
+a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
+CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
+5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
+S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
+CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
+b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc
+aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI
+ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw
+8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI
+L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb
+/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I
+ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi
+8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
+d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
+=Gvly
+-END PGP PUBLIC KEY BLOCK-
diff --git a/ansible/roles/gsm-tester-bts/tasks/main.yml 
b/ansible/roles/gsm-tester-bts/tasks/main.yml
index f51da6d..a08670a 100644
--- a/ansible/roles/gsm-tester-bts/tasks/main.yml
+++ b/ansible/roles/gsm-tester-bts/tasks/main.yml
@@ -34,3 +34,22 @@
 name: jenkins
 groups: usrp
 append: yes
+
+- name: gsm-tester-bts | add apt-key of OBS network:osmocom:nightly
+  apt_key:
+data: "{{ lookup('file', 'Release.key') }}"
+state: present
+
+- name: gsm-tester-bts | add apt-repo of OBS network:osmocom:nightly
+  apt_repo:
+name: obs_network_osmocom_latest
+repo: "deb 
http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_{{ 
ansible_distribution_major_version }}.0/ ./"
+update_cache: yes
+
+- name: gsm-tester-bts | install osmocom utilities
+  apt:
+name: "{{ item }}"
+  with_items:
+- abisip-find
+- osmo-bsc-ipaccess-utils
+- osmo-bsc-bs11-utils

-- 
To view, visit https://gerrit.osmocom.org/7741
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b704d402c83db54401d1c06acb715cce821f2e4
Gerrit-PatchSet: 3
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 

[MERGED] osmo-ci[master]: osmocom-jenkins-slave: call fstrim periodically

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: osmocom-jenkins-slave: call fstrim periodically
..


osmocom-jenkins-slave: call fstrim periodically

Change-Id: I82c497f476abf43148e8d7c027f53b87b5a738fb
---
M ansible/hosts
M ansible/roles/osmocom-jenkins-slave/defaults/main.yml
M ansible/roles/osmocom-jenkins-slave/tasks/main.yml
3 files changed, 13 insertions(+), 3 deletions(-)

Approvals:
  lynxis lazus: Verified
  Harald Welte: Looks good to me, approved



diff --git a/ansible/hosts b/ansible/hosts
index 6964a71..4767b0c 100644
--- a/ansible/hosts
+++ b/ansible/hosts
@@ -9,8 +9,8 @@
 
 [jenkins-slaves]
 admin2-deb8build ansible_host=2a01:4f8:13b:828::1:400
-admin2-deb9build ansible_host=2a01:4f8:13b:828::1:300
+admin2-deb9build ansible_host=2a01:4f8:13b:828::1:300 
osmocom_jenkins_slave_fstrim=True
 build2-deb8build-ansible ansible_host=2a01:4f8:10b:2ad9::1:7
-build2-deb9build-ansible ansible_host=2a01:4f8:10b:2ad9::1:6
+build2-deb9build-ansible ansible_host=2a01:4f8:10b:2ad9::1:6 
osmocom_jenkins_slave_fstrim=True
 host2-deb8build-ansible ansible_host=2a01:4f8:120:8470::1:2
-host2-deb9build-ansible ansible_host=2a01:4f8:120:8470::1:3
+host2-deb9build-ansible ansible_host=2a01:4f8:120:8470::1:3 
osmocom_jenkins_slave_fstrim=True
diff --git a/ansible/roles/osmocom-jenkins-slave/defaults/main.yml 
b/ansible/roles/osmocom-jenkins-slave/defaults/main.yml
index 3f2fa8a..e32b5a0 100644
--- a/ansible/roles/osmocom-jenkins-slave/defaults/main.yml
+++ b/ansible/roles/osmocom-jenkins-slave/defaults/main.yml
@@ -9,3 +9,6 @@
 
 # Setup the ttcn3 requirements
 ttcn3_slave: true
+
+# call fstrim peridically
+osmocom_jenkins_slave_fstrim: false
diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml 
b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml
index 4d7b963..f8b29d8 100644
--- a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml
+++ b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml
@@ -109,3 +109,10 @@
   copy:
 src: gitconfig
 dest: "/home/{{ jenkins_user }}/.gitconfig"
+
+- name: call fstrim periodically
+  cron:
+name: "fstrim"
+hour: "*/12"
+job: "fstrim / >/dev/null 2>/dev/null || true"
+  when: osmocom_jenkins_slave_fstrim

-- 
To view, visit https://gerrit.osmocom.org/7724
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I82c497f476abf43148e8d7c027f53b87b5a738fb
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: lynxis lazus 

[MERGED] osmo-ttcn3-hacks[master]: add update_expected_results_from_jenkins.sh

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: add update_expected_results_from_jenkins.sh
..


add update_expected_results_from_jenkins.sh

Change-Id: Ib3ad8554fc59112c11325425ccd70ca1dbd8c123
---
A update_expected_results_from_jenkins.sh
1 file changed, 53 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/update_expected_results_from_jenkins.sh 
b/update_expected_results_from_jenkins.sh
new file mode 100755
index 000..7677cff
--- /dev/null
+++ b/update_expected_results_from_jenkins.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# Download the latest junit xml results from the jenkins.osmocom.org 
workspaces.
+# Usage:
+# - have a clean git clone of osmo-ttcn3-hacks
+# - have internet access to jenkins.osmocom.org
+# - ./update_expected_results_from_jenkins.sh
+# - git diff, make sure that you understand and approve of each and every 
change
+# - git commit -a -m "update expected results"
+
+not_found=""
+
+if [ -n "$(git status | grep 'modified:')" ]; then
+  echo "Your git clone contains modifications! This is not recommended."
+  echo "Hit enter to continue anyway."
+  read enter_to_continue
+fi
+
+for target in */expected-results.xml; do
+  project="$(basename "$(dirname "$target")")"
+
+  # shims for naming exceptions
+  ws_path="ttcn3-${project}-test/ws/logs/${project}-tester"
+  if [ "x$project" = "xggsn_tests" ]; then
+project="ggsn"
+  elif [ "x$project" = "xsysinfo" ]; then
+ws_path="ttcn3-nitb-sysinfo/ws/logs/ttcn3-nitb-sysinfo"
+  fi
+
+  # find out the junit-NN.xml name
+  dir_url="https://jenkins.osmocom.org/jenkins/job/$ws_path/;
+  junit_file="$(wget -q -O - "$dir_url" | grep 'junit-xml-[0-9]*\.log' | tail 
-n 1 | sed 's/.*\(junit-xml-[0-9]*\.log\).*/\1/')"
+
+  # update
+  target_new="$target.new"
+  if ! wget -O "$target_new" "${dir_url}$junit_file"; then
+not_found="$not_found $project"
+rm -f "$target_new"
+  else
+mv "$target_new" "$target"
+  fi
+done
+
+./mask_expected_results.sh
+
+echo "
+
+ MAKE SURE THE RESULTING CHANGES ARE SANE BEFORE COMMITTING!
+
+"
+if [ -n "$not_found" ]; then
+   echo "Could not update: $not_found"
+fi

-- 
To view, visit https://gerrit.osmocom.org/7754
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3ad8554fc59112c11325425ccd70ca1dbd8c123
Gerrit-PatchSet: 3
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 

[MERGED] osmo-ci[master]: ansible: gsm-tester: move usrp tasks to gsm-tester-bts

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: ansible: gsm-tester: move usrp tasks to gsm-tester-bts
..


ansible: gsm-tester: move usrp tasks to gsm-tester-bts

Change-Id: I9caebed94c3473051b82e2cdc35f6dfb9f862084
---
M ansible/roles/gsm-tester-bts/tasks/main.yml
M ansible/roles/gsm-tester-modems/tasks/main.yml
2 files changed, 22 insertions(+), 22 deletions(-)

Approvals:
  lynxis lazus: Verified
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/ansible/roles/gsm-tester-bts/tasks/main.yml 
b/ansible/roles/gsm-tester-bts/tasks/main.yml
index 4430a01..f51da6d 100644
--- a/ansible/roles/gsm-tester-bts/tasks/main.yml
+++ b/ansible/roles/gsm-tester-bts/tasks/main.yml
@@ -12,3 +12,25 @@
   pip:
 name: pysispm
 executable: pip3
+
+- name: gsm-tester-bts | usrp install apt dependecies
+  apt:
+name: "{{ item }}"
+cache_valid_time: 3600
+update_cache: yes
+  with_items:
+- libuhd-dev
+- uhd-host
+  register: uhd_installed
+
+- name: gsm-tester-bts | usrp download firmware
+  command: uhd_images_downloader
+  args:
+creates: /usr/share/uhd/images
+  when: uhd_installed | changed
+
+- name: gsm-tester-bts | usrp allow jenkins to access
+  user:
+name: jenkins
+groups: usrp
+append: yes
diff --git a/ansible/roles/gsm-tester-modems/tasks/main.yml 
b/ansible/roles/gsm-tester-modems/tasks/main.yml
index b766c73..81c6446 100644
--- a/ansible/roles/gsm-tester-modems/tasks/main.yml
+++ b/ansible/roles/gsm-tester-modems/tasks/main.yml
@@ -1,27 +1,5 @@
 ---
 # modems
-- name: install dependecies for usrp
-  apt:
-name: "{{ item }}"
-cache_valid_time: 3600
-update_cache: yes
-  with_items:
-- libuhd-dev
-- uhd-host
-  register: uhd_installed
-
-- name: download firmware for uhd/usrp
-  command: uhd_images_downloader
-  args:
-creates: /usr/share/uhd/images
-  when: uhd_installed | changed
-
-- name: allow jenkins to access USRP
-  user:
-name: jenkins
-groups: usrp
-append: yes
-
 - name: install gobi2000 packages 
   apt:
 name: gobi-loader

-- 
To view, visit https://gerrit.osmocom.org/7738
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9caebed94c3473051b82e2cdc35f6dfb9f862084
Gerrit-PatchSet: 3
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 

[MERGED] osmo-ci[master]: ansible: hosts: gsm-tester: use ansible_host to have more re...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: ansible: hosts: gsm-tester: use ansible_host to have more 
readable ansible output
..


ansible: hosts: gsm-tester: use ansible_host to have more readable ansible 
output

Change-Id: Ia7b60ace8afd0e2cc47c535da1856d4f34fdd735
---
M ansible/hosts
1 file changed, 2 insertions(+), 4 deletions(-)

Approvals:
  lynxis lazus: Verified
  Harald Welte: Looks good to me, approved



diff --git a/ansible/hosts b/ansible/hosts
index ea5dea4..6964a71 100644
--- a/ansible/hosts
+++ b/ansible/hosts
@@ -1,8 +1,6 @@
 [gsm-tester]
-# rnd
-10.9.25.101
-# production
-10.9.25.107
+osmo-gsm-tester-rnd ansible_host=10.9.25.101
+osmo-gsm-tester-prod ansible_host=10.9.25.107
 
 [coverity-slaves]
 admin2-deb9build ansible_host=2a01:4f8:13b:828::1:300

-- 
To view, visit https://gerrit.osmocom.org/7734
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7b60ace8afd0e2cc47c535da1856d4f34fdd735
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: lynxis lazus 

[MERGED] osmo-ci[master]: ansible: gsm-tester-bts: install ip.access dependencies

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: ansible: gsm-tester-bts: install ip.access dependencies
..


ansible: gsm-tester-bts: install ip.access dependencies

Change-Id: I47f578c4b9bb7b1dc81ccf93a7e82a335f6968a2
---
A ansible/roles/gsm-tester-bts/README.md
A ansible/roles/gsm-tester-bts/tasks/main.yml
2 files changed, 17 insertions(+), 0 deletions(-)

Approvals:
  lynxis lazus: Verified
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/ansible/roles/gsm-tester-bts/README.md 
b/ansible/roles/gsm-tester-bts/README.md
new file mode 100644
index 000..161d0c7
--- /dev/null
+++ b/ansible/roles/gsm-tester-bts/README.md
@@ -0,0 +1,3 @@
+# gsm-tester-bts
+
+Install and configure to use certain bts'.
diff --git a/ansible/roles/gsm-tester-bts/tasks/main.yml 
b/ansible/roles/gsm-tester-bts/tasks/main.yml
new file mode 100644
index 000..4430a01
--- /dev/null
+++ b/ansible/roles/gsm-tester-bts/tasks/main.yml
@@ -0,0 +1,14 @@
+---
+- name: gsm-tester-bts | update apt-cache
+  apt:
+cache_valid_time: 3600
+update_cache: yes
+
+- name: gsm-tester-bts | ip.access install apt dependencies
+  apt:
+name: python3-usb
+
+- name: gsm-tester-bts | ip.access install pip3 dependencies
+  pip:
+name: pysispm
+executable: pip3

-- 
To view, visit https://gerrit.osmocom.org/7737
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I47f578c4b9bb7b1dc81ccf93a7e82a335f6968a2
Gerrit-PatchSet: 3
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 

osmo-ttcn3-hacks[master]: mask timestamps and source file nrs in expected-results.xml ...

[Harald Welte]

Patch Set 2: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7753
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ic9f006aa8db1b477598605e0525faeb229b03641
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

[MERGED] osmo-ci[master]: ansible: add role udhcpd: setup a udhcpd server

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: ansible: add role udhcpd: setup a udhcpd server
..


ansible: add role udhcpd: setup a udhcpd server

Change-Id: Ia272ae9c2b245d0a06f84b91f50dd875d4488e02
---
A ansible/roles/udhcpd/README.md
A ansible/roles/udhcpd/defaults/main.yml
A ansible/roles/udhcpd/tasks/main.yml
A ansible/roles/udhcpd/templates/etc/udhcpd.conf
4 files changed, 168 insertions(+), 0 deletions(-)

Approvals:
  lynxis lazus: Verified
  Pau Espin Pedrol: Looks good to me, approved



diff --git a/ansible/roles/udhcpd/README.md b/ansible/roles/udhcpd/README.md
new file mode 100644
index 000..0d37661
--- /dev/null
+++ b/ansible/roles/udhcpd/README.md
@@ -0,0 +1,15 @@
+---
+Install and configure udhcpd.
+
+```
+- name: udhcpd
+  udhcpd_router: 10.42.42.1
+  udhcpd_range_start: 10.42.42.230
+  udhcpd_range_end: 10.42.42.230
+  udhcpd_netmask: 255.255.255.0
+  udhcpd_dns: 10.42.42.2
+  udhcpd_interface: enp2s0
+  udhcpd_static_leases:
+- mac: 00:12:34:56:78:9a
+  ip: 10.42.42.53
+```
diff --git a/ansible/roles/udhcpd/defaults/main.yml 
b/ansible/roles/udhcpd/defaults/main.yml
new file mode 100644
index 000..1f4ef47
--- /dev/null
+++ b/ansible/roles/udhcpd/defaults/main.yml
@@ -0,0 +1,16 @@
+---
+
+udhcpd_range_start: 192.168.1.100
+udhcpd_range_end: 192.168.1.200
+
+udhcpd_subnet: 255.255.255.0
+udhcpd_router:  192.168.1.1
+udhcpd_dns: "{{ udhcpd_router }}"
+
+# in seconds
+# default: 10 days
+udhcpd_lease_time: 864000
+
+udhcpd_interface: eth0
+
+udhcpd_static_leases: []
diff --git a/ansible/roles/udhcpd/tasks/main.yml 
b/ansible/roles/udhcpd/tasks/main.yml
new file mode 100644
index 000..280a5ef
--- /dev/null
+++ b/ansible/roles/udhcpd/tasks/main.yml
@@ -0,0 +1,14 @@
+---
+- name: udhcpd | update apt-cache
+  apt:
+cache_valid_time: 3600
+update_cache: yes
+
+- name: udhcpd | install
+  apt:
+name: udhcpd
+
+- name: configure udhcpd
+  template:
+src: etc/udhcpd.conf
+dest: /etc/udhcpd.conf
diff --git a/ansible/roles/udhcpd/templates/etc/udhcpd.conf 
b/ansible/roles/udhcpd/templates/etc/udhcpd.conf
new file mode 100644
index 000..d2df746
--- /dev/null
+++ b/ansible/roles/udhcpd/templates/etc/udhcpd.conf
@@ -0,0 +1,123 @@
+# {{ ansible_managed }}
+
+# The start and end of the IP lease block
+
+start  {{ udhcpd_range_start }}#default: 192.168.0.20
+end{{ udhcpd_range_end }}  #default: 192.168.0.254
+
+optdns {{ udhcpd_dns }}
+option subnet  {{ udhcpd_subnet }}
+optrouter  {{ udhcpd_router }}
+option domain  local
+option lease   {{ udhcpd_lease_time }} # 10 days of seconds
+
+
+
+# The interface that udhcpd will use
+
+interface  {{ udhcpd_interface }}  #default: eth0
+
+
+# The maximim number of leases (includes addressesd reserved
+# by OFFER's, DECLINE's, and ARP conficts
+
+#max_leases254 #default: 254
+
+
+# If remaining is true (default), udhcpd will store the time
+# remaining for each lease in the udhcpd leases file. This is
+# for embedded systems that cannot keep time between reboots.
+# If you set remaining to no, the absolute time that the lease
+# expires at will be stored in the dhcpd.leases file.
+
+#remaining yes #default: yes
+
+
+# The time period at which udhcpd will write out a dhcpd.leases
+# file. If this is 0, udhcpd will never automatically write a
+# lease file. (specified in seconds)
+
+#auto_time 7200#default: 7200 (2 hours)
+
+
+# The amount of time that an IP will be reserved (leased) for if a
+# DHCP decline message is received (seconds).
+
+#decline_time  3600#default: 3600 (1 hour)
+
+
+# The amount of time that an IP will be reserved (leased) for if an
+# ARP conflct occurs. (seconds
+
+#conflict_time 3600#default: 3600 (1 hour)
+
+
+# How long an offered address is reserved (leased) in seconds
+
+#offer_time60  #default: 60 (1 minute)
+
+# If a lease to be given is below this value, the full lease time is
+# instead used (seconds).
+
+#min_lease 60  #defult: 60
+
+
+# The location of the leases file
+
+#lease_file/var/lib/misc/udhcpd.leases #defualt: 
/var/lib/misc/udhcpd.leases
+
+# The location of the pid file
+#pidfile   /var/run/udhcpd.pid #default: /var/run/udhcpd.pid
+
+# Everytime udhcpd writes a leases file, the below script will be called.
+# Useful for writing the lease file to flash every few hours.
+
+#notify_file   #default: (no script)
+
+#notify_file   dumpleases  # <--- useful for debugging
+
+# The following are bootp specific options, setable by udhcpd.
+
+#siaddr192.168.0.22#default: 0.0.0.0
+
+#sname zorak   #default: (none)
+
+#boot_file /var/nfs_root   #default: (none)
+
+# The remainer 

osmo-ttcn3-hacks[master]: bsc, msc: update expected results

[Harald Welte]

Patch Set 3: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7755
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib3a36efeb086fd995d7dad4e040f5a46b1b1ca0a
Gerrit-PatchSet: 3
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

[MERGED] osmo-ci[master]: ansible: gsm-tester: install sispmctl to control usb power s...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: ansible: gsm-tester: install sispmctl to control usb power 
sockets
..


ansible: gsm-tester: install sispmctl to control usb power sockets

Change-Id: Ie1af197d4b24e25196e10d2afa3ab8eea73ad729
---
M ansible/roles/gsm-tester/tasks/main.yml
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  lynxis lazus: Verified
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/ansible/roles/gsm-tester/tasks/main.yml 
b/ansible/roles/gsm-tester/tasks/main.yml
index b6de075..f7eb1ee 100644
--- a/ansible/roles/gsm-tester/tasks/main.yml
+++ b/ansible/roles/gsm-tester/tasks/main.yml
@@ -242,3 +242,7 @@
   copy:
 content: "maxsize 10M"
 dest: /etc/logrotate.d/maxsize
+
+- name: install sispmctl (usb power socket)
+  apt:
+name: sispmctl

-- 
To view, visit https://gerrit.osmocom.org/7740
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1af197d4b24e25196e10d2afa3ab8eea73ad729
Gerrit-PatchSet: 3
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 

[MERGED] osmo-ci[master]: ansible: setup-gsm-tester: use udhcpd as dhcp server

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: ansible: setup-gsm-tester: use udhcpd as dhcp server
..


ansible: setup-gsm-tester: use udhcpd as dhcp server

Required for ip.access
Change-Id: I5ae43ebcd3c87e625110d8ff6afa0476f4b1facf
---
A ansible/host_vars/osmo-gsm-tester-prod.yml
A ansible/host_vars/osmo-gsm-tester-rnd.yml
M ansible/setup-gsm-tester.yml
3 files changed, 19 insertions(+), 0 deletions(-)

Approvals:
  lynxis lazus: Verified
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/ansible/host_vars/osmo-gsm-tester-prod.yml 
b/ansible/host_vars/osmo-gsm-tester-prod.yml
new file mode 100644
index 000..e87d8fb
--- /dev/null
+++ b/ansible/host_vars/osmo-gsm-tester-prod.yml
@@ -0,0 +1,6 @@
+---
+udhcpd_static_leases:
+  - mac: 00:02:95:00:52:ae
+ip: 10.42.42.53
+  - mac: 00:02:95:00:5a:a4
+ip: 10.42.42.54
diff --git a/ansible/host_vars/osmo-gsm-tester-rnd.yml 
b/ansible/host_vars/osmo-gsm-tester-rnd.yml
new file mode 100644
index 000..b524752
--- /dev/null
+++ b/ansible/host_vars/osmo-gsm-tester-rnd.yml
@@ -0,0 +1,4 @@
+---
+udhcpd_static_leases:
+  - mac: 00:02:95:00:41:b3
+ip: 10.42.42.53
diff --git a/ansible/setup-gsm-tester.yml b/ansible/setup-gsm-tester.yml
index 8232102..a1a0389 100644
--- a/ansible/setup-gsm-tester.yml
+++ b/ansible/setup-gsm-tester.yml
@@ -37,3 +37,12 @@
   generic_slave: false
   tags:
 - jenkins-slave
+
+- name: udhcpd
+  udhcpd_router: 10.42.42.1
+  udhcpd_range_start: 10.42.42.230
+  udhcpd_range_end: 10.42.42.235
+  udhcpd_subnet: 255.255.255.0
+  udhcpd_dns: 10.42.42.2
+  udhcpd_interface: enp2s0
+  # udhcpd_static_leases is set via host_vars/*

-- 
To view, visit https://gerrit.osmocom.org/7736
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5ae43ebcd3c87e625110d8ff6afa0476f4b1facf
Gerrit-PatchSet: 3
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 

[MERGED] osmo-ttcn3-hacks[master]: bsc, msc: update expected results

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: bsc, msc: update expected results
..


bsc, msc: update expected results

Mark TC_paging_imsi_a_reset fixed.

Add various new tests.

Change-Id: Ib3a36efeb086fd995d7dad4e040f5a46b1b1ca0a
---
M bsc/expected-results.xml
M msc/expected-results.xml
2 files changed, 14 insertions(+), 8 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml
index a2f9d47..8cafaa5 100644
--- a/bsc/expected-results.xml
+++ b/bsc/expected-results.xml
@@ -1,5 +1,5 @@
 
-
+
   
   
   
@@ -61,12 +61,7 @@
   
   
   
-  
-Received PAGING after A-RESET
-  BSC_Tests.ttcn:MASKED BSC_Tests control part
-  BSC_Tests.ttcn:MASKED TC_paging_imsi_a_reset testcase
-
-  
+  
   
   
   
@@ -92,4 +87,8 @@
   BSC_Tests.ttcn:MASKED TC_ms_rel_ind_does_not_cause_bssmap_reset testcase
 
   
+  
+  
+  
+  
 
diff --git a/msc/expected-results.xml b/msc/expected-results.xml
index 54d1f5f..48ab12d 100644
--- a/msc/expected-results.xml
+++ b/msc/expected-results.xml
@@ -1,5 +1,5 @@
 
-
+
   
   
   
@@ -106,5 +106,12 @@
   
   
   
+  
+  
+Unexpected SMS related PDU from MSC
+  MSC_Tests.ttcn:MASKED MSC_Tests control part
+  MSC_Tests.ttcn:MASKED TC_lu_and_mt_sms testcase
+
+  
   
 

-- 
To view, visit https://gerrit.osmocom.org/7755
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3a36efeb086fd995d7dad4e040f5a46b1b1ca0a
Gerrit-PatchSet: 3
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] osmo-ci[master]: ansible: gsm-tester-modems: improve name

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: ansible: gsm-tester-modems: improve name
..


ansible: gsm-tester-modems: improve name

Use same scheme as of gsm-tester-bts.
This should improve readability.

Change-Id: I4186baaf565442c96555b723622c93b1cbd9f4f7
---
M ansible/roles/gsm-tester-modems/tasks/main.yml
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  lynxis lazus: Verified
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/ansible/roles/gsm-tester-modems/tasks/main.yml 
b/ansible/roles/gsm-tester-modems/tasks/main.yml
index 81c6446..d2213c6 100644
--- a/ansible/roles/gsm-tester-modems/tasks/main.yml
+++ b/ansible/roles/gsm-tester-modems/tasks/main.yml
@@ -1,15 +1,15 @@
 ---
 # modems
-- name: install gobi2000 packages 
+- name: gsm-tester-modems | gobi install apt dependencies
   apt:
 name: gobi-loader
 cache_valid_time: 3600
 update_cache: yes
 
-- name: gobi firmwares
+- name: gsm-tester-modems | gobi create firmware directory
   file: path=/lib/firmware/gobi state=directory
 
-- name: copy gobi firmwares
+- name: gsm-tester-modems | gobi copy firmwares if available
   copy:
 src: "{{ item.file }}"
 dest: "/lib/firmware/{{ item.file }}"

-- 
To view, visit https://gerrit.osmocom.org/7739
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4186baaf565442c96555b723622c93b1cbd9f4f7
Gerrit-PatchSet: 3
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 

[MERGED] osmo-ttcn3-hacks[master]: add mask_expected_results.sh

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: add mask_expected_results.sh
..


add mask_expected_results.sh

Provide a script to mask timestamps and source file lines in expected results
files: when updating expected changes, it is useful to see the exact semantic
changes, not the timestamp and source file line changes in the git diff.

Change-Id: I785e126b1f5afddd1b722bc5e922ed90970efa8a
---
A mask_expected_results.sh
1 file changed, 7 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/mask_expected_results.sh b/mask_expected_results.sh
new file mode 100755
index 000..f679194
--- /dev/null
+++ b/mask_expected_results.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+# to prevent diffs due to timing and source file lines, mask some numbers
+
+for target in */expected-results.xml; do
+  sed -i "s/time='[^']*'/time='MASKED'/g" "$target"
+  sed -i 's/ttcn:[0-9]\+/ttcn:MASKED/g' "$target"
+done

-- 
To view, visit https://gerrit.osmocom.org/7752
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I785e126b1f5afddd1b722bc5e922ed90970efa8a
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 

osmo-ttcn3-hacks[master]: add mask_expected_results.sh

[Harald Welte]

Patch Set 2: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7752
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I785e126b1f5afddd1b722bc5e922ed90970efa8a
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

osmo-bsc[master]: trigger acc ramping on state-changed-event reports

[Harald Welte]

Patch Set 1:

Please also test with osmo-bts

-- 
To view, visit https://gerrit.osmocom.org/7770
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I097a113a3a63de02bcb8277020beb59cf485b176
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Stefan Sperling 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

[MERGED] osmo-bsc[master]: rename helper functions in the acc ramp code to avoid confusion

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: rename helper functions in the acc ramp code to avoid confusion
..


rename helper functions in the acc ramp code to avoid confusion

The word 'enabled' was used in two contexts: Whether ACC ramp is
enabled as a feature, and whether a particular access control class
is permantly allowed/disallowed via VTY configuration.

Rename some helper functions to avoid the use of the word 'enabled'
in the latter context.

Change-Id: Ia67e84270cd50f4c55b8cf616ca38b00482f765c
Related: OS#2591
---
M src/libbsc/acc_ramp.c
1 file changed, 13 insertions(+), 13 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/libbsc/acc_ramp.c b/src/libbsc/acc_ramp.c
index 54626ad..6d9be59 100644
--- a/src/libbsc/acc_ramp.c
+++ b/src/libbsc/acc_ramp.c
@@ -32,12 +32,12 @@
  * Check if an ACC has been permanently barred for a BTS,
  * e.g. with the 'rach access-control-class' VTY command.
  */
-static bool acc_is_enabled(struct gsm_bts *bts, unsigned int acc)
+static bool acc_is_permanently_barred(struct gsm_bts *bts, unsigned int acc)
 {
OSMO_ASSERT(acc >= 0 && acc <= 9);
if (acc == 8 || acc == 9)
-   return (bts->si_common.rach_control.t2 & (1 << (acc - 8))) == 0;
-   return (bts->si_common.rach_control.t3 & (1 << (acc))) == 0;
+   return (bts->si_common.rach_control.t2 & (1 << (acc - 8)));
+   return (bts->si_common.rach_control.t3 & (1 << (acc)));
 }
 
 static void allow_one_acc(struct acc_ramp *acc_ramp, unsigned int acc)
@@ -56,20 +56,20 @@
acc_ramp->barred_accs |= (1 << acc);
 }
 
-static void barr_all_enabled_accs(struct acc_ramp *acc_ramp)
+static void barr_all_accs(struct acc_ramp *acc_ramp)
 {
unsigned int acc;
for (acc = 0; acc < 10; acc++) {
-   if (acc_is_enabled(acc_ramp->bts, acc))
+   if (!acc_is_permanently_barred(acc_ramp->bts, acc))
barr_one_acc(acc_ramp, acc);
}
 }
 
-static void allow_all_enabled_accs(struct acc_ramp *acc_ramp)
+static void allow_all_accs(struct acc_ramp *acc_ramp)
 {
unsigned int acc;
for (acc = 0; acc < 10; acc++) {
-   if (acc_is_enabled(acc_ramp->bts, acc))
+   if (!acc_is_permanently_barred(acc_ramp->bts, acc))
allow_one_acc(acc_ramp, acc);
}
 }
@@ -102,7 +102,7 @@
 
/* Shortcut in case we only do one ramping step. */
if (acc_ramp->step_size == ACC_RAMP_STEP_SIZE_MAX) {
-   allow_all_enabled_accs(acc_ramp);
+   allow_all_accs(acc_ramp);
gsm_bts_set_system_infos(acc_ramp->bts);
return;
}
@@ -113,14 +113,14 @@
if (idx > 0) {
/* One of ACC0-ACC7 is still bared. */
unsigned int acc = idx - 1;
-   if (acc_is_enabled(acc_ramp->bts, acc))
+   if (!acc_is_permanently_barred(acc_ramp->bts, acc))
allow_one_acc(acc_ramp, acc);
} else {
idx = ffs(acc_ramp_get_barred_t2(acc_ramp));
if (idx == 1 || idx == 2) {
/* ACC8 or ACC9 is still barred. */
unsigned int acc = idx - 1 + 8;
-   if (acc_is_enabled(acc_ramp->bts, acc))
+   if (!acc_is_permanently_barred(acc_ramp->bts, 
acc))
allow_one_acc(acc_ramp, acc);
} else {
/* All ACCs are now allowed. */
@@ -196,7 +196,7 @@
acc_ramp->step_size = ACC_RAMP_STEP_SIZE_DEFAULT;
acc_ramp->step_interval_sec = ACC_RAMP_STEP_INTERVAL_MIN;
acc_ramp->step_interval_is_fixed = false;
-   allow_all_enabled_accs(acc_ramp);
+   allow_all_accs(acc_ramp);
osmo_timer_setup(_ramp->step_timer, do_acc_ramping_step, acc_ramp);
osmo_signal_register_handler(SS_NM, acc_ramp_nm_sig_cb, acc_ramp);
 }
@@ -262,7 +262,7 @@
 
if (acc_ramp_is_enabled(acc_ramp)) {
/* Set all available ACCs to barred and start ramping up. */
-   barr_all_enabled_accs(acc_ramp);
+   barr_all_accs(acc_ramp);
do_acc_ramping_step(acc_ramp);
}
 }
@@ -276,5 +276,5 @@
if (osmo_timer_pending(_ramp->step_timer))
osmo_timer_del(_ramp->step_timer);
 
-   allow_all_enabled_accs(acc_ramp);
+   allow_all_accs(acc_ramp);
 }

-- 
To view, visit https://gerrit.osmocom.org/7750
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia67e84270cd50f4c55b8cf616ca38b00482f765c
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: 

osmo-bsc[master]: rename helper functions in the acc ramp code to avoid confusion

[Harald Welte]

Patch Set 2: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7750
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia67e84270cd50f4c55b8cf616ca38b00482f765c
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Stefan Sperling 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-HasComments: No

libosmocore[master]: msgb: msgb_get: Drop unneeded tmp var

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7768
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I27bb2ab59408c9cd1363b3b5acb2263128c55732
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-HasComments: No

[MERGED] libosmocore[master]: msgb: msgb_get: Drop unneeded tmp var

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: msgb: msgb_get: Drop unneeded tmp var
..


msgb: msgb_get: Drop unneeded tmp var

Change-Id: I27bb2ab59408c9cd1363b3b5acb2263128c55732
---
M include/osmocom/core/msgb.h
1 file changed, 1 insertion(+), 2 deletions(-)

Approvals:
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h
index 374ddbe..a983195 100644
--- a/include/osmocom/core/msgb.h
+++ b/include/osmocom/core/msgb.h
@@ -230,13 +230,12 @@
  */
 static inline unsigned char *msgb_get(struct msgb *msgb, unsigned int len)
 {
-   unsigned char *tmp = msgb->tail - len;
if (msgb_length(msgb) < len)
MSGB_ABORT(msgb, "msgb too small to get %u (len %u)\n",
   len, msgb_length(msgb));
msgb->tail -= len;
msgb->len -= len;
-   return tmp;
+   return msgb->tail;
 }
 
 /*! remove uint8 from end of message

-- 
To view, visit https://gerrit.osmocom.org/7768
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I27bb2ab59408c9cd1363b3b5acb2263128c55732
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 

[MERGED] libosmocore[master]: msgb: msgb_pull: Abort when pulling more than avail size

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: msgb: msgb_pull: Abort when pulling more than avail size
..


msgb: msgb_pull: Abort when pulling more than avail size

Change-Id: I512ff2035ae7a929e6c96df82938cc1ddbcc4e2a
---
M include/osmocom/core/msgb.h
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h
index a983195..a8dc205 100644
--- a/include/osmocom/core/msgb.h
+++ b/include/osmocom/core/msgb.h
@@ -331,6 +331,9 @@
  */
 static inline unsigned char *msgb_pull(struct msgb *msgb, unsigned int len)
 {
+   if (msgb_length(msgb) < len)
+   MSGB_ABORT(msgb, "msgb too small to pull %u (len %u)\n",
+  len, msgb_length(msgb));
msgb->len -= len;
return msgb->data += len;
 }

-- 
To view, visit https://gerrit.osmocom.org/7769
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I512ff2035ae7a929e6c96df82938cc1ddbcc4e2a
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 

libosmocore[master]: msgb: msgb_pull: Abort when pulling more than avail size

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7769
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I512ff2035ae7a929e6c96df82938cc1ddbcc4e2a
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-HasComments: No

libosmocore[master]: msgb: msgb_pull: Abort when pulling more than avail size

[Vadim Yanitskiy]

Patch Set 1: Code-Review+1

-- 
To view, visit https://gerrit.osmocom.org/7769
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I512ff2035ae7a929e6c96df82938cc1ddbcc4e2a
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-HasComments: No

libosmocore[master]: msgb: msgb_get: Drop unneeded tmp var

[Vadim Yanitskiy]

Patch Set 1: Code-Review+1

-- 
To view, visit https://gerrit.osmocom.org/7768
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I27bb2ab59408c9cd1363b3b5acb2263128c55732
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-HasComments: No

[PATCH] osmo-bsc[master]: rename helper functions in the acc ramp code to avoid confusion

[Stefan Sperling]

Hello Pau Espin Pedrol, Jenkins Builder,

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

https://gerrit.osmocom.org/7750

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

rename helper functions in the acc ramp code to avoid confusion

The word 'enabled' was used in two contexts: Whether ACC ramp is
enabled as a feature, and whether a particular access control class
is permantly allowed/disallowed via VTY configuration.

Rename some helper functions to avoid the use of the word 'enabled'
in the latter context.

Change-Id: Ia67e84270cd50f4c55b8cf616ca38b00482f765c
Related: OS#2591
---
M src/libbsc/acc_ramp.c
1 file changed, 13 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/50/7750/2

diff --git a/src/libbsc/acc_ramp.c b/src/libbsc/acc_ramp.c
index 54626ad..6d9be59 100644
--- a/src/libbsc/acc_ramp.c
+++ b/src/libbsc/acc_ramp.c
@@ -32,12 +32,12 @@
  * Check if an ACC has been permanently barred for a BTS,
  * e.g. with the 'rach access-control-class' VTY command.
  */
-static bool acc_is_enabled(struct gsm_bts *bts, unsigned int acc)
+static bool acc_is_permanently_barred(struct gsm_bts *bts, unsigned int acc)
 {
OSMO_ASSERT(acc >= 0 && acc <= 9);
if (acc == 8 || acc == 9)
-   return (bts->si_common.rach_control.t2 & (1 << (acc - 8))) == 0;
-   return (bts->si_common.rach_control.t3 & (1 << (acc))) == 0;
+   return (bts->si_common.rach_control.t2 & (1 << (acc - 8)));
+   return (bts->si_common.rach_control.t3 & (1 << (acc)));
 }
 
 static void allow_one_acc(struct acc_ramp *acc_ramp, unsigned int acc)
@@ -56,20 +56,20 @@
acc_ramp->barred_accs |= (1 << acc);
 }
 
-static void barr_all_enabled_accs(struct acc_ramp *acc_ramp)
+static void barr_all_accs(struct acc_ramp *acc_ramp)
 {
unsigned int acc;
for (acc = 0; acc < 10; acc++) {
-   if (acc_is_enabled(acc_ramp->bts, acc))
+   if (!acc_is_permanently_barred(acc_ramp->bts, acc))
barr_one_acc(acc_ramp, acc);
}
 }
 
-static void allow_all_enabled_accs(struct acc_ramp *acc_ramp)
+static void allow_all_accs(struct acc_ramp *acc_ramp)
 {
unsigned int acc;
for (acc = 0; acc < 10; acc++) {
-   if (acc_is_enabled(acc_ramp->bts, acc))
+   if (!acc_is_permanently_barred(acc_ramp->bts, acc))
allow_one_acc(acc_ramp, acc);
}
 }
@@ -102,7 +102,7 @@
 
/* Shortcut in case we only do one ramping step. */
if (acc_ramp->step_size == ACC_RAMP_STEP_SIZE_MAX) {
-   allow_all_enabled_accs(acc_ramp);
+   allow_all_accs(acc_ramp);
gsm_bts_set_system_infos(acc_ramp->bts);
return;
}
@@ -113,14 +113,14 @@
if (idx > 0) {
/* One of ACC0-ACC7 is still bared. */
unsigned int acc = idx - 1;
-   if (acc_is_enabled(acc_ramp->bts, acc))
+   if (!acc_is_permanently_barred(acc_ramp->bts, acc))
allow_one_acc(acc_ramp, acc);
} else {
idx = ffs(acc_ramp_get_barred_t2(acc_ramp));
if (idx == 1 || idx == 2) {
/* ACC8 or ACC9 is still barred. */
unsigned int acc = idx - 1 + 8;
-   if (acc_is_enabled(acc_ramp->bts, acc))
+   if (!acc_is_permanently_barred(acc_ramp->bts, 
acc))
allow_one_acc(acc_ramp, acc);
} else {
/* All ACCs are now allowed. */
@@ -196,7 +196,7 @@
acc_ramp->step_size = ACC_RAMP_STEP_SIZE_DEFAULT;
acc_ramp->step_interval_sec = ACC_RAMP_STEP_INTERVAL_MIN;
acc_ramp->step_interval_is_fixed = false;
-   allow_all_enabled_accs(acc_ramp);
+   allow_all_accs(acc_ramp);
osmo_timer_setup(_ramp->step_timer, do_acc_ramping_step, acc_ramp);
osmo_signal_register_handler(SS_NM, acc_ramp_nm_sig_cb, acc_ramp);
 }
@@ -262,7 +262,7 @@
 
if (acc_ramp_is_enabled(acc_ramp)) {
/* Set all available ACCs to barred and start ramping up. */
-   barr_all_enabled_accs(acc_ramp);
+   barr_all_accs(acc_ramp);
do_acc_ramping_step(acc_ramp);
}
 }
@@ -276,5 +276,5 @@
if (osmo_timer_pending(_ramp->step_timer))
osmo_timer_del(_ramp->step_timer);
 
-   allow_all_enabled_accs(acc_ramp);
+   allow_all_accs(acc_ramp);
 }

-- 
To view, visit https://gerrit.osmocom.org/7750
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia67e84270cd50f4c55b8cf616ca38b00482f765c
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Stefan Sperling 

[PATCH] osmo-bsc[master]: trigger acc ramping on state-changed-event reports

[Stefan Sperling]

Review at  https://gerrit.osmocom.org/7770

trigger acc ramping on state-changed-event reports

Trigger ACC ramping not only when an Administrative State Change
ACK is received from a BTS, but also when an administrative state
change is reported for TRX 0 in a State Changed Event Report.

This should allow ACC ramping to work with any BTS which reports
an administrative state change to 'unlock' using either of these
OML messages.

Tested with a nanobts.
The nanobts is known to send both of these OML messages in quick
succession, so do not re-trigger ramping if it's already in progress.

Change-Id: I097a113a3a63de02bcb8277020beb59cf485b176
Related: OS#2591
---
M src/libbsc/acc_ramp.c
1 file changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/70/7770/1

diff --git a/src/libbsc/acc_ramp.c b/src/libbsc/acc_ramp.c
index 54626ad..9e66f31 100644
--- a/src/libbsc/acc_ramp.c
+++ b/src/libbsc/acc_ramp.c
@@ -144,7 +144,8 @@
struct acc_ramp *acc_ramp = handler_data;
struct gsm_bts_trx *trx = NULL;
 
-   if (signal != S_NM_STATECHG_ADM)
+   /* Handled signals map to an Administrative State Change ACK, or a 
State Changed Event Report. */
+   if (signal != S_NM_STATECHG_ADM && signal != S_NM_STATECHG_OPER)
return 0;
 
if (nsd->obj_class != NM_OC_RADIO_CARRIER)
@@ -163,7 +164,14 @@
/* Trigger or abort ACC ramping based on the new 'RF lock' state of 
this TRX. */
switch (nsd->new_state->administrative) {
case NM_STATE_UNLOCKED:
-   acc_ramp_trigger(acc_ramp);
+   /*
+* Do not re-trigger ACC ramping if ramping is already in 
progress.
+* A BTS might send several "unlock" change events: One in the 
Administrative
+* State Change ACK, and/or another in a State Changed Event 
Report.
+* For instance, the nanobts is known to send both.
+*/
+   if (!osmo_timer_pending(_ramp->step_timer))
+   acc_ramp_trigger(acc_ramp);
break;
case NM_STATE_LOCKED:
case NM_STATE_SHUTDOWN:

-- 
To view, visit https://gerrit.osmocom.org/7770
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I097a113a3a63de02bcb8277020beb59cf485b176
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Stefan Sperling 

[PATCH] libosmocore[master]: msgb: msgb_pull: Abort when pulling more than avail size

[Pau Espin Pedrol]

Review at  https://gerrit.osmocom.org/7769

msgb: msgb_pull: Abort when pulling more than avail size

Change-Id: I512ff2035ae7a929e6c96df82938cc1ddbcc4e2a
---
M include/osmocom/core/msgb.h
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/7769/1

diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h
index a983195..a8dc205 100644
--- a/include/osmocom/core/msgb.h
+++ b/include/osmocom/core/msgb.h
@@ -331,6 +331,9 @@
  */
 static inline unsigned char *msgb_pull(struct msgb *msgb, unsigned int len)
 {
+   if (msgb_length(msgb) < len)
+   MSGB_ABORT(msgb, "msgb too small to pull %u (len %u)\n",
+  len, msgb_length(msgb));
msgb->len -= len;
return msgb->data += len;
 }

-- 
To view, visit https://gerrit.osmocom.org/7769
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I512ff2035ae7a929e6c96df82938cc1ddbcc4e2a
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 

[PATCH] libosmocore[master]: msgb: msgb_get: Drop unneeded tmp var

[Pau Espin Pedrol]

Review at  https://gerrit.osmocom.org/7768

msgb: msgb_get: Drop unneeded tmp var

Change-Id: I27bb2ab59408c9cd1363b3b5acb2263128c55732
---
M include/osmocom/core/msgb.h
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/7768/1

diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h
index 374ddbe..a983195 100644
--- a/include/osmocom/core/msgb.h
+++ b/include/osmocom/core/msgb.h
@@ -230,13 +230,12 @@
  */
 static inline unsigned char *msgb_get(struct msgb *msgb, unsigned int len)
 {
-   unsigned char *tmp = msgb->tail - len;
if (msgb_length(msgb) < len)
MSGB_ABORT(msgb, "msgb too small to get %u (len %u)\n",
   len, msgb_length(msgb));
msgb->tail -= len;
msgb->len -= len;
-   return tmp;
+   return msgb->tail;
 }
 
 /*! remove uint8 from end of message

-- 
To view, visit https://gerrit.osmocom.org/7768
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I27bb2ab59408c9cd1363b3b5acb2263128c55732
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 

[PATCH] osmo-ttcn3-hacks[master]: add update_expected_results_from_jenkins.sh

[Neels Hofmeyr]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/7754

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

add update_expected_results_from_jenkins.sh

Change-Id: Ib3ad8554fc59112c11325425ccd70ca1dbd8c123
---
A update_expected_results_from_jenkins.sh
1 file changed, 53 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/54/7754/3

diff --git a/update_expected_results_from_jenkins.sh 
b/update_expected_results_from_jenkins.sh
new file mode 100755
index 000..7677cff
--- /dev/null
+++ b/update_expected_results_from_jenkins.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# Download the latest junit xml results from the jenkins.osmocom.org 
workspaces.
+# Usage:
+# - have a clean git clone of osmo-ttcn3-hacks
+# - have internet access to jenkins.osmocom.org
+# - ./update_expected_results_from_jenkins.sh
+# - git diff, make sure that you understand and approve of each and every 
change
+# - git commit -a -m "update expected results"
+
+not_found=""
+
+if [ -n "$(git status | grep 'modified:')" ]; then
+  echo "Your git clone contains modifications! This is not recommended."
+  echo "Hit enter to continue anyway."
+  read enter_to_continue
+fi
+
+for target in */expected-results.xml; do
+  project="$(basename "$(dirname "$target")")"
+
+  # shims for naming exceptions
+  ws_path="ttcn3-${project}-test/ws/logs/${project}-tester"
+  if [ "x$project" = "xggsn_tests" ]; then
+project="ggsn"
+  elif [ "x$project" = "xsysinfo" ]; then
+ws_path="ttcn3-nitb-sysinfo/ws/logs/ttcn3-nitb-sysinfo"
+  fi
+
+  # find out the junit-NN.xml name
+  dir_url="https://jenkins.osmocom.org/jenkins/job/$ws_path/;
+  junit_file="$(wget -q -O - "$dir_url" | grep 'junit-xml-[0-9]*\.log' | tail 
-n 1 | sed 's/.*\(junit-xml-[0-9]*\.log\).*/\1/')"
+
+  # update
+  target_new="$target.new"
+  if ! wget -O "$target_new" "${dir_url}$junit_file"; then
+not_found="$not_found $project"
+rm -f "$target_new"
+  else
+mv "$target_new" "$target"
+  fi
+done
+
+./mask_expected_results.sh
+
+echo "
+
+ MAKE SURE THE RESULTING CHANGES ARE SANE BEFORE COMMITTING!
+
+"
+if [ -n "$not_found" ]; then
+   echo "Could not update: $not_found"
+fi

-- 
To view, visit https://gerrit.osmocom.org/7754
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ib3ad8554fc59112c11325425ccd70ca1dbd8c123
Gerrit-PatchSet: 3
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 

osmo-ttcn3-hacks[master]: add update_expected_results_from_jenkins.sh

[Neels Hofmeyr]

Patch Set 2:

> I think this script deserves some usage documentation / comments?

It's fire and forget, but agreed.

-- 
To view, visit https://gerrit.osmocom.org/7754
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib3ad8554fc59112c11325425ccd70ca1dbd8c123
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

osmo-ttcn3-hacks[master]: mask timestamps and source file nrs in expected-results.xml ...

[Neels Hofmeyr]

Patch Set 2:

we still want the timings to show up in jenkins. The masking script only masks 
the expected-results.xml, for the sole purpose that updating the expected 
results by overwriting with a new file doesn't diff all over the place, but 
only exactly where we changed an expectation. The "real" junit xml files don't 
need to be masked. The compare-results.sh compares the unchanged junit xml 
against the masked expected-results.xml, and doesn't care about those 
attributes.

If it's still a concern, I could also remove that attribute altogether.

-- 
To view, visit https://gerrit.osmocom.org/7753
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ic9f006aa8db1b477598605e0525faeb229b03641
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

[PATCH] osmo-ttcn3-hacks[master]: mask timestamps and source file nrs in expected-results.xml ...

[Neels Hofmeyr]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/7753

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

mask timestamps and source file nrs in expected-results.xml files

Prepare for upcoming updates with concise diffs.

Change-Id: Ic9f006aa8db1b477598605e0525faeb229b03641
---
M bsc/expected-results.xml
M ggsn_tests/expected-results.xml
M hlr/expected-results.xml
M mgw/expected-results.xml
M msc/expected-results.xml
M sgsn/expected-results.xml
M sip/expected-results.xml
M sysinfo/expected-results.xml
8 files changed, 278 insertions(+), 278 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/53/7753/2

diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml
index 18a9a20..a2f9d47 100644
--- a/bsc/expected-results.xml
+++ b/bsc/expected-results.xml
@@ -1,95 +1,95 @@
 
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 Timeout expecting { msg_disc := { msg_group 
:= RSL_MDISC_CCHAN (6), transparent := false }, msg_type := RSL_MT_PAGING_CMD 
(21), ies := { { iei := ?, body := { chan_nr := { u := { ch0 := 
RSL_CHAN_NR_PCH_AGCH (18) }, tn := ? } } }, { iei := ?, body := { paging_group 
:= ? } }, { iei := ?, body := { ms_identity := { len := ?, payload := ? } } }, 
* } }
-  BSC_Tests.ttcn:2203 BSC_Tests control part
-  BSC_Tests.ttcn:1131 TC_paging_imsi_nochan_lai testcase
+  BSC_Tests.ttcn:MASKED BSC_Tests control part
+  BSC_Tests.ttcn:MASKED TC_paging_imsi_nochan_lai testcase
 
   
-  
+  
 
   
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
 Received PAGING after A-RESET
-  BSC_Tests.ttcn:2212 BSC_Tests control part
-  BSC_Tests.ttcn:1306 TC_paging_imsi_a_reset testcase
+  BSC_Tests.ttcn:MASKED BSC_Tests control part
+  BSC_Tests.ttcn:MASKED TC_paging_imsi_a_reset testcase
 
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 Timeout of T_guard
-  BSC_Tests.ttcn:2230 BSC_Tests control part
-  BSC_Tests.ttcn:2056 TC_bssmap_clear_does_not_cause_bssmap_reset testcase
+  BSC_Tests.ttcn:MASKED BSC_Tests control part
+  BSC_Tests.ttcn:MASKED TC_bssmap_clear_does_not_cause_bssmap_reset 
testcase
 
   
-  
+  
 Timeout of T_guard
-  BSC_Tests.ttcn:2231 BSC_Tests control part
-  BSC_Tests.ttcn:2115 TC_ms_rel_ind_does_not_cause_bssmap_reset testcase
+  BSC_Tests.ttcn:MASKED BSC_Tests control part
+  BSC_Tests.ttcn:MASKED TC_ms_rel_ind_does_not_cause_bssmap_reset testcase
 
   
 
diff --git a/ggsn_tests/expected-results.xml b/ggsn_tests/expected-results.xml
index bff953a..1e5da38 100644
--- a/ggsn_tests/expected-results.xml
+++ b/ggsn_tests/expected-results.xml
@@ -1,14 +1,14 @@
 
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
diff --git a/hlr/expected-results.xml b/hlr/expected-results.xml
index 4d95479..94ea7cd 100644
--- a/hlr/expected-results.xml
+++ b/hlr/expected-results.xml
@@ -1,18 +1,18 @@
 
-
-  
+
+  
 Unexpected SAI ERROR Cause
-  HLR_Tests.ttcn:562 HLR_Tests control part
-  HLR_Tests.ttcn:364 TC_gsup_sai_err_invalid_imsi testcase
+  HLR_Tests.ttcn:MASKED HLR_Tests control part
+  HLR_Tests.ttcn:MASKED TC_gsup_sai_err_invalid_imsi testcase
 
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
diff --git a/mgw/expected-results.xml b/mgw/expected-results.xml
index c67d5d9..0e9f0e8 100644
--- a/mgw/expected-results.xml
+++ b/mgw/expected-results.xml
@@ -1,36 +1,36 @@
 
-
-  
+
+  
 no verdict
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
-  MGCP_Test.ttcn:887 MGCP_Test control part
-  MGCP_Test.ttcn:436 TC_crcx_illegal_double_lco testcase
+  MGCP_Test.ttcn:MASKED MGCP_Test control part
+  MGCP_Test.ttcn:MASKED TC_crcx_illegal_double_lco testcase
 
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
diff --git a/msc/expected-results.xml b/msc/expected-results.xml
index ebda8a4..54d1f5f 100644
--- a/msc/expected-results.xml
+++ b/msc/expected-results.xml
@@ -1,110 +1,110 @@
 
-
-  
-  
-  
-  
+
+  
+  
+  
+  
 Timeout waiting for ClearCommand/Release
-  MSC_Tests.ttcn:1832 MSC_Tests control part
-  MSC_Tests.ttcn:502 TC_lu_imsi_reject testcase
+  MSC_Tests.ttcn:MASKED MSC_Tests control part
+  MSC_Tests.ttcn:MASKED TC_lu_imsi_reject testcase
 
   
-  
+  
 Timeout waiting for ClearCommand/Release
-  MSC_Tests.ttcn:1833 MSC_Tests control part
-  MSC_Tests.ttcn:531 

[PATCH] osmo-ttcn3-hacks[master]: add mask_expected_results.sh

[Neels Hofmeyr]

Hello Harald Welte, Jenkins Builder,

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

https://gerrit.osmocom.org/7752

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

add mask_expected_results.sh

Provide a script to mask timestamps and source file lines in expected results
files: when updating expected changes, it is useful to see the exact semantic
changes, not the timestamp and source file line changes in the git diff.

Change-Id: I785e126b1f5afddd1b722bc5e922ed90970efa8a
---
A mask_expected_results.sh
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/52/7752/2

diff --git a/mask_expected_results.sh b/mask_expected_results.sh
new file mode 100755
index 000..f679194
--- /dev/null
+++ b/mask_expected_results.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+# to prevent diffs due to timing and source file lines, mask some numbers
+
+for target in */expected-results.xml; do
+  sed -i "s/time='[^']*'/time='MASKED'/g" "$target"
+  sed -i 's/ttcn:[0-9]\+/ttcn:MASKED/g' "$target"
+done

-- 
To view, visit https://gerrit.osmocom.org/7752
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I785e126b1f5afddd1b722bc5e922ed90970efa8a
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

osmo-ttcn3-hacks[master]: add mask_expected_results.sh

[Neels Hofmeyr]

Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/7752/1/mask_expected_results.sh
File mask_expected_results.sh:

Line 5:   sed -i "s/time='[^']*'/time='MASKED'/g" "$target"
> does the "MASKED" still constitute valid Juni2-XML? Is there a DTD availabl
not sure if the timestamp number within the quotes is in fact validated by a 
DTD; But also this expected-results.xml will never end up being parsed in 
jenkins or anything other than compare-results.sh. Jenkins will still always 
see the exact test case's junit results with timestamps and line numbers.


-- 
To view, visit https://gerrit.osmocom.org/7752
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I785e126b1f5afddd1b722bc5e922ed90970efa8a
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: Yes

osmo-ttcn3-hacks[master]: fix build: don't clean out expected-results.log: rename to *...

[Neels Hofmeyr]

Patch Set 2: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7751
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ic334f6b758eef865e3a497aa430691a3ae696d25
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

[MERGED] osmo-ttcn3-hacks[master]: fix build: don't clean out expected-results.log: rename to *...

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: fix build: don't clean out expected-results.log: rename to *.xml
..


fix build: don't clean out expected-results.log: rename to *.xml

'make clean' as generated by ttcn3_makefilegen removes all *.log files, which
of course cleans out expected-results.log, which should not happen. Since this
is a junit XML file, rename the suffix to .xml.

Change-Id: Ic334f6b758eef865e3a497aa430691a3ae696d25
---
R bsc/expected-results.xml
R ggsn_tests/expected-results.xml
R hlr/expected-results.xml
R mgw/expected-results.xml
R msc/expected-results.xml
R sgsn/expected-results.xml
R sip/expected-results.xml
M start-testsuite.sh
R sysinfo/expected-results.xml
9 files changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/bsc/expected-results.log b/bsc/expected-results.xml
similarity index 100%
rename from bsc/expected-results.log
rename to bsc/expected-results.xml
diff --git a/ggsn_tests/expected-results.log b/ggsn_tests/expected-results.xml
similarity index 100%
rename from ggsn_tests/expected-results.log
rename to ggsn_tests/expected-results.xml
diff --git a/hlr/expected-results.log b/hlr/expected-results.xml
similarity index 100%
rename from hlr/expected-results.log
rename to hlr/expected-results.xml
diff --git a/mgw/expected-results.log b/mgw/expected-results.xml
similarity index 100%
rename from mgw/expected-results.log
rename to mgw/expected-results.xml
diff --git a/msc/expected-results.log b/msc/expected-results.xml
similarity index 100%
rename from msc/expected-results.log
rename to msc/expected-results.xml
diff --git a/sgsn/expected-results.log b/sgsn/expected-results.xml
similarity index 100%
rename from sgsn/expected-results.log
rename to sgsn/expected-results.xml
diff --git a/sip/expected-results.log b/sip/expected-results.xml
similarity index 100%
rename from sip/expected-results.log
rename to sip/expected-results.xml
diff --git a/start-testsuite.sh b/start-testsuite.sh
index 5b187fa..e2da8f0 100755
--- a/start-testsuite.sh
+++ b/start-testsuite.sh
@@ -23,7 +23,7 @@
 
 LD_LIBRARY_PATH="$SUITE_DIR:/usr/lib/titan:/usr/ttcn3/lib" ttcn3_start $SUITE 
$CFG $TEST
 
-expected="$SUITE_DIR/expected-results.log"
+expected="$SUITE_DIR/expected-results.xml"
 if [ ! -f "$expected" ]; then
   echo "No expected results found, not comparing outcome. ($expected)"
   exit 0
diff --git a/sysinfo/expected-results.log b/sysinfo/expected-results.xml
similarity index 100%
rename from sysinfo/expected-results.log
rename to sysinfo/expected-results.xml

-- 
To view, visit https://gerrit.osmocom.org/7751
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic334f6b758eef865e3a497aa430691a3ae696d25
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 

[PATCH] osmo-ttcn3-hacks[master]: fix build: don't clean out expected-results.log: rename to *...

[Neels Hofmeyr]

Hello Harald Welte, Jenkins Builder,

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

https://gerrit.osmocom.org/7751

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

fix build: don't clean out expected-results.log: rename to *.xml

'make clean' as generated by ttcn3_makefilegen removes all *.log files, which
of course cleans out expected-results.log, which should not happen. Since this
is a junit XML file, rename the suffix to .xml.

Change-Id: Ic334f6b758eef865e3a497aa430691a3ae696d25
---
R bsc/expected-results.xml
R ggsn_tests/expected-results.xml
R hlr/expected-results.xml
R mgw/expected-results.xml
R msc/expected-results.xml
R sgsn/expected-results.xml
R sip/expected-results.xml
M start-testsuite.sh
R sysinfo/expected-results.xml
9 files changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/51/7751/2

diff --git a/bsc/expected-results.log b/bsc/expected-results.xml
similarity index 100%
rename from bsc/expected-results.log
rename to bsc/expected-results.xml
diff --git a/ggsn_tests/expected-results.log b/ggsn_tests/expected-results.xml
similarity index 100%
rename from ggsn_tests/expected-results.log
rename to ggsn_tests/expected-results.xml
diff --git a/hlr/expected-results.log b/hlr/expected-results.xml
similarity index 100%
rename from hlr/expected-results.log
rename to hlr/expected-results.xml
diff --git a/mgw/expected-results.log b/mgw/expected-results.xml
similarity index 100%
rename from mgw/expected-results.log
rename to mgw/expected-results.xml
diff --git a/msc/expected-results.log b/msc/expected-results.xml
similarity index 100%
rename from msc/expected-results.log
rename to msc/expected-results.xml
diff --git a/sgsn/expected-results.log b/sgsn/expected-results.xml
similarity index 100%
rename from sgsn/expected-results.log
rename to sgsn/expected-results.xml
diff --git a/sip/expected-results.log b/sip/expected-results.xml
similarity index 100%
rename from sip/expected-results.log
rename to sip/expected-results.xml
diff --git a/start-testsuite.sh b/start-testsuite.sh
index 5b187fa..e2da8f0 100755
--- a/start-testsuite.sh
+++ b/start-testsuite.sh
@@ -23,7 +23,7 @@
 
 LD_LIBRARY_PATH="$SUITE_DIR:/usr/lib/titan:/usr/ttcn3/lib" ttcn3_start $SUITE 
$CFG $TEST
 
-expected="$SUITE_DIR/expected-results.log"
+expected="$SUITE_DIR/expected-results.xml"
 if [ ! -f "$expected" ]; then
   echo "No expected results found, not comparing outcome. ($expected)"
   exit 0
diff --git a/sysinfo/expected-results.log b/sysinfo/expected-results.xml
similarity index 100%
rename from sysinfo/expected-results.log
rename to sysinfo/expected-results.xml

-- 
To view, visit https://gerrit.osmocom.org/7751
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ic334f6b758eef865e3a497aa430691a3ae696d25
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

osmo-ci[master]: ansible: add role udhcpd: setup a udhcpd server

[Pau Espin Pedrol]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7735
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia272ae9c2b245d0a06f84b91f50dd875d4488e02
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: No

osmo-ci[master]: ansible: add role udhcpd: setup a udhcpd server

[lynxis lazus]

Patch Set 1: Verified+1

(1 comment)

https://gerrit.osmocom.org/#/c/7735/1/ansible/roles/udhcpd/defaults/main.yml
File ansible/roles/udhcpd/defaults/main.yml:

Line 16: udhcpd_static_leases: []
> we are missing the leases here?
no. this is the default value. it will be overridden from outside. see the 
host_vars in the other commit which is using this.


-- 
To view, visit https://gerrit.osmocom.org/7735
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia272ae9c2b245d0a06f84b91f50dd875d4488e02
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: Yes

osmo-ci[master]: osmocom-jenkins-slave: call fstrim periodically

[lynxis lazus]

Patch Set 1: Verified+1

-- 
To view, visit https://gerrit.osmocom.org/7724
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I82c497f476abf43148e8d7c027f53b87b5a738fb
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: No

osmo-ci[master]: ansible: setup-gsm-tester: use udhcpd as dhcp server

[lynxis lazus]

Patch Set 2: Verified+1

-- 
To view, visit https://gerrit.osmocom.org/7736
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I5ae43ebcd3c87e625110d8ff6afa0476f4b1facf
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: No

osmo-ci[master]: ansible: gsm-tester: move usrp tasks to gsm-tester-bts

[lynxis lazus]

Patch Set 2: Verified+1

-- 
To view, visit https://gerrit.osmocom.org/7738
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9caebed94c3473051b82e2cdc35f6dfb9f862084
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: No

osmo-ci[master]: ansible: gsm-tester-modems: improve name

[lynxis lazus]

Patch Set 2: Verified+1

-- 
To view, visit https://gerrit.osmocom.org/7739
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4186baaf565442c96555b723622c93b1cbd9f4f7
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: No

osmo-ci[master]: ansible: gsm-tester-bts: install ip.access dependencies

[lynxis lazus]

Patch Set 2: Verified+1

-- 
To view, visit https://gerrit.osmocom.org/7737
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I47f578c4b9bb7b1dc81ccf93a7e82a335f6968a2
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: No

osmo-ci[master]: ansible: gsm-tester-bts: add OBS osmocom:nightly to install ...

[lynxis lazus]

Patch Set 2: Verified+1

-- 
To view, visit https://gerrit.osmocom.org/7741
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7b704d402c83db54401d1c06acb715cce821f2e4
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: No

osmo-ci[master]: ansible: hosts: gsm-tester: use ansible_host to have more re...

[lynxis lazus]

Patch Set 1: Verified+1

-- 
To view, visit https://gerrit.osmocom.org/7734
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia7b60ace8afd0e2cc47c535da1856d4f34fdd735
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: No

osmo-ci[master]: ansible: gsm-tester: install sispmctl to control usb power s...

[lynxis lazus]

Patch Set 2: Verified+1

-- 
To view, visit https://gerrit.osmocom.org/7740
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie1af197d4b24e25196e10d2afa3ab8eea73ad729
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: No

osmo-ttcn3-hacks[master]: MNCC: don't delete call table entries

[Harald Welte]

Patch Set 1:

> Seems to ma a test case shall decide when to clean up the call
 > table entries.
 > IIUC, it's impossible to derive what the test wants to do with the
 > call and discard automatically in all the right places.
 > So we'd make f_call_table_del() non-private and call that from test
 > cases?

well "non-private" is not sufficient, you'd need to introduce a new "signature" 
for the "procedure port" as it is basically a RPC call between two components.  
But yes, feel free to do that (and change the existing tets to use that 
explicit delete). thanks!

-- 
To view, visit https://gerrit.osmocom.org/7711
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I73ec066744475d3cc464e34854175f8cf14cf125
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

[MERGED] osmo-pcu[master]: cosmetic: remove runaway semicolon

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: cosmetic: remove runaway semicolon
..


cosmetic: remove runaway semicolon

Change-Id: I33c335dc8d564a8357ffb5b1163c2c4b1a578b49
Related: SYS#4139
Patch-by: Octasic inc.
---
M src/pcu_l1_if.cpp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index 85dbfb9..a9d17b6 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -630,6 +630,6 @@
msg_type);
rc = -EINVAL;
}
-;
+
return rc;
 }

-- 
To view, visit https://gerrit.osmocom.org/7728
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I33c335dc8d564a8357ffb5b1163c2c4b1a578b49
Gerrit-PatchSet: 1
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: dexter 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] osmo-pcu[master]: pcu_l1_if: add frame number to log output

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: pcu_l1_if: add frame number to log output
..


pcu_l1_if: add frame number to log output

Currently, the log output lacks the frame number.

 - make get_current_fn() public
 - add frame number to the log statements in pcu_l1_if.cpp

Change-Id: Idce994dbf86a2bbf861907d75418a2a3867244db
Related: SYS#4139
Patch-by: Octasic inc.
---
M src/gsm_timer.cpp
M src/gsm_timer.h
M src/pcu_l1_if.cpp
3 files changed, 21 insertions(+), 10 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/gsm_timer.cpp b/src/gsm_timer.cpp
index d3c59cb..f7901d4 100644
--- a/src/gsm_timer.cpp
+++ b/src/gsm_timer.cpp
@@ -43,7 +43,7 @@
  * all time functions schedule based on the BTS they
  * are scheduled on.
  */
-static int get_current_fn()
+int get_current_fn()
 {
return BTS::main_bts()->current_frame_number();
 }
diff --git a/src/gsm_timer.h b/src/gsm_timer.h
index fc42caf..cfabd0c 100644
--- a/src/gsm_timer.h
+++ b/src/gsm_timer.h
@@ -79,6 +79,12 @@
 int osmo_gsm_timers_update(void);
 int osmo_gsm_timers_check(void);
 
+
+/*
+ * Get Current Frame Number
+ */
+int get_current_fn();
+
 /*! }@ */
 
 #endif // GSM_TIMER_H
diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index a9d17b6..4b54707 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -143,9 +143,10 @@
struct msgb *msg;
struct gsm_pcu_if *pcu_prim;
struct gsm_pcu_if_data *data_req;
+   int current_fn = get_current_fn();
 
LOGP(DL1IF, LOGL_DEBUG, "Sending data request: trx=%d ts=%d sapi=%d "
-   "arfcn=%d fn=%d block=%d data=%s\n", trx, ts, sapi, arfcn, fn,
+   "arfcn=%d fn=%d cur_fn=%d block=%d data=%s\n", trx, ts, sapi, 
arfcn, fn, current_fn,
block_nr, osmo_hexdump(data, len));
 
msg = pcu_msgb_alloc(PCU_IF_MSG_DATA_REQ, 0);
@@ -276,11 +277,12 @@
 {
struct gprs_rlcmac_bts *bts = bts_main_data();
int rc;
+   int current_fn = get_current_fn();
pcu_l1_meas meas;
 
LOGP(DL1IF, LOGL_DEBUG, "Data indication received: sapi=%d arfcn=%d "
-   "block=%d data=%s\n", data_ind->sapi,
-   data_ind->arfcn, data_ind->block_nr,
+   "fn=%d cur_fn=%d block=%d data=%s\n", data_ind->sapi,
+   data_ind->arfcn, data_ind->fn, current_fn, data_ind->block_nr,
osmo_hexdump(data_ind->data, data_ind->len));
 
switch (data_ind->sapi) {
@@ -318,9 +320,10 @@
 static int pcu_rx_data_cnf(struct gsm_pcu_if_data *data_cnf)
 {
int rc = 0;
+   int current_fn = get_current_fn();
 
-   LOGP(DL1IF, LOGL_DEBUG, "Data confirm received: sapi=%d fn=%d\n",
-   data_cnf->sapi, data_cnf->fn);
+   LOGP(DL1IF, LOGL_DEBUG, "Data confirm received: sapi=%d fn=%d 
cur_fn=%d\n",
+   data_cnf->sapi, data_cnf->fn, current_fn);
 
switch (data_cnf->sapi) {
case PCU_IF_SAPI_PCH:
@@ -347,10 +350,11 @@
 static int pcu_rx_rts_req(struct gsm_pcu_if_rts_req *rts_req)
 {
int rc = 0;
+   int current_fn = get_current_fn();
 
LOGP(DL1IF, LOGL_DEBUG, "RTS request received: trx=%d ts=%d sapi=%d "
-   "arfcn=%d fn=%d block=%d\n", rts_req->trx_nr, rts_req->ts_nr,
-   rts_req->sapi, rts_req->arfcn, rts_req->fn, rts_req->block_nr);
+   "arfcn=%d fn=%d cur_fn=%d block=%d\n", rts_req->trx_nr, 
rts_req->ts_nr,
+   rts_req->sapi, rts_req->arfcn, rts_req->fn, current_fn, 
rts_req->block_nr);
 
switch (rts_req->sapi) {
case PCU_IF_SAPI_PDTCH:
@@ -378,10 +382,11 @@
 static int pcu_rx_rach_ind(struct gsm_pcu_if_rach_ind *rach_ind)
 {
int rc = 0;
+   int current_fn = get_current_fn();
 
LOGP(DL1IF, LOGL_INFO, "RACH request received: sapi=%d "
-   "qta=%d, ra=%d, fn=%d\n", rach_ind->sapi, rach_ind->qta,
-   rach_ind->ra, rach_ind->fn);
+   "qta=%d, ra=%d, fn=%d, cur_fn=%d, is_11bit=%d\n", 
rach_ind->sapi, rach_ind->qta,
+   rach_ind->ra, rach_ind->fn, current_fn, rach_ind->is_11bit);
 
switch (rach_ind->sapi) {
case PCU_IF_SAPI_RACH:

-- 
To view, visit https://gerrit.osmocom.org/7729
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idce994dbf86a2bbf861907d75418a2a3867244db
Gerrit-PatchSet: 1
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: dexter 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] osmo-bsc[master]: ensure that acc_ramp_init() is only called once

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: ensure that acc_ramp_init() is only called once
..


ensure that acc_ramp_init() is only called once

There are plans to register signal handlers in acc_ramp_init(). Once we
do that, the acc_ramp_init() function should only be called once to
avoid duplicate signal handlers on the handler list.

However, the acc_ramp_init() function currently serves a dual-purpose:

 1) Initialize the acc_ramp structure for a bts
 2) Enable or disable ACC ramping

Add new functions to support use case 2, and call acc_ramp_init()
just once while reading the configuration file. The VTY commands
which enable/disable ACC ramping use the new APIs instead.

Also, rename acc_ramp_start() to acc_ramp_trigger() and tweak its
semantics so that it can always be called regardless of what the
current configuration settings are. This prepares us for triggering
ACC ramping upon events other than "RSL link-up".

Change-Id: Ia25bff85d9e5c277da76bffa11d31972e9fdc323
Related: OS2591
---
M include/osmocom/bsc/acc_ramp.h
M src/libbsc/acc_ramp.c
M src/libbsc/bsc_init.c
M src/libbsc/bsc_vty.c
4 files changed, 43 insertions(+), 29 deletions(-)

Approvals:
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/bsc/acc_ramp.h b/include/osmocom/bsc/acc_ramp.h
index cb063bf..efb12b0 100644
--- a/include/osmocom/bsc/acc_ramp.h
+++ b/include/osmocom/bsc/acc_ramp.h
@@ -79,6 +79,18 @@
 };
 
 /*!
+ * Enable or disable ACC ramping.
+ * When enabled, ramping begins once acc_ramp_start() is called.
+ * When disabled, an ACC ramping process in progress will continue
+ * unless acc_ramp_abort() is called as well.
+ * \param[in] acc_ramp Pointer to acc_ramp structure.
+ */
+static inline void acc_ramp_set_enabled(struct acc_ramp *acc_ramp, bool enable)
+{
+   acc_ramp->acc_ramping_enabled = enable;
+}
+
+/*!
  * Return true if ACC ramping is currently enabled, else false.
  * \param[in] acc_ramp Pointer to acc_ramp structure.
  */
@@ -141,9 +153,9 @@
rach_control->t3 |= acc_ramp_get_barred_t3(acc_ramp);
 }
 
-void acc_ramp_init(struct acc_ramp *acc_ramp, bool enable, struct gsm_bts 
*bts);
+void acc_ramp_init(struct acc_ramp *acc_ramp, struct gsm_bts *bts);
 int acc_ramp_set_step_size(struct acc_ramp *acc_ramp, unsigned int step_size);
 int acc_ramp_set_step_interval(struct acc_ramp *acc_ramp, unsigned int 
step_interval);
 void acc_ramp_set_step_interval_dynamic(struct acc_ramp *acc_ramp);
-void acc_ramp_start(struct acc_ramp *acc_ramp);
+void acc_ramp_trigger(struct acc_ramp *acc_ramp);
 void acc_ramp_abort(struct acc_ramp *acc_ramp);
diff --git a/src/libbsc/acc_ramp.c b/src/libbsc/acc_ramp.c
index 5d35842..31122df 100644
--- a/src/libbsc/acc_ramp.c
+++ b/src/libbsc/acc_ramp.c
@@ -140,28 +140,20 @@
  * Initialize an acc_ramp data structure.
  * Storage for this structure must be provided by the caller.
  *
- * If ACC ramping is enabled, all ACCs are denied by default.
- * A subsequent call to acc_ramp_start() will begin the ramping process.
- * If ACC ramping is disabled, all ACCs will be allowed by default,
- * and there is no need to do anything else.
+ * By default, ACC ramping is disabled and all ACCs are allowed.
  *
  * \param[in] acc_ramp Pointer to acc_ramp structure to be initialized.
- * \param[in] enable Indicates whether ACC ramping should be enabled or 
disabled.
  * \param[in] bts BTS which uses this ACC ramp data structure.
  */
-void acc_ramp_init(struct acc_ramp *acc_ramp, bool enable, struct gsm_bts *bts)
+void acc_ramp_init(struct acc_ramp *acc_ramp, struct gsm_bts *bts)
 {
acc_ramp->bts = bts;
-   acc_ramp->acc_ramping_enabled = enable;
+   acc_ramp_set_enabled(acc_ramp, false);
acc_ramp->step_size = ACC_RAMP_STEP_SIZE_DEFAULT;
acc_ramp->step_interval_sec = ACC_RAMP_STEP_INTERVAL_MIN;
acc_ramp->step_interval_is_fixed = false;
+   allow_all_enabled_accs(acc_ramp);
osmo_timer_setup(_ramp->step_timer, do_acc_ramping_step, acc_ramp);
-
-   if (acc_ramp->acc_ramping_enabled)
-   barr_all_enabled_accs(acc_ramp);
-   else
-   allow_all_enabled_accs(acc_ramp);
 }
 
 /*!
@@ -211,27 +203,33 @@
 }
 
 /*!
- * Begin the ramping process. Perform at least one ramping step to allow 
'step_size' ACCs.
- * If 'step_size' is ACC_RAMP_STEP_SIZE_MAX, all ACCs will be allowed 
immediately.
+ * Determine if ACC ramping should be started according to configuration, and
+ * if ACC ramping is enabled, begin the ramping process.
+ * Perform at least one ramping step to allow 'step_size' ACCs.
+ * If 'step_size' is ACC_RAMP_STEP_SIZE_MAX, or if ACC ramping is disabled,
+ * all ACCs will be allowed immediately.
  * \param[in] acc_ramp Pointer to acc_ramp structure.
  */
-void acc_ramp_start(struct acc_ramp *acc_ramp)

[MERGED] osmo-bsc[master]: trigger acc ramping based on trx rf-locked state

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: trigger acc ramping based on trx rf-locked state
..


trigger acc ramping based on trx rf-locked state

Make ACC ramping listen to network management signals and trigger
or abort ACC ramping based on the RF locked state of TRX 0.

This works as expected with a virtphy setup when RF lock state is
changed via VTY. However, this change still needs to be tested with
a nanobts. It's also not quite clear yet whether operational state
changes, as opposed to administrative ones, should be taken into
account as well.

Change-Id: I4124f1da3dadec003de45c1da8435506ee8f0a34
Depends: Ia25bff85d9e5c277da76bffa11d31972e9fdc323
---
M src/libbsc/acc_ramp.c
M src/libbsc/bsc_vty.c
2 files changed, 49 insertions(+), 1 deletion(-)

Approvals:
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/libbsc/acc_ramp.c b/src/libbsc/acc_ramp.c
index 31122df..54626ad 100644
--- a/src/libbsc/acc_ramp.c
+++ b/src/libbsc/acc_ramp.c
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 /*
  * Check if an ACC has been permanently barred for a BTS,
@@ -136,6 +137,49 @@
osmo_timer_schedule(_ramp->step_timer, 
get_next_step_interval(acc_ramp), 0);
 }
 
+/* Implements osmo_signal_cbfn() -- trigger or abort ACC ramping upon changes 
RF lock state. */
+static int acc_ramp_nm_sig_cb(unsigned int subsys, unsigned int signal, void 
*handler_data, void *signal_data)
+{
+   struct nm_statechg_signal_data *nsd = signal_data;
+   struct acc_ramp *acc_ramp = handler_data;
+   struct gsm_bts_trx *trx = NULL;
+
+   if (signal != S_NM_STATECHG_ADM)
+   return 0;
+
+   if (nsd->obj_class != NM_OC_RADIO_CARRIER)
+   return 0;
+
+   trx = nsd->obj;
+
+   /* We only care about state changes of the first TRX. */
+   if (trx->nr != 0)
+   return 0;
+
+   /* RSL must already be up. We cannot send RACH system information to 
the BTS otherwise. */
+   if (trx->rsl_link == NULL)
+   return 0;
+
+   /* Trigger or abort ACC ramping based on the new 'RF lock' state of 
this TRX. */
+   switch (nsd->new_state->administrative) {
+   case NM_STATE_UNLOCKED:
+   acc_ramp_trigger(acc_ramp);
+   break;
+   case NM_STATE_LOCKED:
+   case NM_STATE_SHUTDOWN:
+   acc_ramp_abort(acc_ramp);
+   break;
+   case NM_STATE_NULL:
+   break;
+   default:
+   LOGP(DRSL, LOGL_NOTICE, "(bts=%d) ACC RAMP: unrecognized 
administrative state '0x%x' reported for TRX 0\n",
+   acc_ramp->bts->nr, nsd->new_state->administrative);
+   break;
+   }
+
+   return 0;
+}
+
 /*!
  * Initialize an acc_ramp data structure.
  * Storage for this structure must be provided by the caller.
@@ -154,6 +198,7 @@
acc_ramp->step_interval_is_fixed = false;
allow_all_enabled_accs(acc_ramp);
osmo_timer_setup(_ramp->step_timer, do_acc_ramping_step, acc_ramp);
+   osmo_signal_register_handler(SS_NM, acc_ramp_nm_sig_cb, acc_ramp);
 }
 
 /*!
diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c
index 521a36a..c8d1637 100644
--- a/src/libbsc/bsc_vty.c
+++ b/src/libbsc/bsc_vty.c
@@ -3278,7 +3278,10 @@
if (!acc_ramp_is_enabled(>acc_ramp))
acc_ramp_set_enabled(>acc_ramp, true);
 
-   /* ACC ramping takes effect when the BTS reconnects. */
+   /*
+* ACC ramping takes effect either when the BTS reconnects RSL,
+* or when RF administrative state changes to 'unlocked'.
+*/
return CMD_SUCCESS;
 }
 

-- 
To view, visit https://gerrit.osmocom.org/7732
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4124f1da3dadec003de45c1da8435506ee8f0a34
Gerrit-PatchSet: 4
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Stefan Sperling 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol 

[MERGED] osmo-bsc[master]: bsc_nat: forward_to_bsc: remove one level of indentation

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: bsc_nat: forward_to_bsc: remove one level of indentation
..


bsc_nat: forward_to_bsc: remove one level of indentation

Change-Id: I12d86a45a6b2cdc3af7a7b6c28f8f337fa95c903
---
M src/osmo-bsc_nat/bsc_nat_ctrl.c
1 file changed, 50 insertions(+), 49 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bsc_nat/bsc_nat_ctrl.c b/src/osmo-bsc_nat/bsc_nat_ctrl.c
index 9450741..5f82a41 100644
--- a/src/osmo-bsc_nat/bsc_nat_ctrl.c
+++ b/src/osmo-bsc_nat/bsc_nat_ctrl.c
@@ -236,57 +236,58 @@
continue;
if (!bsc->authenticated)
continue;
-   if (bsc->cfg->nr == nr) {
-   /* Add pending command to list */
-   pending = talloc_zero(bsc, struct bsc_cmd_list);
-   if (!pending) {
-   cmd->reply = "OOM";
-   goto err;
-   }
+   if (bsc->cfg->nr != nr)
+   continue;
 
-   pending->nat_id = get_next_free_bsc_id(bsc);
-   if (pending->nat_id < 0) {
-   cmd->reply = "No free ID found";
-   goto err;
-   }
-
-   bsc_cmd = ctrl_cmd_cpy(bsc, cmd);
-   if (!bsc_cmd) {
-   cmd->reply = "Could not forward command";
-   goto err;
-   }
-
-   talloc_free(bsc_cmd->id);
-   bsc_cmd->id = talloc_asprintf(bsc_cmd, "%i", 
pending->nat_id);
-   if (!bsc_cmd->id) {
-   cmd->reply = "OOM";
-   goto err;
-   }
-
-   talloc_free(bsc_cmd->variable);
-   bsc_cmd->variable = talloc_strdup(bsc_cmd, 
bsc_variable);
-   if (!bsc_cmd->variable) {
-   cmd->reply = "OOM";
-   goto err;
-   }
-
-   if (ctrl_cmd_send(>write_queue, bsc_cmd)) {
-   cmd->reply = "Sending failed";
-   goto err;
-   }
-   pending->ccon = cmd->ccon;
-   pending->ccon->closed_cb = ctrl_conn_closed_cb;
-   pending->cmd = cmd;
-
-   /* Setup the timeout */
-   osmo_timer_setup(>timeout, pending_timeout_cb,
-pending);
-   /* TODO: Make timeout configurable */
-   osmo_timer_schedule(>timeout, 10, 0);
-   llist_add_tail(>list_entry, >cmd_pending);
-
-   goto done;
+   /* Add pending command to list */
+   pending = talloc_zero(bsc, struct bsc_cmd_list);
+   if (!pending) {
+   cmd->reply = "OOM";
+   goto err;
}
+
+   pending->nat_id = get_next_free_bsc_id(bsc);
+   if (pending->nat_id < 0) {
+   cmd->reply = "No free ID found";
+   goto err;
+   }
+
+   bsc_cmd = ctrl_cmd_cpy(bsc, cmd);
+   if (!bsc_cmd) {
+   cmd->reply = "Could not forward command";
+   goto err;
+   }
+
+   talloc_free(bsc_cmd->id);
+   bsc_cmd->id = talloc_asprintf(bsc_cmd, "%i", pending->nat_id);
+   if (!bsc_cmd->id) {
+   cmd->reply = "OOM";
+   goto err;
+   }
+
+   talloc_free(bsc_cmd->variable);
+   bsc_cmd->variable = talloc_strdup(bsc_cmd, bsc_variable);
+   if (!bsc_cmd->variable) {
+   cmd->reply = "OOM";
+   goto err;
+   }
+
+   if (ctrl_cmd_send(>write_queue, bsc_cmd)) {
+   cmd->reply = "Sending failed";
+   goto err;
+   }
+   pending->ccon = cmd->ccon;
+   pending->ccon->closed_cb = ctrl_conn_closed_cb;
+   pending->cmd = cmd;
+
+   /* Setup the timeout */
+   osmo_timer_setup(>timeout, pending_timeout_cb,
+pending);
+   /* TODO: Make timeout configurable */
+   osmo_timer_schedule(>timeout, 10, 0);
+   llist_add_tail(>list_entry, >cmd_pending);
+
+   goto done;
}
/* We end up here if there's no bsc to handle our LAC 

[MERGED] osmo-bsc[master]: libbsc: set_net_mcc_mnc_apply: Fix memleak on parsing incorr...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: libbsc: set_net_mcc_mnc_apply: Fix memleak on parsing incorrect 
mcc mnc
..


libbsc: set_net_mcc_mnc_apply: Fix memleak on parsing incorrect mcc mnc

Change-Id: I43513e108dfba24efb091d56b3fdfdb0cd0af727
---
M src/libbsc/bsc_ctrl_commands.c
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/libbsc/bsc_ctrl_commands.c b/src/libbsc/bsc_ctrl_commands.c
index 64f4589..171feaf 100644
--- a/src/libbsc/bsc_ctrl_commands.c
+++ b/src/libbsc/bsc_ctrl_commands.c
@@ -149,11 +149,13 @@
 
if (osmo_mcc_from_str(mcc_str, )) {
cmd->reply = "Error while decoding MCC";
+   talloc_free(tmp);
return CTRL_CMD_ERROR;
}
 
if (osmo_mnc_from_str(mnc_str, , _3_digits)) {
cmd->reply = "Error while decoding MNC";
+   talloc_free(tmp);
return CTRL_CMD_ERROR;
}
 

-- 
To view, visit https://gerrit.osmocom.org/7747
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I43513e108dfba24efb091d56b3fdfdb0cd0af727
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] osmo-bsc[master]: bsc_nat: ctrl: fix memleak on reply receival

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: bsc_nat: ctrl: fix memleak on reply receival
..


bsc_nat: ctrl: fix memleak on reply receival

Change-Id: I163d4d12d8656628dc88ff3e59a4c3e53b760a0c
---
M src/osmo-bsc_nat/bsc_nat_ctrl.c
1 file changed, 3 insertions(+), 4 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bsc_nat/bsc_nat_ctrl.c b/src/osmo-bsc_nat/bsc_nat_ctrl.c
index 93cdff3..9450741 100644
--- a/src/osmo-bsc_nat/bsc_nat_ctrl.c
+++ b/src/osmo-bsc_nat/bsc_nat_ctrl.c
@@ -103,7 +103,7 @@
 {
struct ctrl_cmd *cmd;
struct bsc_cmd_list *pending;
-   char *var, *id;
+   char *var;
 
cmd = ctrl_cmd_parse(bsc, msg);
msgb_free(msg);
@@ -143,13 +143,12 @@
/* Find the pending command */
pending = bsc_get_pending(bsc, cmd->id);
if (pending) {
-   id = talloc_strdup(cmd, pending->cmd->id);
-   if (!id) {
+   osmo_talloc_replace_string(cmd, >id, 
pending->cmd->id);
+   if (!cmd->id) {
cmd->type = CTRL_TYPE_ERROR;
cmd->reply = "OOM";
goto err;
}
-   cmd->id = id;
ctrl_cmd_send(>ccon->write_queue, cmd);
bsc_nat_ctrl_del_pending(pending);
} else {

-- 
To view, visit https://gerrit.osmocom.org/7748
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I163d4d12d8656628dc88ff3e59a4c3e53b760a0c
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] openbsc[master]: libbsc: set_net_mcc_mnc_apply: Fix memleak on parsing incorr...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: libbsc: set_net_mcc_mnc_apply: Fix memleak on parsing incorrect 
mcc mnc
..


libbsc: set_net_mcc_mnc_apply: Fix memleak on parsing incorrect mcc mnc

Change-Id: I507b0eced7d86f8e978012f6c19f728cd481196b
---
M openbsc/src/libbsc/bsc_ctrl_commands.c
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/openbsc/src/libbsc/bsc_ctrl_commands.c 
b/openbsc/src/libbsc/bsc_ctrl_commands.c
index 8b8685a..e6c49d1 100644
--- a/openbsc/src/libbsc/bsc_ctrl_commands.c
+++ b/openbsc/src/libbsc/bsc_ctrl_commands.c
@@ -187,11 +187,13 @@
 
if (osmo_mcc_from_str(mcc_str, )) {
cmd->reply = "Error while decoding MCC";
+   talloc_free(tmp);
return CTRL_CMD_ERROR;
}
 
if (osmo_mnc_from_str(mnc_str, , _3_digits)) {
cmd->reply = "Error while decoding MNC";
+   talloc_free(tmp);
return CTRL_CMD_ERROR;
}
 

-- 
To view, visit https://gerrit.osmocom.org/7746
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I507b0eced7d86f8e978012f6c19f728cd481196b
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] openbsc[master]: bsc_nat: ctrl: fix memleak on reply receival

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: bsc_nat: ctrl: fix memleak on reply receival
..


bsc_nat: ctrl: fix memleak on reply receival

Change-Id: I146c4a561b0cd62779d60da3b55b96e24438bd89
---
M openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
1 file changed, 3 insertions(+), 4 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c 
b/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
index 128ea65..738ac87 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
@@ -102,7 +102,7 @@
 {
struct ctrl_cmd *cmd;
struct bsc_cmd_list *pending;
-   char *var, *id;
+   char *var;
 
cmd = ctrl_cmd_parse(bsc, msg);
msgb_free(msg);
@@ -142,13 +142,12 @@
/* Find the pending command */
pending = bsc_get_pending(bsc, cmd->id);
if (pending) {
-   id = talloc_strdup(cmd, pending->cmd->id);
-   if (!id) {
+   osmo_talloc_replace_string(cmd, >id, 
pending->cmd->id);
+   if (!cmd->id) {
cmd->type = CTRL_TYPE_ERROR;
cmd->reply = "OOM";
goto err;
}
-   cmd->id = id;
ctrl_cmd_send(>ccon->write_queue, cmd);
bsc_nat_ctrl_del_pending(pending);
} else {

-- 
To view, visit https://gerrit.osmocom.org/7749
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I146c4a561b0cd62779d60da3b55b96e24438bd89
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] openbsc[master]: bsc_nat: forward_to_bsc: remove one level of indentation

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: bsc_nat: forward_to_bsc: remove one level of indentation
..


bsc_nat: forward_to_bsc: remove one level of indentation

Change-Id: I105be500399259a97ef711f17b4a51e72dc8cc53
---
M openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
1 file changed, 50 insertions(+), 49 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c 
b/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
index 738ac87..797ddf8 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
@@ -235,57 +235,58 @@
continue;
if (!bsc->authenticated)
continue;
-   if (bsc->cfg->nr == nr) {
-   /* Add pending command to list */
-   pending = talloc_zero(bsc, struct bsc_cmd_list);
-   if (!pending) {
-   cmd->reply = "OOM";
-   goto err;
-   }
+   if (bsc->cfg->nr != nr)
+   continue;
 
-   pending->nat_id = get_next_free_bsc_id(bsc);
-   if (pending->nat_id < 0) {
-   cmd->reply = "No free ID found";
-   goto err;
-   }
-
-   bsc_cmd = ctrl_cmd_cpy(bsc, cmd);
-   if (!bsc_cmd) {
-   cmd->reply = "Could not forward command";
-   goto err;
-   }
-
-   talloc_free(bsc_cmd->id);
-   bsc_cmd->id = talloc_asprintf(bsc_cmd, "%i", 
pending->nat_id);
-   if (!bsc_cmd->id) {
-   cmd->reply = "OOM";
-   goto err;
-   }
-
-   talloc_free(bsc_cmd->variable);
-   bsc_cmd->variable = talloc_strdup(bsc_cmd, 
bsc_variable);
-   if (!bsc_cmd->variable) {
-   cmd->reply = "OOM";
-   goto err;
-   }
-
-   if (ctrl_cmd_send(>write_queue, bsc_cmd)) {
-   cmd->reply = "Sending failed";
-   goto err;
-   }
-   pending->ccon = cmd->ccon;
-   pending->ccon->closed_cb = ctrl_conn_closed_cb;
-   pending->cmd = cmd;
-
-   /* Setup the timeout */
-   osmo_timer_setup(>timeout, pending_timeout_cb,
-pending);
-   /* TODO: Make timeout configurable */
-   osmo_timer_schedule(>timeout, 10, 0);
-   llist_add_tail(>list_entry, >cmd_pending);
-
-   goto done;
+   /* Add pending command to list */
+   pending = talloc_zero(bsc, struct bsc_cmd_list);
+   if (!pending) {
+   cmd->reply = "OOM";
+   goto err;
}
+
+   pending->nat_id = get_next_free_bsc_id(bsc);
+   if (pending->nat_id < 0) {
+   cmd->reply = "No free ID found";
+   goto err;
+   }
+
+   bsc_cmd = ctrl_cmd_cpy(bsc, cmd);
+   if (!bsc_cmd) {
+   cmd->reply = "Could not forward command";
+   goto err;
+   }
+
+   talloc_free(bsc_cmd->id);
+   bsc_cmd->id = talloc_asprintf(bsc_cmd, "%i", pending->nat_id);
+   if (!bsc_cmd->id) {
+   cmd->reply = "OOM";
+   goto err;
+   }
+
+   talloc_free(bsc_cmd->variable);
+   bsc_cmd->variable = talloc_strdup(bsc_cmd, bsc_variable);
+   if (!bsc_cmd->variable) {
+   cmd->reply = "OOM";
+   goto err;
+   }
+
+   if (ctrl_cmd_send(>write_queue, bsc_cmd)) {
+   cmd->reply = "Sending failed";
+   goto err;
+   }
+   pending->ccon = cmd->ccon;
+   pending->ccon->closed_cb = ctrl_conn_closed_cb;
+   pending->cmd = cmd;
+
+   /* Setup the timeout */
+   osmo_timer_setup(>timeout, pending_timeout_cb,
+pending);
+   /* TODO: Make timeout configurable */
+   osmo_timer_schedule(>timeout, 10, 0);
+   llist_add_tail(>list_entry, >cmd_pending);
+
+   goto done;
}
/* We end up 

[MERGED] openbsc[master]: bsc_nat: forward_to_bsc: Fix memleak on send failure

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: bsc_nat: forward_to_bsc: Fix memleak on send failure
..


bsc_nat: forward_to_bsc: Fix memleak on send failure

Change-Id: If0dfae40f03db297eeb4e296daf5fe78ba53a11b
---
M openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c 
b/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
index 797ddf8..d6bf1e5 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
@@ -219,7 +219,7 @@
int ret = CTRL_CMD_HANDLED;
struct ctrl_cmd *bsc_cmd = NULL;
struct bsc_connection *bsc;
-   struct bsc_cmd_list *pending;
+   struct bsc_cmd_list *pending = NULL;
unsigned int nr;
char *bsc_variable;
 
@@ -292,6 +292,7 @@
cmd->reply = "no BSC with this nr";
 err:
ret = CTRL_CMD_ERROR;
+   talloc_free(pending);
 done:
talloc_free(bsc_cmd);
return ret;

-- 
To view, visit https://gerrit.osmocom.org/7759
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If0dfae40f03db297eeb4e296daf5fe78ba53a11b
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] openbsc[master]: bsc_nat: Drop redundant ccon ptr in bsc_cmd_list

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: bsc_nat: Drop redundant ccon ptr in bsc_cmd_list
..


bsc_nat: Drop redundant ccon ptr in bsc_cmd_list

Change-Id: Ic2e4ca7d8eb4e8f71dc773b3f2c0f09709d90a94
---
M openbsc/include/openbsc/bsc_nat.h
M openbsc/src/osmo-bsc_nat/bsc_nat.c
M openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
3 files changed, 5 insertions(+), 9 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/openbsc/include/openbsc/bsc_nat.h 
b/openbsc/include/openbsc/bsc_nat.h
index 94ab0e5..fad3804 100644
--- a/openbsc/include/openbsc/bsc_nat.h
+++ b/openbsc/include/openbsc/bsc_nat.h
@@ -70,9 +70,6 @@
/* The NATed ID used on the bsc_con*/
int nat_id;
 
-   /* The control connection from which the command originated */
-   struct ctrl_connection *ccon;
-
/* The command from the control connection */
struct ctrl_cmd *cmd;
 };
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c 
b/openbsc/src/osmo-bsc_nat/bsc_nat.c
index f83abe1..57b51a2 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c
@@ -936,7 +936,7 @@
llist_for_each_entry_safe(cmd_entry, cmd_tmp, >cmd_pending, 
list_entry) {
cmd_entry->cmd->type = CTRL_TYPE_ERROR;
cmd_entry->cmd->reply = "BSC closed the connection";
-   ctrl_cmd_send(_entry->ccon->write_queue, cmd_entry->cmd);
+   ctrl_cmd_send(_entry->cmd->ccon->write_queue, 
cmd_entry->cmd);
bsc_nat_ctrl_del_pending(cmd_entry);
}
 
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c 
b/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
index d6bf1e5..22c3608 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
@@ -148,7 +148,7 @@
cmd->reply = "OOM";
goto err;
}
-   ctrl_cmd_send(>ccon->write_queue, cmd);
+   ctrl_cmd_send(>cmd->ccon->write_queue, cmd);
bsc_nat_ctrl_del_pending(pending);
} else {
/* We need to handle TRAPS here */
@@ -176,7 +176,7 @@
LOGP(DNAT, LOGL_ERROR, "Command timed out\n");
pending->cmd->type = CTRL_TYPE_ERROR;
pending->cmd->reply = "Command timed out";
-   ctrl_cmd_send(>ccon->write_queue, pending->cmd);
+   ctrl_cmd_send(>cmd->ccon->write_queue, pending->cmd);
 
bsc_nat_ctrl_del_pending(pending);
 }
@@ -188,7 +188,7 @@
 
llist_for_each_entry(bsc, _nat->bsc_connections, list_entry) {
llist_for_each_entry_safe(pending, tmp, >cmd_pending, 
list_entry) {
-   if (pending->ccon == connection)
+   if (pending->cmd->ccon == connection)
bsc_nat_ctrl_del_pending(pending);
}
}
@@ -275,8 +275,7 @@
cmd->reply = "Sending failed";
goto err;
}
-   pending->ccon = cmd->ccon;
-   pending->ccon->closed_cb = ctrl_conn_closed_cb;
+   cmd->ccon->closed_cb = ctrl_conn_closed_cb;
pending->cmd = cmd;
 
/* Setup the timeout */

-- 
To view, visit https://gerrit.osmocom.org/7761
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2e4ca7d8eb4e8f71dc773b3f2c0f09709d90a94
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] osmo-bsc[master]: bsc_nat: forward_to_bsc: Fix memleak on send failure

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: bsc_nat: forward_to_bsc: Fix memleak on send failure
..


bsc_nat: forward_to_bsc: Fix memleak on send failure

Change-Id: I56235eb05e4beed1bf9151319b64d67de4718e36
---
M src/osmo-bsc_nat/bsc_nat_ctrl.c
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bsc_nat/bsc_nat_ctrl.c b/src/osmo-bsc_nat/bsc_nat_ctrl.c
index 5f82a41..5d551ac 100644
--- a/src/osmo-bsc_nat/bsc_nat_ctrl.c
+++ b/src/osmo-bsc_nat/bsc_nat_ctrl.c
@@ -220,7 +220,7 @@
int ret = CTRL_CMD_HANDLED;
struct ctrl_cmd *bsc_cmd = NULL;
struct bsc_connection *bsc;
-   struct bsc_cmd_list *pending;
+   struct bsc_cmd_list *pending = NULL;
unsigned int nr;
char *bsc_variable;
 
@@ -293,6 +293,7 @@
cmd->reply = "no BSC with this nr";
 err:
ret = CTRL_CMD_ERROR;
+   talloc_free(pending);
 done:
talloc_free(bsc_cmd);
return ret;

-- 
To view, visit https://gerrit.osmocom.org/7758
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I56235eb05e4beed1bf9151319b64d67de4718e36
Gerrit-PatchSet: 3
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] osmo-bsc[master]: bsc_nat: Drop redundant ccon ptr in bsc_cmd_list

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: bsc_nat: Drop redundant ccon ptr in bsc_cmd_list
..


bsc_nat: Drop redundant ccon ptr in bsc_cmd_list

It can be obtained from cmd field, so no need to store it in pending.
This way we simplify the ad-hoc struct bsc_cmd_list.

Change-Id: I6de64fc128ad623ca30b9e6cebebaff8de18f95d
---
M include/osmocom/bsc/bsc_nat.h
M src/osmo-bsc_nat/bsc_nat.c
M src/osmo-bsc_nat/bsc_nat_ctrl.c
3 files changed, 5 insertions(+), 9 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/bsc/bsc_nat.h b/include/osmocom/bsc/bsc_nat.h
index 452daf2..6146c00 100644
--- a/include/osmocom/bsc/bsc_nat.h
+++ b/include/osmocom/bsc/bsc_nat.h
@@ -70,9 +70,6 @@
/* The NATed ID used on the bsc_con*/
int nat_id;
 
-   /* The control connection from which the command originated */
-   struct ctrl_connection *ccon;
-
/* The command from the control connection */
struct ctrl_cmd *cmd;
 };
diff --git a/src/osmo-bsc_nat/bsc_nat.c b/src/osmo-bsc_nat/bsc_nat.c
index a5dbf97..af97c57 100644
--- a/src/osmo-bsc_nat/bsc_nat.c
+++ b/src/osmo-bsc_nat/bsc_nat.c
@@ -935,7 +935,7 @@
llist_for_each_entry_safe(cmd_entry, cmd_tmp, >cmd_pending, 
list_entry) {
cmd_entry->cmd->type = CTRL_TYPE_ERROR;
cmd_entry->cmd->reply = "BSC closed the connection";
-   ctrl_cmd_send(_entry->ccon->write_queue, cmd_entry->cmd);
+   ctrl_cmd_send(_entry->cmd->ccon->write_queue, 
cmd_entry->cmd);
bsc_nat_ctrl_del_pending(cmd_entry);
}
 
diff --git a/src/osmo-bsc_nat/bsc_nat_ctrl.c b/src/osmo-bsc_nat/bsc_nat_ctrl.c
index 5d551ac..7df3ca3 100644
--- a/src/osmo-bsc_nat/bsc_nat_ctrl.c
+++ b/src/osmo-bsc_nat/bsc_nat_ctrl.c
@@ -149,7 +149,7 @@
cmd->reply = "OOM";
goto err;
}
-   ctrl_cmd_send(>ccon->write_queue, cmd);
+   ctrl_cmd_send(>cmd->ccon->write_queue, cmd);
bsc_nat_ctrl_del_pending(pending);
} else {
/* We need to handle TRAPS here */
@@ -177,7 +177,7 @@
LOGP(DNAT, LOGL_ERROR, "Command timed out\n");
pending->cmd->type = CTRL_TYPE_ERROR;
pending->cmd->reply = "Command timed out";
-   ctrl_cmd_send(>ccon->write_queue, pending->cmd);
+   ctrl_cmd_send(>cmd->ccon->write_queue, pending->cmd);
 
bsc_nat_ctrl_del_pending(pending);
 }
@@ -189,7 +189,7 @@
 
llist_for_each_entry(bsc, _nat->bsc_connections, list_entry) {
llist_for_each_entry_safe(pending, tmp, >cmd_pending, 
list_entry) {
-   if (pending->ccon == connection)
+   if (pending->cmd->ccon == connection)
bsc_nat_ctrl_del_pending(pending);
}
}
@@ -276,8 +276,7 @@
cmd->reply = "Sending failed";
goto err;
}
-   pending->ccon = cmd->ccon;
-   pending->ccon->closed_cb = ctrl_conn_closed_cb;
+   cmd->ccon->closed_cb = ctrl_conn_closed_cb;
pending->cmd = cmd;
 
/* Setup the timeout */

-- 
To view, visit https://gerrit.osmocom.org/7760
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6de64fc128ad623ca30b9e6cebebaff8de18f95d
Gerrit-PatchSet: 3
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[MERGED] openbsc[master]: bsc_nat: ctrl: Fix crash on receveing bsc reply

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: bsc_nat: ctrl: Fix crash on receveing bsc reply
..


bsc_nat: ctrl: Fix crash on receveing bsc reply

Since libosmocore 7c0031fc8063771e604976233fb7b46d2b85c077, the cmd
param passed to handlers in ctrl_handle_msg is always freed afterwards,
thus it is owned by the same function. Avoid keeping it alive and
accessing it later when it has already been freed.

Related: OS#3157

Change-Id: Ib1e1fb79746d4a4f3e30254fdb7a7e851c2cd0e4
---
M openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
1 file changed, 8 insertions(+), 2 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c 
b/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
index 22c3608..61ac887 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
@@ -79,7 +79,6 @@
 {
llist_del(>list_entry);
osmo_timer_del(>timeout);
-   talloc_free(pending->cmd);
talloc_free(pending);
 }
 
@@ -275,8 +274,15 @@
cmd->reply = "Sending failed";
goto err;
}
+
+   /* caller owns cmd param and will destroy it after we return */
+   pending->cmd = ctrl_cmd_cpy(pending, cmd);
+   if (!pending->cmd) {
+   cmd->reply = "Could not answer command";
+   goto err;
+   }
cmd->ccon->closed_cb = ctrl_conn_closed_cb;
-   pending->cmd = cmd;
+   pending->cmd->ccon = cmd->ccon;
 
/* Setup the timeout */
osmo_timer_setup(>timeout, pending_timeout_cb,

-- 
To view, visit https://gerrit.osmocom.org/7764
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1e1fb79746d4a4f3e30254fdb7a7e851c2cd0e4
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: daniel 

[MERGED] osmo-bsc[master]: only log actual access control class ramping changes

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: only log actual access control class ramping changes
..


only log actual access control class ramping changes

Silence log messages about no-op changes to access granted to access
control classes. For example, these always occur while configuration
files are being loaded.

Change-Id: I37580f4058f6e3a21d338234b1e22ea46f9538c6
Related: OS#2591
---
M src/libbsc/acc_ramp.c
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/libbsc/acc_ramp.c b/src/libbsc/acc_ramp.c
index 7cace4b..5d35842 100644
--- a/src/libbsc/acc_ramp.c
+++ b/src/libbsc/acc_ramp.c
@@ -42,14 +42,16 @@
 static void allow_one_acc(struct acc_ramp *acc_ramp, unsigned int acc)
 {
OSMO_ASSERT(acc >= 0 && acc <= 9);
-   LOGP(DRSL, LOGL_DEBUG, "(bts=%d) ACC RAMP: allowing Access Control 
Class %u\n", acc_ramp->bts->nr, acc);
+   if (acc_ramp->barred_accs & (1 << acc))
+   LOGP(DRSL, LOGL_DEBUG, "(bts=%d) ACC RAMP: allowing Access 
Control Class %u\n", acc_ramp->bts->nr, acc);
acc_ramp->barred_accs &= ~(1 << acc);
 }
 
 static void barr_one_acc(struct acc_ramp *acc_ramp, unsigned int acc)
 {
OSMO_ASSERT(acc >= 0 && acc <= 9);
-   LOGP(DRSL, LOGL_DEBUG, "(bts=%d) ACC RAMP: barring Access Control Class 
%u\n", acc_ramp->bts->nr, acc);
+   if ((acc_ramp->barred_accs & (1 << acc)) == 0)
+   LOGP(DRSL, LOGL_DEBUG, "(bts=%d) ACC RAMP: barring Access 
Control Class %u\n", acc_ramp->bts->nr, acc);
acc_ramp->barred_accs |= (1 << acc);
 }
 

-- 
To view, visit https://gerrit.osmocom.org/7722
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I37580f4058f6e3a21d338234b1e22ea46f9538c6
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Stefan Sperling 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol 

[MERGED] osmo-ci[master]: osmocom-jenkins-slave: install gsm-manual dependencies

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: osmocom-jenkins-slave: install gsm-manual dependencies
..


osmocom-jenkins-slave: install gsm-manual dependencies

Change-Id: I3fa60bd986220e065b1e9eca4308f2b089d505d9
---
M ansible/roles/osmocom-jenkins-slave/tasks/main.yml
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved; Verified



diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml 
b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml
index 805a81e..4d7b963 100644
--- a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml
+++ b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml
@@ -41,6 +41,9 @@
 - python3-setuptools
 - stow
 - texinfo
+# by gsm-manuals
+- python-nwdiag
+- python-pychart
 
 - name: install build dependencies and libraries
   apt:

-- 
To view, visit https://gerrit.osmocom.org/7726
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3fa60bd986220e065b1e9eca4308f2b089d505d9
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 

osmo-ci[master]: jobs: master-builds.yml: allow osmo-gsm-manuals to build any...

[Harald Welte]

Patch Set 1: Verified+1

-- 
To view, visit https://gerrit.osmocom.org/7727
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ic5fe39b643e7a15dbfd2efd55dce78dde30cf099
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-HasComments: No

[MERGED] osmo-ci[master]: jobs: master-builds.yml: allow osmo-gsm-manuals to build any...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: jobs: master-builds.yml: allow osmo-gsm-manuals to build 
anywhere
..


jobs: master-builds.yml: allow osmo-gsm-manuals to build anywhere

When https://gerrit.osmocom.org/#/c/7725/ has been merged, there
is no need to limit this build to OsmocomApi.

Change-Id: Ic5fe39b643e7a15dbfd2efd55dce78dde30cf099
---
M jobs/master-builds.yml
1 file changed, 7 insertions(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved; Verified



diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 79ce8c2..dff78fa 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -17,6 +17,7 @@
 sequential: false
 # most common build invocation
 cmd: ./contrib/jenkins.sh
+wrappers: []
 trigger:
 
 # in alphabetical order
@@ -206,10 +207,14 @@
 
   - osmo-gsm-manuals:
   # publishing once is plenty
-  slave_axis: !!python/tuple [OsmocomBuild1]
   cmd: >
# keep first line with less indent to preserve newlines
 ./contrib/jenkins.sh --publish
+  # requires to have a ssh-key credentials called "api" (Id)
+  wrappers:
+- ssh-agent-credentials:
+  users:
+  - api
 
   - osmo-hlr
 
@@ -385,5 +390,6 @@
- email:
recipients: gerrit-log@lists.osmocom.org, lafo...@gnumonks.org
send-to-individuals: true
+wrappers: '{obj:wrappers}'
 
 # vim: expandtab tabstop=2 shiftwidth=2

-- 
To view, visit https://gerrit.osmocom.org/7727
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5fe39b643e7a15dbfd2efd55dce78dde30cf099
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 

osmo-ci[master]: osmocom-jenkins-slave: install gsm-manual dependencies

[Harald Welte]

Patch Set 1: Verified+1

-- 
To view, visit https://gerrit.osmocom.org/7726
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I3fa60bd986220e065b1e9eca4308f2b089d505d9
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-HasComments: No

[MERGED] osmo-ttcn3-hacks[master]: MSC_Tests: fix TC_mo_crcx_ran_reject

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: MSC_Tests: fix TC_mo_crcx_ran_reject
..


MSC_Tests: fix TC_mo_crcx_ran_reject

The testcase intentionally responds to the RAN sided CRCX
with a garbeled message to cause the MGCP handlin inside
the MSC to fail. The MSC is then expected not to perform
further MGCP operations since it did not get a proper
response to the first CRCX, so the specific endpoint name
is not known, eventually preventing from doing an MDCX.

However, the testcase responds to incoming DLCX commands,
instead setting the verdict to fail.

Also the altstep that dispatches the message after the
errornous MGCP response unconditionally catches all BSSAP
messages before entering the sub-altstep
as_clear_cmd_compl_disc() that handles the clearing of
the connection. Eventually the clear command is never
received in this sub-altstep.

- Make sure the verdict is set to fail when an MGCP
  message is received after the errornous response to
  the CRCX.

- Remove the unconditional BSSAP.receive in order to
  be able to dispatch the clear command properly

- Update the expected-results.log file

Change-Id: I806491741d310e4410f6cb4ce0309235e9bf4300
Related: OS#2882
---
M msc/MSC_Tests.ttcn
M msc/expected-results.log
2 files changed, 82 insertions(+), 90 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index b5108c7..bb28c74 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -1267,17 +1267,14 @@

BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_REL_COMPL(cpars.transaction_id)));
repeat;
}
-   [] BSSAP.receive {
-   repeat;
-   }
[] MNCC.receive { repeat; }
[] GSUP.receive { repeat; }
-   [] MGCP.receive(tr_DLCX(?)) -> value mgcp_cmd {
-   MGCP.send(ts_DLCX_ACK2(mgcp_cmd.line.trans_id));
-   f_create_mgcp_delete_ep(cpars.mgcp_ep);
-   repeat;
-   }
-   [] MGCP.receive { repeat; }
+   /* Note: As we did not respond properly to the CRCX from the MSC we
+* expect the MSC to omit any further MGCP operation (At least in the
+* the current implementation, there is no recovery mechanism 
implemented
+* and a DLCX can not be performed as the MSC does not know a specific
+* endpoint yet. */
+   [] MGCP.receive { setverdict(fail, "Unexpected MGCP message"); 
self.stop; }
[] as_clear_cmd_compl_disc();
}
 }
diff --git a/msc/expected-results.log b/msc/expected-results.log
index 92c38a0..ebda8a4 100644
--- a/msc/expected-results.log
+++ b/msc/expected-results.log
@@ -1,115 +1,110 @@
 
-
-  
-  
-  
-  
+
+  
+  
+  
+  
 Timeout waiting for ClearCommand/Release
-  MSC_Tests.ttcn:1829 MSC_Tests control part
+  MSC_Tests.ttcn:1832 MSC_Tests control part
   MSC_Tests.ttcn:502 TC_lu_imsi_reject testcase
 
   
-  
+  
 Timeout waiting for ClearCommand/Release
-  MSC_Tests.ttcn:1830 MSC_Tests control part
+  MSC_Tests.ttcn:1833 MSC_Tests control part
   MSC_Tests.ttcn:531 TC_lu_imsi_timeout_gsup testcase
 
   
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
 Got a second Clear Command, only one expected
-  MSC_Tests.ttcn:1832 MSC_Tests control part
+  MSC_Tests.ttcn:1839 MSC_Tests control part
   MSC_Tests.ttcn:704 TC_lu_clear_request testcase
 
   
-  
-  
-  
-  
-  
-  
-  
-Timeout waiting for ClearCommand/Release
-  MSC_Tests.ttcn:1843 MSC_Tests control part
-  MSC_Tests.ttcn:903 TC_emerg_call_imei_reject testcase
-
-  
-  
-  
-Timeout waiting for ClearCommand/Release
-  MSC_Tests.ttcn:1845 MSC_Tests control part
-  MSC_Tests.ttcn:940 TC_cm_serv_req_vgcs_reject testcase
-
-  
-  
+  
+  
+  
+  
+  
+  
+  
 Timeout waiting for ClearCommand/Release
   MSC_Tests.ttcn:1846 MSC_Tests control part
-  MSC_Tests.ttcn:961 TC_cm_serv_req_vbs_reject testcase
+  MSC_Tests.ttcn:909 TC_emerg_call_imei_reject testcase
 
   
-  
-Timeout waiting for ClearCommand/Release
-  MSC_Tests.ttcn:1847 MSC_Tests control part
-  MSC_Tests.ttcn:982 TC_cm_serv_req_lcs_reject testcase
-
-  
-  
+  
+  
 Timeout waiting for ClearCommand/Release
   MSC_Tests.ttcn:1848 MSC_Tests control part
-  MSC_Tests.ttcn:1003 TC_cm_reest_req_reject testcase
+  MSC_Tests.ttcn:946 TC_cm_serv_req_vgcs_reject testcase
 
   
-  
-  
-  
-  
+  
+Timeout waiting for ClearCommand/Release
+  MSC_Tests.ttcn:1849 MSC_Tests control part
+  MSC_Tests.ttcn:967 TC_cm_serv_req_vbs_reject testcase
+
+  
+  
+Timeout waiting for ClearCommand/Release
+  MSC_Tests.ttcn:1850 MSC_Tests control part
+  MSC_Tests.ttcn:988 TC_cm_serv_req_lcs_reject testcase
+
+  
+  
+Timeout waiting for 

osmo-ttcn3-hacks[master]: mask timestamps and source file nrs in expected-results.xml ...

[Harald Welte]

Patch Set 1:

see my other comment. Not sure if this is still valid Junit2-XML.  Various 
parsers might expect a float value, not some string?

As the "time" attribute is an optional attribute AFAICT, it might be best to 
find or implement a way to suppress it being generated by titan in the first 
place?

-- 
To view, visit https://gerrit.osmocom.org/7753
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ic9f006aa8db1b477598605e0525faeb229b03641
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

[MERGED] osmo-msc[master]: msc_mgcp: do not send wildcarded DLCX messages

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: msc_mgcp: do not send wildcarded DLCX messages
..


msc_mgcp: do not send wildcarded DLCX messages

If an error on the MGW side occurs, the MSC may send out
a DLCX command that contains a wildcarded endpoint name.
Wildcarded DLCX commands are legal in principle but not
in the context of an error on a single endpoint. Apart
from that osmo-mgw is (not yet) capable to handle
wildcarded DLCX command.

The problem is caused by a wrong error handling. When the
first (RAN) CRCX fails the error handling logic tries to
perform a DLCX, but since we did not receive a specific
endpoint name yet, the buffer containing the endpoint name
is still initalized with the wildcarded enpoint name, but
the error handler and the code that generates the DLCX is
not aware of that.

- Perform a check in the error handler function that
  checks if a DLCX can be made (a specific endpoint
  name is set

- Correct the flags in the code that handles the first
  CRCX so that no DLCX is requested in the case of error

Related OS#2882

Change-Id: I64c2a82016d854ad446fd49a5d76a28324e8bd4b
---
M src/libmsc/msc_mgcp.c
1 file changed, 25 insertions(+), 5 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c
index b0c68a5..7c49c6e 100644
--- a/src/libmsc/msc_mgcp.c
+++ b/src/libmsc/msc_mgcp.c
@@ -156,6 +156,7 @@
 static void _handle_error(struct mgcp_ctx *mgcp_ctx, enum msc_mgcp_cause_code 
cause, bool dlcx, const char *file,
  int line)
 {
+   bool dlcx_possible = true;
struct osmo_fsm_inst *fi;
struct gsm_mncc mncc = {
.msg_type = MNCC_REL_REQ,
@@ -171,6 +172,14 @@
fi = mgcp_ctx->fsm;
OSMO_ASSERT(fi);
 
+   /* Check if the endpoint identifier is a specific endpoint identifier,
+* since in order to perform a DLCX we must know the specific
+* identifier of the endpoint we want to release. If we do not have
+* this information because of errornous communication we can not
+* perform a DLCX. */
+   if (strstr(mgcp_ctx->rtp_endpoint, "*"))
+   dlcx_possible = false;
+
LOGPFSMLSRC(mgcp_ctx->fsm, LOGL_ERROR, file, line, "%s -- graceful 
shutdown...\n",
get_value_string(msc_mgcp_cause_codes_names, cause));
 
@@ -180,7 +189,7 @@
 * where a DLCX does not make sense (e.g. the MGW times out), halting
 * directly is the better options. In those cases, the dlcx flag
 * should not be set */
-   if (dlcx) {
+   if (dlcx && dlcx_possible) {
/* Fast-forward the FSM into call state. In this state the FSM
 * expects either an EV_TEARDOWN or an EV_TEARDOWN_ERROR. When
 * one of the two events is received a DLCX will be send to
@@ -273,6 +282,10 @@
mgcp = mgcp_ctx->mgcp;
OSMO_ASSERT(mgcp);
 
+   /* NOTE: In case of error, we will not be able to perform any DLCX
+* operation because until this point we do not have requested any
+* endpoint yet. */
+
LOGPFSML(fi, LOGL_DEBUG,
 "CRCX/RAN: creating connection for the RAN side on MGW 
endpoint:%s...\n", mgcp_ctx->rtp_endpoint);
 
@@ -285,7 +298,7 @@
};
if (osmo_strlcpy(mgcp_msg.endpoint, mgcp_ctx->rtp_endpoint, 
sizeof(mgcp_msg.endpoint)) >=
MGCP_ENDPOINT_MAXLEN) {
-   handle_error(mgcp_ctx, MGCP_ERR_TOOLONG, true);
+   handle_error(mgcp_ctx, MGCP_ERR_TOOLONG, false);
return;
}
 
@@ -296,7 +309,7 @@
mgcp_ctx->mgw_pending_trans = mgcp_msg_trans_id(msg);
rc = mgcp_client_tx(mgcp, msg, mgw_crcx_ran_resp_cb, mgcp_ctx);
if (rc < 0) {
-   handle_error(mgcp_ctx, MGCP_ERR_MGW_TX_FAIL, true);
+   handle_error(mgcp_ctx, MGCP_ERR_MGW_TX_FAIL, false);
return;
}
 
@@ -311,6 +324,13 @@
struct gsm_trans *trans;
struct gsm_subscriber_connection *conn;
 
+   /* NOTE: In case of error, we will not be able to perform any DLCX
+* operation because until we either get a parseable message that
+* contains an error code (no endpoint is seized in those cases)
+* or we get an unparseable message. In this case we can not be
+* sure, but we also can not draw any assumptions from unparseable
+* messages. */
+
OSMO_ASSERT(mgcp_ctx);
trans = mgcp_ctx->trans;
OSMO_ASSERT(trans);
@@ -320,7 +340,7 @@
if (r->head.response_code != 200) {
LOGPFSML(mgcp_ctx->fsm, LOGL_ERROR,
 "CRCX/RAN: response yields error: %d %s\n", 
r->head.response_code, r->head.comment);
-   handle_error(mgcp_ctx, MGCP_ERR_MGW_FAIL, true);
+   

osmo-ttcn3-hacks[master]: add mask_expected_results.sh

[Harald Welte]

Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/7752/1/mask_expected_results.sh
File mask_expected_results.sh:

Line 5:   sed -i "s/time='[^']*'/time='MASKED'/g" "$target"
does the "MASKED" still constitute valid Juni2-XML? Is there a DTD available 
somewhere for Junit2-XML? Did you try to validate it?


-- 
To view, visit https://gerrit.osmocom.org/7752
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I785e126b1f5afddd1b722bc5e922ed90970efa8a
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: Yes

osmo-bsc[master]: bsc_nat: forward_to_bsc: Fix memleak on send failure

[Harald Welte]

Patch Set 2: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7758
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I56235eb05e4beed1bf9151319b64d67de4718e36
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

osmo-ttcn3-hacks[master]: add mask_expected_results.sh

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7752
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I785e126b1f5afddd1b722bc5e922ed90970efa8a
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

osmo-ttcn3-hacks[master]: fix build: don't clean out expected-results.log: rename to *...

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7751
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ic334f6b758eef865e3a497aa430691a3ae696d25
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

osmo-ttcn3-hacks[master]: add update_expected_results_from_jenkins.sh

[Harald Welte]

Patch Set 1:

I think this script deserves some usage documentation / comments?

-- 
To view, visit https://gerrit.osmocom.org/7754
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib3ad8554fc59112c11325425ccd70ca1dbd8c123
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

osmo-msc[master]: msc_mgcp.c: log endpoint name instead of pointer

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7762
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I01b3d07aeedd72be60361249a5bf80fbb68b7bb8
Gerrit-PatchSet: 1
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: dexter 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

[MERGED] osmo-msc[master]: msc_mgcp.c: log endpoint name instead of pointer

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: msc_mgcp.c: log endpoint name instead of pointer
..


msc_mgcp.c: log endpoint name instead of pointer

The logtext currently logs the pointer (address) of the string
variable that holds the endpoint name, rather then the endpoint
name itself.

- Use %s instead of %p in format string

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

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c
index 3cd02c2..b0c68a5 100644
--- a/src/libmsc/msc_mgcp.c
+++ b/src/libmsc/msc_mgcp.c
@@ -274,7 +274,7 @@
OSMO_ASSERT(mgcp);
 
LOGPFSML(fi, LOGL_DEBUG,
-"CRCX/RAN: creating connection for the RAN side on MGW 
endpoint:%p...\n", mgcp_ctx->rtp_endpoint);
+"CRCX/RAN: creating connection for the RAN side on MGW 
endpoint:%s...\n", mgcp_ctx->rtp_endpoint);
 
/* Generate MGCP message string */
mgcp_msg = (struct mgcp_msg) {
@@ -370,7 +370,7 @@
}
 
LOGPFSML(fi, LOGL_DEBUG,
-"CRCX/CN creating connection for the CN side on MGW 
endpoint:%p...\n", mgcp_ctx->rtp_endpoint);
+"CRCX/CN creating connection for the CN side on MGW 
endpoint:%s...\n", mgcp_ctx->rtp_endpoint);
 
/* Generate MGCP message string */
mgcp_msg = (struct mgcp_msg) {
@@ -733,7 +733,7 @@
OSMO_ASSERT(mgcp);
 
LOGPFSML(fi, LOGL_DEBUG,
-"DLCX: removing connection for the RAN and CN side on MGW 
endpoint:%p...\n", mgcp_ctx->rtp_endpoint);
+"DLCX: removing connection for the RAN and CN side on MGW 
endpoint:%s...\n", mgcp_ctx->rtp_endpoint);
 
/* Generate MGCP message string */
mgcp_msg = (struct mgcp_msg) {

-- 
To view, visit https://gerrit.osmocom.org/7762
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I01b3d07aeedd72be60361249a5bf80fbb68b7bb8
Gerrit-PatchSet: 1
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: dexter 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

osmo-msc[master]: msc_mgcp: do not send wildcarded DLCX messages

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7763
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I64c2a82016d854ad446fd49a5d76a28324e8bd4b
Gerrit-PatchSet: 1
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: dexter 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

osmo-bsc[master]: bsc_nat: forward_to_bsc: remove one level of indentation

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7756
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I12d86a45a6b2cdc3af7a7b6c28f8f337fa95c903
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

openbsc[master]: bsc_nat: Drop redundant ccon ptr in bsc_cmd_list

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7761
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ic2e4ca7d8eb4e8f71dc773b3f2c0f09709d90a94
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

openbsc[master]: bsc_nat: forward_to_bsc: Fix memleak on send failure

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7759
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If0dfae40f03db297eeb4e296daf5fe78ba53a11b
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

openbsc[master]: bsc_nat: forward_to_bsc: remove one level of indentation

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7757
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I105be500399259a97ef711f17b4a51e72dc8cc53
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

openbsc[master]: bsc_nat: ctrl: Fix crash on receveing bsc reply

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7764
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib1e1fb79746d4a4f3e30254fdb7a7e851c2cd0e4
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: daniel 
Gerrit-HasComments: No