From gerrit-no-reply at lists.osmocom.org Mon Oct 1 13:35:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 1 Oct 2018 13:35:39 +0000 Subject: Change in osmo-iuh[master]: fix transport layer addr again, for nano3g In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11167 ) Change subject: fix transport layer addr again, for nano3g ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0ad8bce6fcfd3829394c39490058c1ab85cdfde3 Gerrit-Change-Number: 11167 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 01 Oct 2018 13:35:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 13:35:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 1 Oct 2018 13:35:40 +0000 Subject: Change in osmo-iuh[master]: fix transport layer addr again, for nano3g In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11167 ) Change subject: fix transport layer addr again, for nano3g ...................................................................... fix transport layer addr again, for nano3g The nano3G sends the RAB Assignment Response's Transport Layer Address in X.213 NSAP padded to 20 bytes (160bit). Do not interpret it as 4-byte IP address, which currently breaks nano3G voice calls (wrong RTP IP address). Recent commit I2cd1b2d8e1c1ae707cfc0dc7961a2b31ecdf29e0 fixed decoding of X.213 NSAP that is exactly seven bytes, but broke decoding of the padded version from the nano3G. A proper X.213 NSAP decoding would still be more welcome than this patching back and forth, but this is (another) quick fix without spending too much time on it. Related: OS#3420 Change-Id: I0ad8bce6fcfd3829394c39490058c1ab85cdfde3 --- M src/iu_helpers.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/iu_helpers.c b/src/iu_helpers.c index 39b0521..bf82fde 100644 --- a/src/iu_helpers.c +++ b/src/iu_helpers.c @@ -109,7 +109,7 @@ buf = trasp_layer_addr->buf; len = trasp_layer_addr->size; - if (buf[0] == 0x35 && len == 7) + if (buf[0] == 0x35 && len >= 7) rc = inet_ntop(AF_INET, buf + 3, addr, addr_len); else if (len > 3) rc = inet_ntop(AF_INET, buf, addr, addr_len); -- To view, visit https://gerrit.osmocom.org/11167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0ad8bce6fcfd3829394c39490058c1ab85cdfde3 Gerrit-Change-Number: 11167 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 13:35:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 1 Oct 2018 13:35:52 +0000 Subject: Change in osmo-bsc[master]: cosmetics: Fix typo in bsc_vty.c In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11166 ) Change subject: cosmetics: Fix typo in bsc_vty.c ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I65d3e6c6dc252fd60d2dd6b6687ceef4d75034ed Gerrit-Change-Number: 11166 Gerrit-PatchSet: 1 Gerrit-Owner: roox Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 01 Oct 2018 13:35:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 13:35:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 1 Oct 2018 13:35:53 +0000 Subject: Change in osmo-bsc[master]: cosmetics: Fix typo in bsc_vty.c In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11166 ) Change subject: cosmetics: Fix typo in bsc_vty.c ...................................................................... cosmetics: Fix typo in bsc_vty.c Change-Id: I65d3e6c6dc252fd60d2dd6b6687ceef4d75034ed --- M src/osmo-bsc/bsc_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index d06ec57..8e6ff3e 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1768,7 +1768,7 @@ DEFUN(show_paging, show_paging_cmd, "show paging [<0-255>]", - SHOW_STR "Display information about paging reuqests of a BTS\n" + SHOW_STR "Display information about paging requests of a BTS\n" BTS_NR_STR) { struct gsm_network *net = gsmnet_from_vty(vty); -- To view, visit https://gerrit.osmocom.org/11166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I65d3e6c6dc252fd60d2dd6b6687ceef4d75034ed Gerrit-Change-Number: 11166 Gerrit-PatchSet: 1 Gerrit-Owner: roox Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 13:58:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 1 Oct 2018 13:58:48 +0000 Subject: Change in libosmocore[master]: vty logging: fix crash when missing 'logging enable' Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11168 Change subject: vty logging: fix crash when missing 'logging enable' ...................................................................... vty logging: fix crash when missing 'logging enable' We must explicitly check the return value of osmo_log_vty2tgt(), or may run into a segfault. I wasn't aware of this and introduced numerous such cases in I36f17c131cc70ce5a1aef62fd9693097de230cd4. Reproduce: on the VTY, do not issue 'logging enable', invoke 'logging level force-all LEVEL' first. Show in logging_vty_test.vty that this situation is now again amended by telling the user that logging was not enabled. Related: OS#3611 Change-Id: Id11702d1801d6654ca5e5a51b597a0d802e2e8dd --- M src/vty/logging_vty.c M tests/logging/logging_vty_test.vty 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/11168/1 diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 31edb52..f3e1419 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -364,6 +364,10 @@ struct log_target *tgt = osmo_log_vty2tgt(vty); int level = log_parse_level(argv[0]); int i; + + if (!tgt) + return CMD_WARNING; + for (i = 0; i < osmo_log_info->num_cat; i++) { struct log_category *cat = &tgt->categories[i]; /* skip empty entries in the array */ @@ -391,6 +395,8 @@ { struct log_target *tgt = osmo_log_vty2tgt(vty); int level = log_parse_level(argv[0]); + if (!tgt) + return CMD_WARNING; log_set_log_level(tgt, level); return CMD_SUCCESS; } @@ -400,6 +406,8 @@ NO_STR LOGGING_STR LEVEL_STR NO_FORCE_ALL_STR) { struct log_target *tgt = osmo_log_vty2tgt(vty); + if (!tgt) + return CMD_WARNING; log_set_log_level(tgt, 0); return CMD_SUCCESS; } diff --git a/tests/logging/logging_vty_test.vty b/tests/logging/logging_vty_test.vty index 0eedbe3..b190927 100644 --- a/tests/logging/logging_vty_test.vty +++ b/tests/logging/logging_vty_test.vty @@ -28,6 +28,9 @@ logging_vty_test(config)# no log stderr logging_vty_test(config)# exit +logging_vty_test# logging level force-all notice +Logging was not enabled. + logging_vty_test# logging enable logging_vty_test# logging filter all 1 logging_vty_test# logging print category-hex 0 -- To view, visit https://gerrit.osmocom.org/11168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id11702d1801d6654ca5e5a51b597a0d802e2e8dd Gerrit-Change-Number: 11168 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 14:03:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 1 Oct 2018 14:03:17 +0000 Subject: Change in libosmocore[master]: vty logging: fix crash when missing 'logging enable' In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11168 ) Change subject: vty logging: fix crash when missing 'logging enable' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id11702d1801d6654ca5e5a51b597a0d802e2e8dd Gerrit-Change-Number: 11168 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 01 Oct 2018 14:03:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 14:03:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 1 Oct 2018 14:03:21 +0000 Subject: Change in libosmocore[master]: vty logging: fix crash when missing 'logging enable' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11168 ) Change subject: vty logging: fix crash when missing 'logging enable' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id11702d1801d6654ca5e5a51b597a0d802e2e8dd Gerrit-Change-Number: 11168 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 01 Oct 2018 14:03:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 14:17:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 1 Oct 2018 14:17:02 +0000 Subject: Change in libosmocore[master]: vty logging: fix crash when missing 'logging enable' In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11168 ) Change subject: vty logging: fix crash when missing 'logging enable' ...................................................................... vty logging: fix crash when missing 'logging enable' We must explicitly check the return value of osmo_log_vty2tgt(), or may run into a segfault. I wasn't aware of this and introduced numerous such cases in I36f17c131cc70ce5a1aef62fd9693097de230cd4. Reproduce: on the VTY, do not issue 'logging enable', invoke 'logging level force-all LEVEL' first. Show in logging_vty_test.vty that this situation is now again amended by telling the user that logging was not enabled. Related: OS#3611 Change-Id: Id11702d1801d6654ca5e5a51b597a0d802e2e8dd --- M src/vty/logging_vty.c M tests/logging/logging_vty_test.vty 2 files changed, 11 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 31edb52..f3e1419 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -364,6 +364,10 @@ struct log_target *tgt = osmo_log_vty2tgt(vty); int level = log_parse_level(argv[0]); int i; + + if (!tgt) + return CMD_WARNING; + for (i = 0; i < osmo_log_info->num_cat; i++) { struct log_category *cat = &tgt->categories[i]; /* skip empty entries in the array */ @@ -391,6 +395,8 @@ { struct log_target *tgt = osmo_log_vty2tgt(vty); int level = log_parse_level(argv[0]); + if (!tgt) + return CMD_WARNING; log_set_log_level(tgt, level); return CMD_SUCCESS; } @@ -400,6 +406,8 @@ NO_STR LOGGING_STR LEVEL_STR NO_FORCE_ALL_STR) { struct log_target *tgt = osmo_log_vty2tgt(vty); + if (!tgt) + return CMD_WARNING; log_set_log_level(tgt, 0); return CMD_SUCCESS; } diff --git a/tests/logging/logging_vty_test.vty b/tests/logging/logging_vty_test.vty index 0eedbe3..b190927 100644 --- a/tests/logging/logging_vty_test.vty +++ b/tests/logging/logging_vty_test.vty @@ -28,6 +28,9 @@ logging_vty_test(config)# no log stderr logging_vty_test(config)# exit +logging_vty_test# logging level force-all notice +Logging was not enabled. + logging_vty_test# logging enable logging_vty_test# logging filter all 1 logging_vty_test# logging print category-hex 0 -- To view, visit https://gerrit.osmocom.org/11168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id11702d1801d6654ca5e5a51b597a0d802e2e8dd Gerrit-Change-Number: 11168 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Oct 1 14:24:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 1 Oct 2018 14:24:23 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_sys?= =?UTF-8?Q?mo,master,default,osmocom-master-debian9_#1237?= Message-ID: <1070953601.433.1538403863204.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 34.61 KB...] 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 checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking execinfo.h usability... yes checking execinfo.h presence... yes checking for execinfo.h... yes checking sys/select.h usability... yes checking sys/select.h presence... yes checking for sys/select.h... yes checking sys/socket.h usability... yes checking sys/socket.h presence... yes checking for sys/socket.h... yes checking sys/timerfd.h usability... yes checking sys/timerfd.h presence... yes checking for sys/timerfd.h... yes checking syslog.h usability... yes checking syslog.h presence... yes checking for syslog.h... yes checking ctype.h usability... yes checking ctype.h presence... yes checking for ctype.h... yes checking netinet/tcp.h usability... yes checking netinet/tcp.h presence... yes checking for netinet/tcp.h... yes checking for size_t... yes checking for working alloca.h... yes checking for alloca... yes checking for library containing dlopen... -ldl checking for library containing dlsym... -ldl checking for backtrace in -lexecinfo... no checking for doxygen... /usr/bin/doxygen checking whether SYS_getrandom is declared... yes checking if gcc supports -fvisibility=hidden... yes checking for clock_gettime... yes checking for localtime_r... yes checking whether struct tm has tm_gmtoff member... yes checking for TALLOC... yes checking for PCSC... yes checking for LIBGNUTLS... yes checking whether to enable VTY/CTRL tests... no checking whether C compiler accepts -mavx2... yes checking whether C compiler accepts -mssse3... yes checking whether C compiler accepts -msse4.1... yes checking whether gcc has __builtin_cpu_supports built-in... yes CFLAGS="-g -O2 -DBUILDING_LIBOSMOCORE -Wall" CPPFLAGS=" -DBUILDING_LIBOSMOCORE -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmocore.pc config.status: creating libosmocodec.pc config.status: creating libosmocoding.pc config.status: creating libosmovty.pc config.status: creating libosmogsm.pc config.status: creating libosmogb.pc config.status: creating libosmoctrl.pc config.status: creating libosmosim.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating src/vty/Makefile config.status: creating src/codec/Makefile config.status: creating src/coding/Makefile config.status: creating src/sim/Makefile config.status: creating src/gsm/Makefile config.status: creating src/gb/Makefile config.status: creating src/ctrl/Makefile config.status: creating src/pseudotalloc/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating utils/Makefile config.status: creating Doxyfile.core config.status: creating Doxyfile.gsm config.status: creating Doxyfile.vty config.status: creating Doxyfile.codec config.status: creating Doxyfile.coding config.status: creating Doxyfile.gb config.status: creating Doxyfile.ctrl config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j 8 install echo 0.12.0.76-ea6f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory ' Making install in include make[2]: Entering directory ' GEN osmocom/gsm/gsm0503.h Generating header file... Generate 'xcch' declaration Generate 'rach' declaration Generate 'rach_ext' declaration Generate 'sch' declaration Generate 'cs2' declaration Generate 'cs3' declaration Generate 'cs2_np' declaration Generate 'cs3_np' declaration Generate 'tch_afs_12_2' declaration Generate 'tch_afs_10_2' declaration Generate 'tch_afs_7_95' declaration Generate 'tch_afs_7_4' declaration Generate 'tch_afs_6_7' declaration Generate 'tch_afs_5_9' declaration Generate 'tch_afs_5_15' declaration Generate 'tch_afs_4_75' declaration Generate 'tch_fr' declaration Generate 'tch_hr' declaration Generate 'tch_ahs_7_95' declaration Generate 'tch_ahs_7_4' declaration Generate 'tch_ahs_6_7' declaration Generate 'tch_ahs_5_9' declaration Generate 'tch_ahs_5_15' declaration Generate 'tch_ahs_4_75' declaration Generate 'mcs1_dl_hdr' declaration Generate 'mcs1_ul_hdr' declaration Generate 'mcs1' declaration Generate 'mcs2' declaration Generate 'mcs3' declaration Generate 'mcs4' declaration Generate 'mcs5_dl_hdr' declaration Generate 'mcs5_ul_hdr' declaration Generate 'mcs5' declaration Generate 'mcs6' declaration Generate 'mcs7_dl_hdr' declaration Generate 'mcs7_ul_hdr' declaration Generate 'mcs7' declaration Generate 'mcs8' declaration Generate 'mcs9' declaration Generation complete. make install-am make[3]: Entering directory ' GEN osmocom/core/bit16gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc8gen.h make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/application.h osmocom/core/backtrace.h osmocom/core/bit16gen.h osmocom/core/bit32gen.h osmocom/core/bit64gen.h osmocom/core/bits.h osmocom/core/bitvec.h osmocom/core/bitcomp.h osmocom/core/byteswap.h osmocom/core/conv.h osmocom/core/counter.h osmocom/core/crc16.h osmocom/core/crc16gen.h osmocom/core/crc32gen.h osmocom/core/crc64gen.h osmocom/core/crc8gen.h osmocom/core/crcgen.h osmocom/core/endian.h osmocom/core/defs.h osmocom/core/fsm.h osmocom/core/gsmtap.h osmocom/core/gsmtap_util.h osmocom/core/isdnhdlc.h osmocom/core/linuxlist.h osmocom/core/linuxrbtree.h osmocom/core/logging.h osmocom/core/loggingrb.h osmocom/core/stats.h osmocom/core/macaddr.h osmocom/core/msgb.h osmocom/core/panic.h osmocom/core/prbs.h osmocom/core/prim.h osmocom/core/process.h osmocom/core/rate_ctr.h osmocom/core/stat_item.h osmocom/core/select.h osmocom/core/sercomm.h osmocom/core/signal.h osmocom/core/socket.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/coding/gsm0503_tables.h osmocom/coding/gsm0503_parity.h osmocom/coding/gsm0503_mapping.h osmocom/coding/gsm0503_interleaving.h osmocom/coding/gsm0503_coding.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/statistics.h osmocom/core/strrb.h osmocom/core/talloc.h osmocom/core/timer.h osmocom/core/timer_compat.h osmocom/core/utils.h osmocom/core/write_queue.h osmocom/core/plugin.h osmocom/core/msgfile.h osmocom/core/serial.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/vty/buffer.h osmocom/vty/command.h osmocom/vty/logging.h osmocom/vty/stats.h osmocom/vty/misc.h osmocom/vty/telnet_interface.h osmocom/vty/vector.h osmocom/vty/vty.h osmocom/vty/ports.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/protocol/gsm_03_40.h osmocom/gsm/protocol/gsm_03_41.h osmocom/gsm/protocol/gsm_04_08.h osmocom/gsm/protocol/gsm_04_08_gprs.h osmocom/gsm/protocol/gsm_04_11.h osmocom/gsm/protocol/gsm_04_12.h osmocom/gsm/protocol/gsm_04_14.h osmocom/gsm/protocol/gsm_04_80.h osmocom/gsm/protocol/gsm_08_08.h osmocom/gsm/protocol/gsm_08_58.h osmocom/gsm/protocol/gsm_09_02.h osmocom/gsm/protocol/gsm_12_21.h osmocom/gsm/protocol/gsm_23_003.h osmocom/gsm/protocol/gsm_44_318.h osmocom/gsm/protocol/ipaccess.h osmocom/gsm/protocol/smpp34_osmocom.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/sim/class_tables.h osmocom/sim/sim.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/gprs_bssgp.h osmocom/gprs/gprs_bssgp_bss.h osmocom/gprs/gprs_msgb.h osmocom/gprs/gprs_ns.h osmocom/gprs/gprs_ns_frgre.h osmocom/gprs/gprs_rlc.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/crypt/auth.h osmocom/crypt/gprs_cipher.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/a5.h osmocom/gsm/abis_nm.h osmocom/gsm/apn.h osmocom/gsm/bts_features.h osmocom/gsm/comp128.h osmocom/gsm/comp128v23.h osmocom/gsm/bitvec_gsm.h osmocom/gsm/gan.h osmocom/gsm/gsm0341.h osmocom/gsm/gsm0411_smc.h osmocom/gsm/gsm0411_smr.h osmocom/gsm/gsm0411_utils.h osmocom/gsm/gsm0480.h osmocom/gsm/gsm0502.h osmocom/gsm/gsm0503.h osmocom/gsm/gsm0808.h osmocom/gsm/gsm0808_utils.h osmocom/gsm/gsm23003.h osmocom/gsm/gsm48.h osmocom/gsm/gsm48_ie.h osmocom/gsm/gsm_utils.h osmocom/gsm/gsup.h osmocom/gsm/ipa.h osmocom/gsm/lapd_core.h osmocom/gsm/lapdm.h osmocom/gsm/meas_rep.h osmocom/gsm/mncc.h osmocom/gsm/prim.h osmocom/gsm/l1sap.h osmocom/gsm/oap.h osmocom/gsm/oap_client.h osmocom/gsm/rsl.h osmocom/gsm/rxlev_stat.h osmocom/gsm/sysinfo.h osmocom/gsm/tlv.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/ctrl/control_cmd.h osmocom/ctrl/control_if.h osmocom/ctrl/ports.h osmocom/ctrl/control_vty.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/protocol/gsm_04_60.h osmocom/gprs/protocol/gsm_08_16.h osmocom/gprs/protocol/gsm_08_18.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/codec/ecu.h osmocom/codec/codec.h osmocom/codec/gsm610_bits.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' GEN crc16gen.c GEN crc8gen.c GEN crc64gen.c GEN crc32gen.c make install-am make[3]: Entering directory ' CC timer.lo CC timer_gettimeofday.lo CC select.lo CC timer_clockgettime.lo CC signal.lo CC msgb.lo CC bits.lo CC bitvec.lo CC bitcomp.lo CC counter.lo CC fsm.lo CC write_queue.lo CC utils.lo CC socket.lo CC logging.lo CC logging_syslog.lo CC logging_gsmtap.lo CC rate_ctr.lo CC gsmtap_util.lo CC crc16.lo CC panic.lo CC backtrace.lo CC application.lo CC conv.lo CC rbtree.lo CC strrb.lo CC loggingrb.lo CC crc8gen.lo CC crc16gen.lo CC crc32gen.lo /bin/bash: line 2: 30038 Segmentation fault /bin/bash ../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT crc16gen.lo -MD -MP -MF $depbase.Tpo -c -o crc16gen.lo crc16gen.c Makefile:558: recipe for target 'crc16gen.lo' failed make[3]: *** [crc16gen.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory ' Makefile:662: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:614: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:913: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Oct 1 14:50:17 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 1 Oct 2018 14:50:17 +0000 Subject: Change in osmo-gsm-manuals[master]: running: Add note about DTMF support Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11169 Change subject: running: Add note about DTMF support ...................................................................... running: Add note about DTMF support osmo-sip-connector does not yet support full DTMF support. The current implementation only supports DTMF tones to be send from MNCC to SIP, but not in the opposite direction. Change-Id: I578e50b0a42d88b05cf6da80443b71494b5eb26f Related: OS#2777 --- M OsmoSIPConnector/chapters/running.adoc 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/69/11169/1 diff --git a/OsmoSIPConnector/chapters/running.adoc b/OsmoSIPConnector/chapters/running.adoc index 5e0d583..85ccddc 100644 --- a/OsmoSIPConnector/chapters/running.adoc +++ b/OsmoSIPConnector/chapters/running.adoc @@ -56,3 +56,29 @@ socket-path /tmp/msc2_mncc ---- +=== DTMF signaling + +In VoIP based telephony networks DTMF (Dual-tone multi-frequency signaling) can +be signaled through multiple methods. Common methods are in-band, RFC2833 and +sip-info messages. + +Osmo-sip-connector is using sip-info messages to signal DTMF tones. When a DTMF +tone is signaled at the MNCC socket interface, osmo-sip-connector will generate +a matching sip-info message to forward the DTMF signal to the PBX. Depending on +the PBX software reconfiguring the DTMF signaling method to sip-info may be +necessary. + +While sending DTMF tones through the MNCC interface to a SIP leg, the current +implementation of osmo-sip-connector does not support sending DTMF tones in the +opposite direction. Any attempts to send DTMF tones to an MNCC leg will be +confirmed with a status 405 "Method not allowed". + +The reason for this limitation is that in mobile networks, depending on the +signaling direction, the signaling of DTMF tones is implemented differently. +A mobile originated DTMF tone is signaled through out of band messages, +which arrive at osmo-sip-connector on as MNCC DTMF START/STOP messages. Those +messages can be directly translated to sip-info messages. However, in the +other direction (mobile terminated), an in-band signaling method is used. This +means that osmo-sip-connector would have to translate an incoming DTMF sip-info +message into an audio sample that then would have to be injected into the +voice stream. Currently this scheme is not implemented in osmo-sip-connector. \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/11169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I578e50b0a42d88b05cf6da80443b71494b5eb26f Gerrit-Change-Number: 11169 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 14:50:17 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 1 Oct 2018 14:50:17 +0000 Subject: Change in osmo-gsm-manuals[master]: mncc: add missing DTMF message types. Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11170 Change subject: mncc: add missing DTMF message types. ...................................................................... mncc: add missing DTMF message types. The list that describes the MNCC message types lacks the message types used for DTMF. Change-Id: I4251b296e043e7583518d6672e614b376331d25e Related: OS#2777 --- M common/chapters/mncc.adoc 1 file changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/70/11170/1 diff --git a/common/chapters/mncc.adoc b/common/chapters/mncc.adoc index 4f098e6..8825be3 100644 --- a/common/chapters/mncc.adoc +++ b/common/chapters/mncc.adoc @@ -220,3 +220,33 @@ Indicate that no valid voice frame, but a 'bad frame' was received over the radio link from the MS. + +==== MNCC_START_DTMF_IND + +Direction: {program-name} -> Handler + +Indicate the beginning of a DTMF tone playback. + +==== MNCC_START_DTMF_RSP + +Direction: Handler -> {program-name} + +Acknowledge that the DTMF tone playback has been started. + +==== MNCC_START_DTMF_REJ + +Direction: both + +Indicate that starting a DTMF tone playback was not possible. + +==== MNCC_STOP_DTMF_IND + +Direction: {program-name} -> Handler + +Indicate the ending of a DTMF tone playback. + +==== MNCC_STOP_DTMF_RSP + +Direction: Handler -> {program-name} + +Acknowledge that the DTMF tone playback has been stopped. -- To view, visit https://gerrit.osmocom.org/11170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4251b296e043e7583518d6672e614b376331d25e Gerrit-Change-Number: 11170 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 14:50:18 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 1 Oct 2018 14:50:18 +0000 Subject: Change in osmo-gsm-manuals[master]: mncc: add note about DTMF considerations Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11171 Change subject: mncc: add note about DTMF considerations ...................................................................... mncc: add note about DTMF considerations Add an informative note on how DTMF signalling is done in mobile networks and mention the limitations regarding DTMF, when internal MNCC is used. Change-Id: Iedcf4ad5e0e4697c6a05ebdd4f43173c14c7c448 Related: OS#2777 --- M common/chapters/mncc.adoc 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/71/11171/1 diff --git a/common/chapters/mncc.adoc b/common/chapters/mncc.adoc index 8825be3..3adbf7f 100644 --- a/common/chapters/mncc.adoc +++ b/common/chapters/mncc.adoc @@ -60,6 +60,32 @@ Router. More widespread integration of external call routing is available via the OsmoSIPConnector. + +=== DTMF considerations + +In mobile networks, the signaling of DTMF tones is implemented differently, +depending on the signaling direction. A mobile originated DTMF tone is +signaled using START/STOP DTMF messages which are hauled through various +protocols upwards into the core network. + +Contrary to that, a mobile terminated DTMF tone is not transfered as an out of +band message. Instead, in-band signaling is used, which means a tone is injected +early inside a PBX or MGW. + +When using {program-name} with its built in MNCC functionality a mobile +originated DTMF message will not be translated into an in-band tone. Therefore, +sending DTMF will not work when internal MNCC is used. + +For external MNCC, the network integrator must make sure that the back-end +components are configured properly in order to handle the two different +signaling schemes depending on the signaling direction. + +NOTE: osmo-sip-connector will translate MNCC DTMF signaling into sip-info +messages. DTMF signaling in the opposite direction is not possible. +osmo-sip-connector will reject sip-info messages that attempt to signal +a DTMF tone. + + === MNCC protocol description The protocol follows the primitives specified in 3GPP TS 04.07 Chapter 7.1. -- To view, visit https://gerrit.osmocom.org/11171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iedcf4ad5e0e4697c6a05ebdd4f43173c14c7c448 Gerrit-Change-Number: 11171 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Oct 1 15:14:15 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 1 Oct 2018 15:14:15 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-asn1c_=C2=BB_a1=3Dde?= =?UTF-8?Q?fault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#263?= In-Reply-To: <438756638.421.1538320206993.JavaMail.jenkins@jenkins.osmocom.org> References: <438756638.421.1538320206993.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1704574807.434.1538406855592.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Oct 1 18:12:59 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 1 Oct 2018 18:12:59 +0000 Subject: Change in osmocom-bb[master]: layer23/app_ccch_scan.c: clean up copy-pasted code Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11172 Change subject: layer23/app_ccch_scan.c: clean up copy-pasted code ...................................................................... layer23/app_ccch_scan.c: clean up copy-pasted code By definition, 'ccch_scan' application is intended to be used for monitoring of CCCH channels on C0/TS0. There is no need to send RACH requests, therefore there is no need to care about the mobile allocation from SI1 message. Most likely, this "dead" code was copy-pasted from mobile application. Let's clean it up! Change-Id: I7c2f47cbc825a5e5a50863d842729d3d8408b9dd --- M src/host/layer23/src/misc/app_ccch_scan.c 1 file changed, 1 insertion(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/72/11172/1 diff --git a/src/host/layer23/src/misc/app_ccch_scan.c b/src/host/layer23/src/misc/app_ccch_scan.c index f92b13b..d8cb912 100644 --- a/src/host/layer23/src/misc/app_ccch_scan.c +++ b/src/host/layer23/src/misc/app_ccch_scan.c @@ -42,14 +42,9 @@ #include static struct { - int has_si1; int ccch_mode; - int ccch_enabled; - int rach_count; - struct gsm_sysinfo_freq cell_arfcns[1024]; } app_state; - static void dump_bcch(struct osmocom_ms *ms, uint8_t tc, const uint8_t *data) { struct gsm48_system_information_type_header *si_hdr; @@ -62,18 +57,6 @@ if (tc != 0) LOGP(DRR, LOGL_ERROR, "SI1 on the wrong TC: %d\n", tc); #endif - if (!app_state.has_si1) { - struct gsm48_system_information_type_1 *si1 = - (struct gsm48_system_information_type_1 *)data; - - gsm48_decode_freq_list(app_state.cell_arfcns, - si1->cell_channel_description, - sizeof(si1->cell_channel_description), - 0xff, 0x01); - - app_state.has_si1 = 1; - LOGP(DRR, LOGL_ERROR, "SI1 received.\n"); - } break; case GSM48_MT_RR_SYSINFO_2: #ifdef BCCH_TC_CHECK @@ -182,8 +165,6 @@ if (ia->page_mode & 0xf0) return 0; - /* FIXME: compare RA and GSM time with when we sent RACH req */ - rsl_dec_chan_nr(ia->chan_desc.chan_nr, &ch_type, &ch_subch, &ch_ts); if (!ia->chan_desc.h0.h) { @@ -199,9 +180,7 @@ } else { /* Hopping */ - uint8_t maio, hsn, ma_len; - uint16_t ma[64], arfcn; - int i, j, k; + uint8_t maio, hsn; hsn = ia->chan_desc.h1.hsn; maio = ia->chan_desc.h1.maio_low | (ia->chan_desc.h1.maio_high << 2); @@ -210,19 +189,6 @@ "HSN=%u, MAIO=%u, TS=%u, SS=%u, TSC=%u) ", ia->req_ref.ra, ia->chan_desc.chan_nr, hsn, maio, ch_ts, ch_subch, ia->chan_desc.h1.tsc); - - /* decode mobile allocation */ - ma_len = 0; - for (i=1, j=0; i<=1024; i++) { - arfcn = i & 1023; - if (app_state.cell_arfcns[arfcn].mask & 0x01) { - k = ia->mob_alloc_len - (j>>3) - 1; - if (ia->mob_alloc[k] & (1 << (j&7))) { - ma[ma_len++] = arfcn; - } - j++; - } - } } LOGPC(DRR, LOGL_NOTICE, "\n"); @@ -449,25 +415,13 @@ //dump_bcch(dl->time.tc, ccch->data); dump_bcch(ms, 0, msg->l3h); - /* Req channel logic */ - if (app_state.ccch_enabled && (app_state.rach_count < 2)) { - l1ctl_tx_rach_req(ms, app_state.rach_count, 0, - app_state.ccch_mode == CCCH_MODE_COMBINED); - app_state.rach_count++; - } - return 0; } void layer3_app_reset(void) { /* Reset state */ - app_state.has_si1 = 0; app_state.ccch_mode = CCCH_MODE_NONE; - app_state.ccch_enabled = 0; - app_state.rach_count = 0; - - memset(&app_state.cell_arfcns, 0x00, sizeof(app_state.cell_arfcns)); } static int signal_cb(unsigned int subsys, unsigned int signal, -- To view, visit https://gerrit.osmocom.org/11172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7c2f47cbc825a5e5a50863d842729d3d8408b9dd Gerrit-Change-Number: 11172 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 18:13:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 1 Oct 2018 18:13:00 +0000 Subject: Change in osmocom-bb[master]: layer23/app_ccch_scan.c: print 'new-line' char locally Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11173 Change subject: layer23/app_ccch_scan.c: print 'new-line' char locally ...................................................................... layer23/app_ccch_scan.c: print 'new-line' char locally Change-Id: I03da1329501ce9b3c5cca49a1654ba68e9bb6a98 --- M src/host/layer23/src/misc/app_ccch_scan.c 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/73/11173/1 diff --git a/src/host/layer23/src/misc/app_ccch_scan.c b/src/host/layer23/src/misc/app_ccch_scan.c index d8cb912..31b72f8 100644 --- a/src/host/layer23/src/misc/app_ccch_scan.c +++ b/src/host/layer23/src/misc/app_ccch_scan.c @@ -174,7 +174,7 @@ arfcn = ia->chan_desc.h0.arfcn_low | (ia->chan_desc.h0.arfcn_high << 8); LOGP(DRR, LOGL_NOTICE, "GSM48 IMM ASS (ra=0x%02x, chan_nr=0x%02x, " - "ARFCN=%u, TS=%u, SS=%u, TSC=%u) ", ia->req_ref.ra, + "ARFCN=%u, TS=%u, SS=%u, TSC=%u)\n", ia->req_ref.ra, ia->chan_desc.chan_nr, arfcn, ch_ts, ch_subch, ia->chan_desc.h0.tsc); @@ -186,12 +186,11 @@ maio = ia->chan_desc.h1.maio_low | (ia->chan_desc.h1.maio_high << 2); LOGP(DRR, LOGL_NOTICE, "GSM48 IMM ASS (ra=0x%02x, chan_nr=0x%02x, " - "HSN=%u, MAIO=%u, TS=%u, SS=%u, TSC=%u) ", ia->req_ref.ra, + "HSN=%u, MAIO=%u, TS=%u, SS=%u, TSC=%u)\n", ia->req_ref.ra, ia->chan_desc.chan_nr, hsn, maio, ch_ts, ch_subch, ia->chan_desc.h1.tsc); } - LOGPC(DRR, LOGL_NOTICE, "\n"); return 0; } -- To view, visit https://gerrit.osmocom.org/11173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I03da1329501ce9b3c5cca49a1654ba68e9bb6a98 Gerrit-Change-Number: 11173 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 18:13:01 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 1 Oct 2018 18:13:01 +0000 Subject: Change in osmocom-bb[master]: layer23/app_ccch_scan.c: clean up System Information handling Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11174 Change subject: layer23/app_ccch_scan.c: clean up System Information handling ...................................................................... layer23/app_ccch_scan.c: clean up System Information handling Change-Id: I8c2594920fcad8a3e346b938bd0c20409f4d01c9 --- M src/host/layer23/src/misc/app_ccch_scan.c 1 file changed, 98 insertions(+), 93 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/74/11174/1 diff --git a/src/host/layer23/src/misc/app_ccch_scan.c b/src/host/layer23/src/misc/app_ccch_scan.c index 31b72f8..49adee9 100644 --- a/src/host/layer23/src/misc/app_ccch_scan.c +++ b/src/host/layer23/src/misc/app_ccch_scan.c @@ -45,108 +45,113 @@ int ccch_mode; } app_state; +static int bcch_check_tc(uint8_t si_type, uint8_t tc) +{ + /* FIXME: there is no tc information (always 0) */ + return 0; + + switch (si_type) { + case GSM48_MT_RR_SYSINFO_1: + if (tc != 0) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_2: + if (tc != 1) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_3: + if (tc != 2 && tc != 6) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_4: + if (tc != 3 && tc != 7) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_7: + if (tc != 7) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_8: + if (tc != 3) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_9: + if (tc != 4) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_13: + if (tc != 4 && tc != 0) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_16: + if (tc != 6) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_17: + if (tc != 2) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_2bis: + if (tc != 5) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_2ter: + if (tc != 5 && tc != 4) + return -EINVAL; + break; + + /* The following types are used on SACCH only */ + case GSM48_MT_RR_SYSINFO_5: + case GSM48_MT_RR_SYSINFO_6: + case GSM48_MT_RR_SYSINFO_5bis: + case GSM48_MT_RR_SYSINFO_5ter: + break; + + /* Unknown SI type */ + default: + LOGP(DRR, LOGL_INFO, "Unknown SI (type=0x%02x)\n", si_type); + return -ENOTSUP; + }; + + return 0; +} + +static void handle_si3(struct osmocom_ms *ms, + struct gsm48_system_information_type_3 *si) +{ + if (app_state.ccch_mode != CCCH_MODE_NONE) + return; + + if (si->control_channel_desc.ccch_conf == RSL_BCCH_CCCH_CONF_1_C) + app_state.ccch_mode = CCCH_MODE_COMBINED; + else + app_state.ccch_mode = CCCH_MODE_NON_COMBINED; + + l1ctl_tx_ccch_mode_req(ms, app_state.ccch_mode); +} + static void dump_bcch(struct osmocom_ms *ms, uint8_t tc, const uint8_t *data) { struct gsm48_system_information_type_header *si_hdr; si_hdr = (struct gsm48_system_information_type_header *) data; + uint8_t si_type = si_hdr->system_information; + + LOGP(DRR, LOGL_INFO, "BCCH message (type=0x%02x): %s\n", + si_type, gsm48_rr_msg_name(si_type)); + + if (bcch_check_tc(si_type, tc) == -EINVAL) + LOGP(DRR, LOGL_INFO, "SI on wrong tc=%u\n", tc); /* GSM 05.02 ?6.3.1.3 Mapping of BCCH data */ - switch (si_hdr->system_information) { - case GSM48_MT_RR_SYSINFO_1: -#ifdef BCCH_TC_CHECK - if (tc != 0) - LOGP(DRR, LOGL_ERROR, "SI1 on the wrong TC: %d\n", tc); -#endif - break; - case GSM48_MT_RR_SYSINFO_2: -#ifdef BCCH_TC_CHECK - if (tc != 1) - LOGP(DRR, LOGL_ERROR, "SI2 on the wrong TC: %d\n", tc); -#endif - break; + switch (si_type) { case GSM48_MT_RR_SYSINFO_3: -#ifdef BCCH_TC_CHECK - if (tc != 2 && tc != 6) - LOGP(DRR, LOGL_ERROR, "SI3 on the wrong TC: %d\n", tc); -#endif - if (app_state.ccch_mode == CCCH_MODE_NONE) { - struct gsm48_system_information_type_3 *si3 = - (struct gsm48_system_information_type_3 *)data; + handle_si3(ms, + (struct gsm48_system_information_type_3 *) data); + break; - if (si3->control_channel_desc.ccch_conf == RSL_BCCH_CCCH_CONF_1_C) - app_state.ccch_mode = CCCH_MODE_COMBINED; - else - app_state.ccch_mode = CCCH_MODE_NON_COMBINED; - - l1ctl_tx_ccch_mode_req(ms, app_state.ccch_mode); - } - break; - case GSM48_MT_RR_SYSINFO_4: -#ifdef BCCH_TC_CHECK - if (tc != 3 && tc != 7) - LOGP(DRR, LOGL_ERROR, "SI4 on the wrong TC: %d\n", tc); -#endif - break; - case GSM48_MT_RR_SYSINFO_5: - break; - case GSM48_MT_RR_SYSINFO_6: - break; - case GSM48_MT_RR_SYSINFO_7: -#ifdef BCCH_TC_CHECK - if (tc != 7) - LOGP(DRR, LOGL_ERROR, "SI7 on the wrong TC: %d\n", tc); -#endif - break; - case GSM48_MT_RR_SYSINFO_8: -#ifdef BCCH_TC_CHECK - if (tc != 3) - LOGP(DRR, LOGL_ERROR, "SI8 on the wrong TC: %d\n", tc); -#endif - break; - case GSM48_MT_RR_SYSINFO_9: -#ifdef BCCH_TC_CHECK - if (tc != 4) - LOGP(DRR, LOGL_ERROR, "SI9 on the wrong TC: %d\n", tc); -#endif - break; - case GSM48_MT_RR_SYSINFO_13: -#ifdef BCCH_TC_CHECK - if (tc != 4 && tc != 0) - LOGP(DRR, LOGL_ERROR, "SI13 on the wrong TC: %d\n", tc); -#endif - break; - case GSM48_MT_RR_SYSINFO_16: -#ifdef BCCH_TC_CHECK - if (tc != 6) - LOGP(DRR, LOGL_ERROR, "SI16 on the wrong TC: %d\n", tc); -#endif - break; - case GSM48_MT_RR_SYSINFO_17: -#ifdef BCCH_TC_CHECK - if (tc != 2) - LOGP(DRR, LOGL_ERROR, "SI17 on the wrong TC: %d\n", tc); -#endif - break; - case GSM48_MT_RR_SYSINFO_2bis: -#ifdef BCCH_TC_CHECK - if (tc != 5) - LOGP(DRR, LOGL_ERROR, "SI2bis on the wrong TC: %d\n", tc); -#endif - break; - case GSM48_MT_RR_SYSINFO_2ter: -#ifdef BCCH_TC_CHECK - if (tc != 5 && tc != 4) - LOGP(DRR, LOGL_ERROR, "SI2ter on the wrong TC: %d\n", tc); -#endif - break; - case GSM48_MT_RR_SYSINFO_5bis: - break; - case GSM48_MT_RR_SYSINFO_5ter: - break; default: - LOGP(DRR, LOGL_ERROR, "Unknown SI: %d\n", - si_hdr->system_information); - break; + /* We don't care about other types of SI */ + break; /* thus there is nothing to do */ }; } -- To view, visit https://gerrit.osmocom.org/11174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8c2594920fcad8a3e346b938bd0c20409f4d01c9 Gerrit-Change-Number: 11174 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 18:22:28 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 1 Oct 2018 18:22:28 +0000 Subject: Change in osmocom-bb[master]: layer23/app_ccch_scan.c: print pdisc in error message Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11175 Change subject: layer23/app_ccch_scan.c: print pdisc in error message ...................................................................... layer23/app_ccch_scan.c: print pdisc in error message Change-Id: Ic88f5d4b263610a376bbb9729e882097393ef2be --- M src/host/layer23/src/misc/app_ccch_scan.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/75/11175/1 diff --git a/src/host/layer23/src/misc/app_ccch_scan.c b/src/host/layer23/src/misc/app_ccch_scan.c index 49adee9..5727174 100644 --- a/src/host/layer23/src/misc/app_ccch_scan.c +++ b/src/host/layer23/src/misc/app_ccch_scan.c @@ -382,7 +382,8 @@ int rc = 0; if (sih->rr_protocol_discriminator != GSM48_PDISC_RR) - LOGP(DRR, LOGL_ERROR, "PCH pdisc != RR\n"); + LOGP(DRR, LOGL_ERROR, "PCH pdisc (%s) != RR\n", + gsm48_pdisc_name(sih->rr_protocol_discriminator)); switch (sih->system_information) { case GSM48_MT_RR_PAG_REQ_1: -- To view, visit https://gerrit.osmocom.org/11175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic88f5d4b263610a376bbb9729e882097393ef2be Gerrit-Change-Number: 11175 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 18:29:17 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 1 Oct 2018 18:29:17 +0000 Subject: Change in osmocom-bb[master]: layer23/app_ccch_scan.c: hexdump unhandled PCH/AGCH messages Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11176 Change subject: layer23/app_ccch_scan.c: hexdump unhandled PCH/AGCH messages ...................................................................... layer23/app_ccch_scan.c: hexdump unhandled PCH/AGCH messages Change-Id: I81d6558525e7f68c4fcd6c6272224d58532e2efb --- M src/host/layer23/src/misc/app_ccch_scan.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/76/11176/1 diff --git a/src/host/layer23/src/misc/app_ccch_scan.c b/src/host/layer23/src/misc/app_ccch_scan.c index 5727174..3a55226 100644 --- a/src/host/layer23/src/misc/app_ccch_scan.c +++ b/src/host/layer23/src/misc/app_ccch_scan.c @@ -405,8 +405,9 @@ /* wireshark know that this is SI2 quater and for 3G interop */ break; default: - LOGP(DRR, LOGL_NOTICE, "unknown PCH/AGCH type 0x%02x\n", - sih->system_information); + LOGP(DRR, LOGL_NOTICE, "Unknown PCH/AGCH message " + "(type 0x%02x): %s\n", sih->system_information, + msgb_hexdump_l3(msg)); rc = -EINVAL; } -- To view, visit https://gerrit.osmocom.org/11176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I81d6558525e7f68c4fcd6c6272224d58532e2efb Gerrit-Change-Number: 11176 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 19:01:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 1 Oct 2018 19:01:00 +0000 Subject: Change in osmocom-bb[master]: layer23/app_ccch_scan.c: omit dummy (fill) frames Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11177 Change subject: layer23/app_ccch_scan.c: omit dummy (fill) frames ...................................................................... layer23/app_ccch_scan.c: omit dummy (fill) frames In some conditions it's required to maintain continuous burst transmission (e.g. on C0). If there is nothing to transmit at a given moment, either a LAPDm func=UI fill frame, or a "dummy" Paging Request is used. In case of 'ccch_scan' application, they are useless. Let's detect and omit them. Change-Id: I6ccecb1a78bdac3e467bdc14b7a01afbe17aa53c --- M src/host/layer23/src/misc/app_ccch_scan.c 1 file changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/77/11177/1 diff --git a/src/host/layer23/src/misc/app_ccch_scan.c b/src/host/layer23/src/misc/app_ccch_scan.c index 3a55226..88a2bef 100644 --- a/src/host/layer23/src/misc/app_ccch_scan.c +++ b/src/host/layer23/src/misc/app_ccch_scan.c @@ -376,11 +376,43 @@ return 0; } +/* Dummy Paging Request 1 with "no identity" */ +static const uint8_t paging_fill[] = { + 0x15, 0x06, 0x21, 0x00, 0x01, 0xf0, 0x2b, + /* The rest part may be randomized */ +}; + +/* LAPDm func=UI fill frame (for the BTS side) */ +static const uint8_t lapdm_fill[] = { + 0x03, 0x03, 0x01, 0x2b, + /* The rest part may be randomized */ +}; + +/* TODO: share / generalize this code */ +static bool is_fill_frame(struct msgb *msg) +{ + size_t l2_len = msgb_l3len(msg); + uint8_t *l2 = msgb_l3(msg); + + OSMO_ASSERT(l2_len == GSM_MACBLOCK_LEN); + + if (!memcmp(l2, paging_fill, sizeof(paging_fill))) + return true; + if (!memcmp(l2, lapdm_fill, sizeof(lapdm_fill))) + return true; + + return false; +} + int gsm48_rx_ccch(struct msgb *msg, struct osmocom_ms *ms) { struct gsm48_system_information_type_header *sih = msgb_l3(msg); int rc = 0; + /* Skip dummy (fill) frames */ + if (is_fill_frame(msg)) + return 0; + if (sih->rr_protocol_discriminator != GSM48_PDISC_RR) LOGP(DRR, LOGL_ERROR, "PCH pdisc (%s) != RR\n", gsm48_pdisc_name(sih->rr_protocol_discriminator)); -- To view, visit https://gerrit.osmocom.org/11177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6ccecb1a78bdac3e467bdc14b7a01afbe17aa53c Gerrit-Change-Number: 11177 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 19:33:43 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 1 Oct 2018 19:33:43 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_lchan_desc.c: fix wrong chan_nr for PDCH Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11178 Change subject: trxcon/sched_lchan_desc.c: fix wrong chan_nr for PDCH ...................................................................... trxcon/sched_lchan_desc.c: fix wrong chan_nr for PDCH According to GSM TS 08.58, chapter 9.3.1, channel number 0x08 describes sub-slot number 0 of SDCCH/8+ACCH. This is definitely wrong. In OsmoBTS we use an Osmocom specific extension for packet switched channels - 0xc0, so let's use it here too. Change-Id: I11925408d6e63baf1eac880839ecd717843fba6a --- M src/host/trxcon/sched_lchan_desc.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/78/11178/1 diff --git a/src/host/trxcon/sched_lchan_desc.c b/src/host/trxcon/sched_lchan_desc.c index 4cac439..05443f6 100644 --- a/src/host/trxcon/sched_lchan_desc.c +++ b/src/host/trxcon/sched_lchan_desc.c @@ -290,13 +290,13 @@ }, { TRXC_PDTCH, "PDTCH", - 0x08, TRX_CH_LID_DEDIC, + 0xc0, TRX_CH_LID_DEDIC, 12 * GSM_BURST_PL_LEN, TRX_CH_FLAG_PDCH, rx_pdtch_fn, tx_pdtch_fn, }, { TRXC_PTCCH, "PTCCH", - 0x08, TRX_CH_LID_DEDIC, + 0xc0, TRX_CH_LID_DEDIC, 4 * GSM_BURST_PL_LEN, TRX_CH_FLAG_PDCH, rx_data_fn, tx_data_fn, }, -- To view, visit https://gerrit.osmocom.org/11178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I11925408d6e63baf1eac880839ecd717843fba6a Gerrit-Change-Number: 11178 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 19:33:43 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 1 Oct 2018 19:33:43 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: properly handle indicated CCCH mode Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11179 Change subject: trxcon/l1ctl.c: properly handle indicated CCCH mode ...................................................................... trxcon/l1ctl.c: properly handle indicated CCCH mode The 'ccch_mode' enum from 'l1ctl_proto.h' to be extended in the near future in order to reflect persistence of CBCH. Thus it should be handled in a switch statement. Change-Id: I75e3b8deac1da296efb178e65ff6992b5c407b80 --- M src/host/trxcon/l1ctl.c 1 file changed, 29 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/79/11179/1 diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index a8a1289..f7f48af 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -256,6 +256,25 @@ return l1ctl_link_send(l1l, msg); } +static enum gsm_phys_chan_config l1ctl_ccch_mode2pchan_config(enum ccch_mode mode) +{ + switch (mode) { + /* TODO: distinguish extended BCCH */ + case CCCH_MODE_NON_COMBINED: + case CCCH_MODE_NONE: + return GSM_PCHAN_CCCH; + + /* TODO: distinguish CBCH */ + case CCCH_MODE_COMBINED: + return GSM_PCHAN_CCCH_SDCCH4; + + default: + LOGP(DL1C, LOGL_NOTICE, "Undandled CCCH mode (%u), " + "assuming non-combined configuration\n", mode); + return GSM_PCHAN_CCCH; + } +} + /* FBSB expire timer */ static void fbsb_timer_cb(void *data) { @@ -292,6 +311,7 @@ static int l1ctl_rx_fbsb_req(struct l1ctl_link *l1l, struct msgb *msg) { + enum gsm_phys_chan_config ch_config; struct l1ctl_fbsb_req *fbsb; uint16_t band_arfcn; uint16_t timeout; @@ -305,6 +325,7 @@ goto exit; } + ch_config = l1ctl_ccch_mode2pchan_config(fbsb->ccch_mode); band_arfcn = ntohs(fbsb->band_arfcn); timeout = ntohs(fbsb->timeout); @@ -316,10 +337,7 @@ sched_trx_reset(l1l->trx, 1); /* Configure a single timeslot */ - if (fbsb->ccch_mode == CCCH_MODE_COMBINED) - sched_trx_configure_ts(l1l->trx, 0, GSM_PCHAN_CCCH_SDCCH4); - else - sched_trx_configure_ts(l1l->trx, 0, GSM_PCHAN_CCCH); + sched_trx_configure_ts(l1l->trx, 0, ch_config); /* Ask SCH handler to send L1CTL_FBSB_CONF */ l1l->fbsb_conf_sent = 0; @@ -434,9 +452,10 @@ static int l1ctl_rx_ccch_mode_req(struct l1ctl_link *l1l, struct msgb *msg) { + enum gsm_phys_chan_config ch_config; struct l1ctl_ccch_mode_req *req; struct trx_ts *ts; - int mode, rc = 0; + int rc = 0; req = (struct l1ctl_ccch_mode_req *) msg->l1h; if (msgb_l1len(msg) < sizeof(*req)) { @@ -446,9 +465,8 @@ goto exit; } - LOGP(DL1C, LOGL_NOTICE, "Received CCCH mode request (%s)\n", - req->ccch_mode == CCCH_MODE_COMBINED ? - "combined" : "not combined"); + LOGP(DL1C, LOGL_NOTICE, "Received CCCH mode request (%u)\n", + req->ccch_mode); /* TODO: add value-string for ccch_mode */ /* Make sure that TS0 is allocated and configured */ ts = l1l->trx->ts_list[0]; @@ -459,12 +477,11 @@ } /* Choose corresponding channel combination */ - mode = req->ccch_mode == CCCH_MODE_COMBINED ? - GSM_PCHAN_CCCH_SDCCH4 : GSM_PCHAN_CCCH; + ch_config = l1ctl_ccch_mode2pchan_config(req->ccch_mode); /* Do nothing if the current mode matches required */ - if (ts->mf_layout->chan_config != mode) - rc = sched_trx_configure_ts(l1l->trx, 0, mode); + if (ts->mf_layout->chan_config != ch_config) + rc = sched_trx_configure_ts(l1l->trx, 0, ch_config); /* Confirm reconfiguration */ if (!rc) -- To view, visit https://gerrit.osmocom.org/11179 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I75e3b8deac1da296efb178e65ff6992b5c407b80 Gerrit-Change-Number: 11179 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 19:33:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 1 Oct 2018 19:33:44 +0000 Subject: Change in osmocom-bb[master]: firmware/layer1: inform about unhandled scheduler tasks Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11180 Change subject: firmware/layer1: inform about unhandled scheduler tasks ...................................................................... firmware/layer1: inform about unhandled scheduler tasks The mframe_task2chan_nr() is used to get the channel number (encoded according to 08.58 Chapter 9.3.1) corresponding to a given multi-frame task type. It makes sense to at least print some debug message in cases when there is no matching channel number for a given task type. Change-Id: I34587b6c67015513de35d85a7a3291f452ee7f3b --- M src/target/firmware/layer1/mframe_sched.c 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/80/11180/1 diff --git a/src/target/firmware/layer1/mframe_sched.c b/src/target/firmware/layer1/mframe_sched.c index f3a6b43..01ae167 100644 --- a/src/target/firmware/layer1/mframe_sched.c +++ b/src/target/firmware/layer1/mframe_sched.c @@ -400,10 +400,12 @@ case MF_TASK_TCH_H_1: cbits = 0x02 + 1; break; + case MF_TASK_UL_ALL_NB: - /* ERROR: cannot express as channel number */ - cbits = 0; - break; + default: + printd("ERROR: cannot express mf_task=%d as " + "channel number, using 0x00\n", mft); + cbits = 0x00; } return (cbits << 3) | (ts & 0x7); -- To view, visit https://gerrit.osmocom.org/11180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I34587b6c67015513de35d85a7a3291f452ee7f3b Gerrit-Change-Number: 11180 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 19:33:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 1 Oct 2018 19:33:44 +0000 Subject: Change in osmocom-bb[master]: firmware/layer1: add scheduler tasks for CBCH Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11181 Change subject: firmware/layer1: add scheduler tasks for CBCH ...................................................................... firmware/layer1: add scheduler tasks for CBCH According to GSM TS 05.02, section 3.3.5, Cell Broadcast Channel (CBCH) is a downlink only channel, which is used to carry the short message service cell broadcast (SMSCB). CBCH is optional, and uses the same physical channel as SDCCH. More precisely, CBCH replaces sub-slot number 2 of SDCCH channels when enabled. This change introduces the CBCH related tasks only, there is no way to enable them yet. Change-Id: I1d7f02cba1cd8f6527360589d2d2747b6426f78b --- M src/target/firmware/include/layer1/mframe_sched.h M src/target/firmware/layer1/mframe_sched.c 2 files changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/81/11181/1 diff --git a/src/target/firmware/include/layer1/mframe_sched.h b/src/target/firmware/include/layer1/mframe_sched.h index ecdb1ec..74e2d27 100644 --- a/src/target/firmware/include/layer1/mframe_sched.h +++ b/src/target/firmware/include/layer1/mframe_sched.h @@ -23,6 +23,9 @@ MF_TASK_SDCCH8_6, MF_TASK_SDCCH8_7, + MF_TASK_SDCCH4_CBCH, + MF_TASK_SDCCH8_CBCH, + MF_TASK_TCH_F_EVEN, MF_TASK_TCH_F_ODD, MF_TASK_TCH_H_0, diff --git a/src/target/firmware/layer1/mframe_sched.c b/src/target/firmware/layer1/mframe_sched.c index 01ae167..9be8380 100644 --- a/src/target/firmware/layer1/mframe_sched.c +++ b/src/target/firmware/layer1/mframe_sched.c @@ -198,6 +198,16 @@ { .sched_set = NULL } }; +/* CBCH replaces sub-slot 2 of SDCCH, see GSM 05.02, section 6.4 */ +static const struct mframe_sched_item mf_sdcch8_cbch[] = { + { .sched_set = NB_QUAD_FH_DL, .modulo = 51, .frame_nr = 8 }, + { .sched_set = NULL } +}; +static const struct mframe_sched_item mf_sdcch4_cbch[] = { + { .sched_set = NB_QUAD_DL, .modulo = 51, .frame_nr = 32 }, + { .sched_set = NULL } +}; + /* Measurement for MF 51 C0 */ static const struct mframe_sched_item mf_neigh_pm51_c0t0[] = { { .sched_set = NEIGH_PM , .modulo = 51, .frame_nr = 0 }, @@ -327,6 +337,9 @@ [MF_TASK_SDCCH8_6] = mf_sdcch8_6, [MF_TASK_SDCCH8_7] = mf_sdcch8_7, + [MF_TASK_SDCCH4_CBCH] = mf_sdcch4_cbch, + [MF_TASK_SDCCH8_CBCH] = mf_sdcch8_cbch, + [MF_TASK_TCH_F_EVEN] = mf_tch_f_even, [MF_TASK_TCH_F_ODD] = mf_tch_f_odd, [MF_TASK_TCH_H_0] = mf_tch_h_0, @@ -401,6 +414,12 @@ cbits = 0x02 + 1; break; + /* Osmocom specific extensions */ + case MF_TASK_SDCCH4_CBCH: + case MF_TASK_SDCCH8_CBCH: + cbits = 0xc8; + break; + case MF_TASK_UL_ALL_NB: default: printd("ERROR: cannot express mf_task=%d as " -- To view, visit https://gerrit.osmocom.org/11181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1d7f02cba1cd8f6527360589d2d2747b6426f78b Gerrit-Change-Number: 11181 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 19:33:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 1 Oct 2018 19:33:44 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: add CCCH/SDCCH mframe layouts with CBCH Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11182 Change subject: trxcon/scheduler: add CCCH/SDCCH mframe layouts with CBCH ...................................................................... trxcon/scheduler: add CCCH/SDCCH mframe layouts with CBCH According to GSM TS 05.02, section 3.3.5, Cell Broadcast Channel (CBCH) is a downlink only channel, which is used to carry the short message service cell broadcast (SMSCB). CBCH is optional, and uses the same physical channel as SDCCH. More precisely, CBCH replaces sub-slot number 2 of SDCCH channels when enabled. This change introduces the CBCH related multi-frame layouts, and CBCH as a separate logical channel type itself. There is no way to use these layouts for now. Change-Id: Iad9905fc3a8a012ff1ada26ff95af384816f9873 --- M src/host/trxcon/sched_lchan_desc.c M src/host/trxcon/sched_mframe.c M src/host/trxcon/sched_trx.h 3 files changed, 231 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/82/11182/1 diff --git a/src/host/trxcon/sched_lchan_desc.c b/src/host/trxcon/sched_lchan_desc.c index 05443f6..83fdc95 100644 --- a/src/host/trxcon/sched_lchan_desc.c +++ b/src/host/trxcon/sched_lchan_desc.c @@ -300,4 +300,10 @@ 4 * GSM_BURST_PL_LEN, TRX_CH_FLAG_PDCH, rx_data_fn, tx_data_fn, }, + [TRXC_CBCH] = { + TRXC_CBCH, "CBCH", + 0xc8, TRX_CH_LID_DEDIC, + 4 * GSM_BURST_PL_LEN, TRX_CH_FLAG_AUTO, + rx_data_fn, NULL, + }, }; diff --git a/src/host/trxcon/sched_mframe.c b/src/host/trxcon/sched_mframe.c index 25e7c29..f99b510 100644 --- a/src/host/trxcon/sched_mframe.c +++ b/src/host/trxcon/sched_mframe.c @@ -191,6 +191,113 @@ { TRXC_IDLE, 0, TRXC_SDCCH4_2, 3 }, }; +static const struct trx_frame frame_bcch_sdcch4_cbch[102] = { + /* dl_chan dl_bid ul_chan ul_bid */ + { TRXC_FCCH, 0, TRXC_SDCCH4_3, 0 }, + { TRXC_SCH, 0, TRXC_SDCCH4_3, 1 }, + { TRXC_BCCH, 0, TRXC_SDCCH4_3, 2 }, + { TRXC_BCCH, 1, TRXC_SDCCH4_3, 3 }, + { TRXC_BCCH, 2, TRXC_RACH, 0 }, + { TRXC_BCCH, 3, TRXC_RACH, 0 }, + { TRXC_CCCH, 0, TRXC_IDLE, 0 }, + { TRXC_CCCH, 1, TRXC_IDLE, 1 }, + { TRXC_CCCH, 2, TRXC_IDLE, 2 }, + { TRXC_CCCH, 3, TRXC_IDLE, 3 }, + { TRXC_FCCH, 0, TRXC_SACCH4_3, 0 }, + { TRXC_SCH, 0, TRXC_SACCH4_3, 1 }, + { TRXC_CCCH, 0, TRXC_SACCH4_3, 2 }, + { TRXC_CCCH, 1, TRXC_SACCH4_3, 3 }, + { TRXC_CCCH, 2, TRXC_RACH, 0 }, + { TRXC_CCCH, 3, TRXC_RACH, 0 }, + { TRXC_CCCH, 0, TRXC_RACH, 0 }, + { TRXC_CCCH, 1, TRXC_RACH, 0 }, + { TRXC_CCCH, 2, TRXC_RACH, 0 }, + { TRXC_CCCH, 3, TRXC_RACH, 0 }, + { TRXC_FCCH, 0, TRXC_RACH, 0 }, + { TRXC_SCH, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 1, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 2, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 3, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 1, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 2, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 3, TRXC_RACH, 0 }, + { TRXC_FCCH, 0, TRXC_RACH, 0 }, + { TRXC_SCH, 0, TRXC_RACH, 0 }, + { TRXC_CBCH, 0, TRXC_RACH, 0 }, + { TRXC_CBCH, 1, TRXC_RACH, 0 }, + { TRXC_CBCH, 2, TRXC_RACH, 0 }, + { TRXC_CBCH, 3, TRXC_RACH, 0 }, + { TRXC_SDCCH4_3, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_3, 1, TRXC_SDCCH4_0, 0 }, + { TRXC_SDCCH4_3, 2, TRXC_SDCCH4_0, 1 }, + { TRXC_SDCCH4_3, 3, TRXC_SDCCH4_0, 2 }, + { TRXC_FCCH, 0, TRXC_SDCCH4_0, 3 }, + { TRXC_SCH, 0, TRXC_SDCCH4_1, 0 }, + { TRXC_SACCH4_0, 0, TRXC_SDCCH4_1, 1 }, + { TRXC_SACCH4_0, 1, TRXC_SDCCH4_1, 2 }, + { TRXC_SACCH4_0, 2, TRXC_SDCCH4_1, 3 }, + { TRXC_SACCH4_0, 3, TRXC_RACH, 0 }, + { TRXC_SACCH4_1, 0, TRXC_RACH, 0 }, + { TRXC_SACCH4_1, 1, TRXC_IDLE, 0 }, + { TRXC_SACCH4_1, 2, TRXC_IDLE, 1 }, + { TRXC_SACCH4_1, 3, TRXC_IDLE, 2 }, + { TRXC_IDLE, 0, TRXC_IDLE, 3 }, + + { TRXC_FCCH, 0, TRXC_SDCCH4_3, 0 }, + { TRXC_SCH, 0, TRXC_SDCCH4_3, 1 }, + { TRXC_BCCH, 0, TRXC_SDCCH4_3, 2 }, + { TRXC_BCCH, 1, TRXC_SDCCH4_3, 3 }, + { TRXC_BCCH, 2, TRXC_RACH, 0 }, + { TRXC_BCCH, 3, TRXC_RACH, 0 }, + { TRXC_CCCH, 0, TRXC_SACCH4_0, 0 }, + { TRXC_CCCH, 1, TRXC_SACCH4_0, 1 }, + { TRXC_CCCH, 2, TRXC_SACCH4_0, 2 }, + { TRXC_CCCH, 3, TRXC_SACCH4_0, 3 }, + { TRXC_FCCH, 0, TRXC_SACCH4_1, 0 }, + { TRXC_SCH, 0, TRXC_SACCH4_1, 1 }, + { TRXC_CCCH, 0, TRXC_SACCH4_1, 2 }, + { TRXC_CCCH, 1, TRXC_SACCH4_1, 3 }, + { TRXC_CCCH, 2, TRXC_RACH, 0 }, + { TRXC_CCCH, 3, TRXC_RACH, 0 }, + { TRXC_CCCH, 0, TRXC_RACH, 0 }, + { TRXC_CCCH, 1, TRXC_RACH, 0 }, + { TRXC_CCCH, 2, TRXC_RACH, 0 }, + { TRXC_CCCH, 3, TRXC_RACH, 0 }, + { TRXC_FCCH, 0, TRXC_RACH, 0 }, + { TRXC_SCH, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 1, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 2, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 3, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 1, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 2, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 3, TRXC_RACH, 0 }, + { TRXC_FCCH, 0, TRXC_RACH, 0 }, + { TRXC_SCH, 0, TRXC_RACH, 0 }, + { TRXC_CBCH, 0, TRXC_RACH, 0 }, + { TRXC_CBCH, 1, TRXC_RACH, 0 }, + { TRXC_CBCH, 2, TRXC_RACH, 0 }, + { TRXC_CBCH, 3, TRXC_RACH, 0 }, + { TRXC_SDCCH4_3, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_3, 1, TRXC_SDCCH4_0, 0 }, + { TRXC_SDCCH4_3, 2, TRXC_SDCCH4_0, 1 }, + { TRXC_SDCCH4_3, 3, TRXC_SDCCH4_0, 2 }, + { TRXC_FCCH, 0, TRXC_SDCCH4_0, 3 }, + { TRXC_SCH, 0, TRXC_SDCCH4_1, 0 }, + { TRXC_IDLE, 0, TRXC_SDCCH4_1, 1 }, + { TRXC_IDLE, 1, TRXC_SDCCH4_1, 2 }, + { TRXC_IDLE, 2, TRXC_SDCCH4_1, 3 }, + { TRXC_IDLE, 3, TRXC_RACH, 0 }, + { TRXC_SACCH4_3, 0, TRXC_RACH, 0 }, + { TRXC_SACCH4_3, 1, TRXC_SDCCH4_2, 0 }, + { TRXC_SACCH4_3, 2, TRXC_SDCCH4_2, 1 }, + { TRXC_SACCH4_3, 3, TRXC_SDCCH4_2, 2 }, + { TRXC_IDLE, 0, TRXC_SDCCH4_2, 3 }, +}; + static const struct trx_frame frame_sdcch8[102] = { /* dl_chan dl_bid ul_chan ul_bid */ { TRXC_SDCCH8_0, 0, TRXC_SACCH8_5, 0 }, @@ -298,6 +405,113 @@ { TRXC_IDLE, 0, TRXC_SACCH8_4, 3 }, }; +static const struct trx_frame frame_sdcch8_cbch[102] = { + /* dl_chan dl_bid ul_chan ul_bid */ + { TRXC_SDCCH8_0, 0, TRXC_SACCH8_5, 0 }, + { TRXC_SDCCH8_0, 1, TRXC_SACCH8_5, 1 }, + { TRXC_SDCCH8_0, 2, TRXC_SACCH8_5, 2 }, + { TRXC_SDCCH8_0, 3, TRXC_SACCH8_5, 3 }, + { TRXC_SDCCH8_1, 0, TRXC_SACCH8_6, 0 }, + { TRXC_SDCCH8_1, 1, TRXC_SACCH8_6, 1 }, + { TRXC_SDCCH8_1, 2, TRXC_SACCH8_6, 2 }, + { TRXC_SDCCH8_1, 3, TRXC_SACCH8_6, 3 }, + { TRXC_CBCH, 0, TRXC_SACCH8_7, 0 }, + { TRXC_CBCH, 1, TRXC_SACCH8_7, 1 }, + { TRXC_CBCH, 2, TRXC_SACCH8_7, 2 }, + { TRXC_CBCH, 3, TRXC_SACCH8_7, 3 }, + { TRXC_SDCCH8_3, 0, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_3, 1, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_3, 2, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_3, 3, TRXC_SDCCH8_0, 0 }, + { TRXC_SDCCH8_4, 0, TRXC_SDCCH8_0, 1 }, + { TRXC_SDCCH8_4, 1, TRXC_SDCCH8_0, 2 }, + { TRXC_SDCCH8_4, 2, TRXC_SDCCH8_0, 3 }, + { TRXC_SDCCH8_4, 3, TRXC_SDCCH8_1, 0 }, + { TRXC_SDCCH8_5, 0, TRXC_SDCCH8_1, 1 }, + { TRXC_SDCCH8_5, 1, TRXC_SDCCH8_1, 2 }, + { TRXC_SDCCH8_5, 2, TRXC_SDCCH8_1, 3 }, + { TRXC_SDCCH8_5, 3, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_6, 0, TRXC_IDLE, 1 }, + { TRXC_SDCCH8_6, 1, TRXC_IDLE, 2 }, + { TRXC_SDCCH8_6, 2, TRXC_IDLE, 3 }, + { TRXC_SDCCH8_6, 3, TRXC_SDCCH8_3, 0 }, + { TRXC_SDCCH8_7, 0, TRXC_SDCCH8_3, 1 }, + { TRXC_SDCCH8_7, 1, TRXC_SDCCH8_3, 2 }, + { TRXC_SDCCH8_7, 2, TRXC_SDCCH8_3, 3 }, + { TRXC_SDCCH8_7, 3, TRXC_SDCCH8_4, 0 }, + { TRXC_SACCH8_0, 0, TRXC_SDCCH8_4, 1 }, + { TRXC_SACCH8_0, 1, TRXC_SDCCH8_4, 2 }, + { TRXC_SACCH8_0, 2, TRXC_SDCCH8_4, 3 }, + { TRXC_SACCH8_0, 3, TRXC_SDCCH8_5, 0 }, + { TRXC_SACCH8_1, 0, TRXC_SDCCH8_5, 1 }, + { TRXC_SACCH8_1, 1, TRXC_SDCCH8_5, 2 }, + { TRXC_SACCH8_1, 2, TRXC_SDCCH8_5, 3 }, + { TRXC_SACCH8_1, 3, TRXC_SDCCH8_6, 0 }, + { TRXC_IDLE, 0, TRXC_SDCCH8_6, 1 }, + { TRXC_IDLE, 1, TRXC_SDCCH8_6, 2 }, + { TRXC_IDLE, 2, TRXC_SDCCH8_6, 3 }, + { TRXC_IDLE, 3, TRXC_SDCCH8_7, 0 }, + { TRXC_SACCH8_3, 0, TRXC_SDCCH8_7, 1 }, + { TRXC_SACCH8_3, 1, TRXC_SDCCH8_7, 2 }, + { TRXC_SACCH8_3, 2, TRXC_SDCCH8_7, 3 }, + { TRXC_SACCH8_3, 3, TRXC_SACCH8_0, 0 }, + { TRXC_IDLE, 0, TRXC_SACCH8_0, 1 }, + { TRXC_IDLE, 0, TRXC_SACCH8_0, 2 }, + { TRXC_IDLE, 0, TRXC_SACCH8_0, 3 }, + + { TRXC_SDCCH8_0, 0, TRXC_SACCH8_1, 0 }, + { TRXC_SDCCH8_0, 1, TRXC_SACCH8_1, 1 }, + { TRXC_SDCCH8_0, 2, TRXC_SACCH8_1, 2 }, + { TRXC_SDCCH8_0, 3, TRXC_SACCH8_1, 3 }, + { TRXC_SDCCH8_1, 0, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_1, 1, TRXC_IDLE, 1 }, + { TRXC_SDCCH8_1, 2, TRXC_IDLE, 2 }, + { TRXC_SDCCH8_1, 3, TRXC_IDLE, 3 }, + { TRXC_CBCH, 0, TRXC_SACCH8_3, 0 }, + { TRXC_CBCH, 1, TRXC_SACCH8_3, 1 }, + { TRXC_CBCH, 2, TRXC_SACCH8_3, 2 }, + { TRXC_CBCH, 3, TRXC_SACCH8_3, 3 }, + { TRXC_SDCCH8_3, 0, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_3, 1, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_3, 2, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_3, 3, TRXC_SDCCH8_0, 0 }, + { TRXC_SDCCH8_4, 0, TRXC_SDCCH8_0, 1 }, + { TRXC_SDCCH8_4, 1, TRXC_SDCCH8_0, 2 }, + { TRXC_SDCCH8_4, 2, TRXC_SDCCH8_0, 3 }, + { TRXC_SDCCH8_4, 3, TRXC_SDCCH8_1, 0 }, + { TRXC_SDCCH8_5, 0, TRXC_SDCCH8_1, 1 }, + { TRXC_SDCCH8_5, 1, TRXC_SDCCH8_1, 2 }, + { TRXC_SDCCH8_5, 2, TRXC_SDCCH8_1, 3 }, + { TRXC_SDCCH8_5, 3, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_6, 0, TRXC_IDLE, 1 }, + { TRXC_SDCCH8_6, 1, TRXC_IDLE, 2 }, + { TRXC_SDCCH8_6, 2, TRXC_IDLE, 3 }, + { TRXC_SDCCH8_6, 3, TRXC_SDCCH8_3, 0 }, + { TRXC_SDCCH8_7, 0, TRXC_SDCCH8_3, 1 }, + { TRXC_SDCCH8_7, 1, TRXC_SDCCH8_3, 2 }, + { TRXC_SDCCH8_7, 2, TRXC_SDCCH8_3, 3 }, + { TRXC_SDCCH8_7, 3, TRXC_SDCCH8_4, 0 }, + { TRXC_SACCH8_4, 0, TRXC_SDCCH8_4, 1 }, + { TRXC_SACCH8_4, 1, TRXC_SDCCH8_4, 2 }, + { TRXC_SACCH8_4, 2, TRXC_SDCCH8_4, 3 }, + { TRXC_SACCH8_4, 3, TRXC_SDCCH8_5, 0 }, + { TRXC_SACCH8_5, 0, TRXC_SDCCH8_5, 1 }, + { TRXC_SACCH8_5, 1, TRXC_SDCCH8_5, 2 }, + { TRXC_SACCH8_5, 2, TRXC_SDCCH8_5, 3 }, + { TRXC_SACCH8_5, 3, TRXC_SDCCH8_6, 0 }, + { TRXC_SACCH8_6, 0, TRXC_SDCCH8_6, 1 }, + { TRXC_SACCH8_6, 1, TRXC_SDCCH8_6, 2 }, + { TRXC_SACCH8_6, 2, TRXC_SDCCH8_6, 3 }, + { TRXC_SACCH8_6, 3, TRXC_SDCCH8_7, 0 }, + { TRXC_SACCH8_7, 0, TRXC_SDCCH8_7, 1 }, + { TRXC_SACCH8_7, 1, TRXC_SDCCH8_7, 2 }, + { TRXC_SACCH8_7, 2, TRXC_SDCCH8_7, 3 }, + { TRXC_SACCH8_7, 3, TRXC_SACCH8_4, 0 }, + { TRXC_IDLE, 0, TRXC_SACCH8_4, 1 }, + { TRXC_IDLE, 0, TRXC_SACCH8_4, 2 }, + { TRXC_IDLE, 0, TRXC_SACCH8_4, 3 }, +}; + static const struct trx_frame frame_tchf_ts0[104] = { /* dl_chan dl_bid ul_chan ul_bid */ { TRXC_TCHF, 0, TRXC_TCHF, 0 }, @@ -1728,11 +1942,21 @@ frame_bcch_sdcch4 }, { + GSM_PCHAN_CCCH_SDCCH4_CBCH, "BCCH+CCCH+SDCCH/4+SACCH/4+CBCH", + 102, 0xff, (uint64_t) 0x400f001e3e, + frame_bcch_sdcch4_cbch + }, + { GSM_PCHAN_SDCCH8_SACCH8C, "SDCCH/8+SACCH/8", 102, 0xff, (uint64_t) 0xff01fe000, frame_sdcch8 }, { + GSM_PCHAN_SDCCH8_SACCH8C_CBCH, "SDCCH/8+SACCH/8+CBCH", + 102, 0xff, (uint64_t) 0x4ff01fe000, + frame_sdcch8_cbch + }, + { GSM_PCHAN_TCH_F, "TCH/F+SACCH", 104, 0x01, (uint64_t) 0x200040, frame_tchf_ts0 diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index 10ae256..81d9ee6 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -83,6 +83,7 @@ TRXC_SACCH8_7, TRXC_PDTCH, TRXC_PTCCH, + TRXC_CBCH, _TRX_CHAN_MAX }; -- To view, visit https://gerrit.osmocom.org/11182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iad9905fc3a8a012ff1ada26ff95af384816f9873 Gerrit-Change-Number: 11182 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 19:33:45 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 1 Oct 2018 19:33:45 +0000 Subject: Change in osmocom-bb[master]: l1ctl_proto.h: extend ccch_mode enum with CBCH Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11183 Change subject: l1ctl_proto.h: extend ccch_mode enum with CBCH ...................................................................... l1ctl_proto.h: extend ccch_mode enum with CBCH According to GSM TS 05.02, there are two ways to enable CBCH: a) replace sub-slot number 2 of CCCH+SDCCH/4 (comb. V), b) replace sub-slot number 2 of SDCCH/8 (comb. VII). Unlike SDCCH/8 (case b), CCCH+SDCCH/4 can be allocated on TS0 only, and shall not use frequency hopping. This means that implementing CBCH support on SDCCH/8 would require much more efforts than on combined CCCH+SDCCH/4, as in last case CBCH messages can be received without the need to switch from idle to dedicated mode. This change introduces a new ccch_mode item, which should be used by the higher layers to indicate presence of CBCH channel on C0/TS0, so the PHY would enable decoding of CBCH messages on CCCH+SDCCH/4 (case a) in idle mode. Regarding to CBCH on SDCCH/8 (case b), it makes sense to extend the 'l1ctl_dm_est_req', so it would be handled in dedicated mode on request from the higher layers. Change-Id: Ia94ebf22a2ec439dfe1f31d703b832ae57b48ef2 --- M include/l1ctl_proto.h M src/host/trxcon/l1ctl.c M src/target/firmware/layer1/l23_api.c M src/target/firmware/layer1/prim_fbsb.c 4 files changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/83/11183/1 diff --git a/include/l1ctl_proto.h b/include/l1ctl_proto.h index 9d548bc..f1bff86 100644 --- a/include/l1ctl_proto.h +++ b/include/l1ctl_proto.h @@ -70,6 +70,7 @@ CCCH_MODE_NONE = 0, CCCH_MODE_NON_COMBINED, CCCH_MODE_COMBINED, + CCCH_MODE_COMBINED_CBCH, }; enum neigh_mode { diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index f7f48af..83cdc2e 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -264,9 +264,10 @@ case CCCH_MODE_NONE: return GSM_PCHAN_CCCH; - /* TODO: distinguish CBCH */ case CCCH_MODE_COMBINED: return GSM_PCHAN_CCCH_SDCCH4; + case CCCH_MODE_COMBINED_CBCH: + return GSM_PCHAN_CCCH_SDCCH4_CBCH; default: LOGP(DL1C, LOGL_NOTICE, "Undandled CCCH mode (%u), " diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c index e46ca09..311c521 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -479,6 +479,10 @@ mframe_enable(MF_TASK_CCCH_COMB); else if (ccch_mode == CCCH_MODE_NON_COMBINED) mframe_enable(MF_TASK_CCCH); + else if (ccch_mode == CCCH_MODE_COMBINED_CBCH) { + mframe_enable(MF_TASK_CCCH_COMB); + mframe_enable(MF_TASK_SDCCH4_CBCH); + } l1ctl_tx_ccch_mode_conf(ccch_mode); } diff --git a/src/target/firmware/layer1/prim_fbsb.c b/src/target/firmware/layer1/prim_fbsb.c index 9eb56c6..50acefc 100644 --- a/src/target/firmware/layer1/prim_fbsb.c +++ b/src/target/firmware/layer1/prim_fbsb.c @@ -262,6 +262,10 @@ mframe_enable(MF_TASK_CCCH_COMB); else if (l1s.serving_cell.ccch_mode == CCCH_MODE_NON_COMBINED) mframe_enable(MF_TASK_CCCH); + else if (l1s.serving_cell.ccch_mode == CCCH_MODE_COMBINED_CBCH) { + mframe_enable(MF_TASK_CCCH_COMB); + mframe_enable(MF_TASK_SDCCH4_CBCH); + } l1s_compl_sched(L1_COMPL_FB); -- To view, visit https://gerrit.osmocom.org/11183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia94ebf22a2ec439dfe1f31d703b832ae57b48ef2 Gerrit-Change-Number: 11183 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 19:54:10 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 1 Oct 2018 19:54:10 +0000 Subject: Change in osmocom-bb[master]: firmware/layer1: add scheduler tasks for CBCH In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11181 to look at the new patch set (#2). Change subject: firmware/layer1: add scheduler tasks for CBCH ...................................................................... firmware/layer1: add scheduler tasks for CBCH According to GSM TS 05.02, section 3.3.5, Cell Broadcast Channel (CBCH) is a downlink only channel, which is used to carry the short message service cell broadcast (SMSCB). CBCH is optional, and uses the same physical channel as SDCCH. More precisely, CBCH replaces sub-slot number 2 of SDCCH channels when enabled. This change introduces the CBCH related tasks only, there is no way to enable them yet. Change-Id: I1d7f02cba1cd8f6527360589d2d2747b6426f78b --- M src/target/firmware/include/layer1/mframe_sched.h M src/target/firmware/layer1/mframe_sched.c 2 files changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/81/11181/2 -- To view, visit https://gerrit.osmocom.org/11181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1d7f02cba1cd8f6527360589d2d2747b6426f78b Gerrit-Change-Number: 11181 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 19:54:10 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 1 Oct 2018 19:54:10 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: add CCCH/SDCCH mframe layouts with CBCH In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11182 to look at the new patch set (#2). Change subject: trxcon/scheduler: add CCCH/SDCCH mframe layouts with CBCH ...................................................................... trxcon/scheduler: add CCCH/SDCCH mframe layouts with CBCH According to GSM TS 05.02, section 3.3.5, Cell Broadcast Channel (CBCH) is a downlink only channel, which is used to carry the short message service cell broadcast (SMSCB). CBCH is optional, and uses the same physical channel as SDCCH. More precisely, CBCH replaces sub-slot number 2 of SDCCH channels when enabled. This change introduces the CBCH related multi-frame layouts, and CBCH as a separate logical channel type itself. There is no way to use these layouts for now. Change-Id: Iad9905fc3a8a012ff1ada26ff95af384816f9873 --- M src/host/trxcon/sched_lchan_desc.c M src/host/trxcon/sched_mframe.c M src/host/trxcon/sched_trx.h 3 files changed, 231 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/82/11182/2 -- To view, visit https://gerrit.osmocom.org/11182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iad9905fc3a8a012ff1ada26ff95af384816f9873 Gerrit-Change-Number: 11182 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 19:54:10 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 1 Oct 2018 19:54:10 +0000 Subject: Change in osmocom-bb[master]: l1ctl_proto.h: extend ccch_mode enum with CBCH In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11183 to look at the new patch set (#2). Change subject: l1ctl_proto.h: extend ccch_mode enum with CBCH ...................................................................... l1ctl_proto.h: extend ccch_mode enum with CBCH According to GSM TS 05.02, there are two ways to enable CBCH: a) replace sub-slot number 2 of CCCH+SDCCH/4 (comb. V), b) replace sub-slot number 2 of SDCCH/8 (comb. VII). Unlike SDCCH/8 (case b), CCCH+SDCCH/4 can be allocated on TS0 only, and shall not use frequency hopping. This means that implementing CBCH support on SDCCH/8 would require much more efforts than on combined CCCH+SDCCH/4, as in last case CBCH messages can be received without the need to switch from idle to dedicated mode. This change introduces a new ccch_mode item, which should be used by the higher layers to indicate presence of CBCH channel on C0/TS0, so the PHY would enable decoding of CBCH messages on CCCH+SDCCH/4 (case a) in idle mode. Regarding to CBCH on SDCCH/8 (case b), it makes sense to extend the 'l1ctl_dm_est_req', so it would be handled in dedicated mode on request from the higher layers. Change-Id: Ia94ebf22a2ec439dfe1f31d703b832ae57b48ef2 --- M include/l1ctl_proto.h M src/host/trxcon/l1ctl.c M src/target/firmware/layer1/l23_api.c M src/target/firmware/layer1/prim_fbsb.c 4 files changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/83/11183/2 -- To view, visit https://gerrit.osmocom.org/11183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia94ebf22a2ec439dfe1f31d703b832ae57b48ef2 Gerrit-Change-Number: 11183 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Oct 1 20:00:02 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 01 Oct 2018 20:00:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5bb27cc7aa7a8_383184867c864dc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_17.10/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 282s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 282s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 282s] collect2: error: ld returned 1 exit status [ 282s] Makefile:473: recipe for target 'InterthreadTest' failed [ 282s] make[4]: *** [InterthreadTest] Error 1 [ 282s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/CommonLibs' [ 282s] Makefile:400: recipe for target 'all-recursive' failed [ 282s] make[3]: *** [all-recursive] Error 1 [ 282s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 282s] Makefile:515: recipe for target 'all-recursive' failed [ 282s] make[2]: *** [all-recursive] Error 1 [ 282s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 282s] Makefile:446: recipe for target 'all' failed [ 282s] make[1]: *** [all] Error 2 [ 282s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 282s] dh_auto_build: make -j1 returned exit code 2 [ 282s] debian/rules:6: recipe for target 'build' failed [ 282s] make: *** [build] Error 2 [ 282s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 282s] [ 282s] lamb53 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Mon Oct 1 19:59:47 UTC 2018. [ 282s] [ 282s] ### VM INTERACTION START ### [ 286s] [ 269.156517] sysrq: SysRq : Power Off [ 286s] [ 269.194826] reboot: Power down [ 286s] ### VM INTERACTION END ### [ 286s] [ 286s] lamb53 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Mon Oct 1 19:59:50 UTC 2018. [ 286s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Oct 1 20:00:02 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 01 Oct 2018 20:00:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5bb27cc773721_383184867c8636b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 226s] /usr/src/packages/BUILD/CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 226s] /usr/src/packages/BUILD/CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 226s] collect2: error: ld returned 1 exit status [ 226s] Makefile:473: recipe for target 'InterthreadTest' failed [ 226s] make[4]: *** [InterthreadTest] Error 1 [ 226s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/CommonLibs' [ 226s] Makefile:400: recipe for target 'all-recursive' failed [ 226s] make[3]: *** [all-recursive] Error 1 [ 226s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 226s] Makefile:515: recipe for target 'all-recursive' failed [ 226s] make[2]: *** [all-recursive] Error 1 [ 226s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 226s] Makefile:446: recipe for target 'all' failed [ 226s] make[1]: *** [all] Error 2 [ 226s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 226s] dh_auto_build: make -j1 returned exit code 2 [ 226s] debian/rules:6: recipe for target 'build' failed [ 226s] make: *** [build] Error 2 [ 226s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 226s] [ 226s] lamb28 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Mon Oct 1 19:59:45 UTC 2018. [ 226s] [ 226s] ### VM INTERACTION START ### [ 229s] [ 213.083879] sysrq: SysRq : Power Off [ 229s] [ 213.098089] reboot: Power down [ 229s] ### VM INTERACTION END ### [ 229s] [ 229s] lamb28 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Mon Oct 1 19:59:49 UTC 2018. [ 229s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Oct 1 20:00:53 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 01 Oct 2018 20:00:53 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5bb27d015dca0_383184867c865d0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 282s] /usr/src/packages/BUILD/CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 282s] /usr/src/packages/BUILD/CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 282s] collect2: error: ld returned 1 exit status [ 282s] Makefile:473: recipe for target 'InterthreadTest' failed [ 282s] make[4]: *** [InterthreadTest] Error 1 [ 282s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/CommonLibs' [ 282s] Makefile:400: recipe for target 'all-recursive' failed [ 282s] make[3]: *** [all-recursive] Error 1 [ 282s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 282s] Makefile:515: recipe for target 'all-recursive' failed [ 282s] make[2]: *** [all-recursive] Error 1 [ 283s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 283s] Makefile:446: recipe for target 'all' failed [ 283s] make[1]: *** [all] Error 2 [ 283s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 283s] dh_auto_build: make -j1 returned exit code 2 [ 283s] debian/rules:6: recipe for target 'build' failed [ 283s] make: *** [build] Error 2 [ 283s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 283s] [ 283s] cloud126 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Mon Oct 1 20:00:42 UTC 2018. [ 283s] [ 283s] ### VM INTERACTION START ### [ 286s] [ 254.382388] sysrq: SysRq : Power Off [ 286s] [ 254.390285] reboot: Power down [ 287s] ### VM INTERACTION END ### [ 287s] [ 287s] cloud126 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Mon Oct 1 20:00:47 UTC 2018. [ 287s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Oct 1 20:00:53 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 01 Oct 2018 20:00:53 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5bb27d01e18aa_383184867c866d8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 260s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 260s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 260s] collect2: error: ld returned 1 exit status [ 260s] Makefile:473: recipe for target 'InterthreadTest' failed [ 260s] make[4]: *** [InterthreadTest] Error 1 [ 260s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/CommonLibs' [ 260s] Makefile:400: recipe for target 'all-recursive' failed [ 260s] make[3]: *** [all-recursive] Error 1 [ 260s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 260s] Makefile:515: recipe for target 'all-recursive' failed [ 260s] make[2]: *** [all-recursive] Error 1 [ 260s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 260s] Makefile:446: recipe for target 'all' failed [ 260s] make[1]: *** [all] Error 2 [ 260s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 260s] dh_auto_build: make -j1 returned exit code 2 [ 260s] debian/rules:6: recipe for target 'build' failed [ 260s] make: *** [build] Error 2 [ 260s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 260s] [ 260s] cloud117 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Mon Oct 1 20:00:34 UTC 2018. [ 260s] [ 260s] ### VM INTERACTION START ### [ 263s] [ 240.546530] sysrq: SysRq : Power Off [ 263s] [ 240.550851] reboot: Power down [ 264s] ### VM INTERACTION END ### [ 264s] [ 264s] cloud117 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Mon Oct 1 20:00:38 UTC 2018. [ 264s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Oct 1 20:00:53 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 01 Oct 2018 20:00:53 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5bb27d0260ba7_383184867c867f4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 262s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 262s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 262s] collect2: error: ld returned 1 exit status [ 262s] Makefile:473: recipe for target 'InterthreadTest' failed [ 262s] make[4]: *** [InterthreadTest] Error 1 [ 262s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/CommonLibs' [ 262s] Makefile:400: recipe for target 'all-recursive' failed [ 262s] make[3]: *** [all-recursive] Error 1 [ 262s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 262s] Makefile:515: recipe for target 'all-recursive' failed [ 262s] make[2]: *** [all-recursive] Error 1 [ 262s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 262s] Makefile:446: recipe for target 'all' failed [ 262s] make[1]: *** [all] Error 2 [ 262s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 262s] dh_auto_build: make -j1 returned exit code 2 [ 262s] debian/rules:6: recipe for target 'build' failed [ 262s] make: *** [build] Error 2 [ 262s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 262s] [ 262s] cloud127 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Mon Oct 1 20:00:36 UTC 2018. [ 262s] [ 262s] ### VM INTERACTION START ### [ 266s] [ 238.881910] sysrq: SysRq : Power Off [ 266s] [ 238.890266] reboot: Power down [ 267s] ### VM INTERACTION END ### [ 267s] [ 267s] cloud127 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Mon Oct 1 20:00:41 UTC 2018. [ 267s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Oct 1 20:02:02 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 01 Oct 2018 20:02:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5bb27d3bc39e8_383184867c8686d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 231s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 231s] ./CommonLibs/Logger.cpp:55: undefined reference to `logp2' [ 231s] collect2: error: ld returned 1 exit status [ 231s] Makefile:473: recipe for target 'InterthreadTest' failed [ 231s] make[4]: *** [InterthreadTest] Error 1 [ 231s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/CommonLibs' [ 231s] Makefile:400: recipe for target 'all-recursive' failed [ 231s] make[3]: *** [all-recursive] Error 1 [ 231s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 231s] Makefile:515: recipe for target 'all-recursive' failed [ 231s] make[2]: *** [all-recursive] Error 1 [ 231s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 231s] Makefile:446: recipe for target 'all' failed [ 231s] make[1]: *** [all] Error 2 [ 231s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 231s] dh_auto_build: make -j1 returned exit code 2 [ 231s] debian/rules:6: recipe for target 'build' failed [ 231s] make: *** [build] Error 2 [ 231s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 231s] [ 231s] lamb11 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Mon Oct 1 20:01:42 UTC 2018. [ 231s] [ 231s] ### VM INTERACTION START ### [ 234s] [ 221.393904] sysrq: SysRq : Power Off [ 234s] [ 221.428626] reboot: Power down [ 234s] ### VM INTERACTION END ### [ 235s] [ 235s] lamb11 failed "build osmo-trx_0.4.0.65.5b60.dsc" at Mon Oct 1 20:01:47 UTC 2018. [ 235s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Oct 1 20:18:28 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 1 Oct 2018 20:18:28 +0000 Subject: Change in osmocom-bb[master]: firmware/layer1: add scheduler tasks for CBCH In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11181 ) Change subject: firmware/layer1: add scheduler tasks for CBCH ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11181/2/src/target/firmware/layer1/mframe_sched.c File src/target/firmware/layer1/mframe_sched.c: https://gerrit.osmocom.org/#/c/11181/2/src/target/firmware/layer1/mframe_sched.c at 418 PS2, Line 418: case MF_TASK_SDCCH4_CBCH: Oh, I think there should be a way to distinguish between both tasks. What about the following: - MF_TASK_SDCCH4_CBCH - 0xc0 (0b11000 000) - MF_TASK_SDCCH8_CBCH - 0xc8 (0b11001 000) The problem is that the following assumption: mf_task = (tn == 0) ? MF_TASK_SDCCH4_CBCH : MF_TASK_SDCCH8_CBCH; is wrong, because SDCCH/8 can also be allocated on CX/TS0. We need to find some way to distinguish both cases... -- To view, visit https://gerrit.osmocom.org/11181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1d7f02cba1cd8f6527360589d2d2747b6426f78b Gerrit-Change-Number: 11181 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 01 Oct 2018 20:18:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 21:49:31 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 1 Oct 2018 21:49:31 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: add dedicated CBCH mode support Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11184 Change subject: trxcon/scheduler: add dedicated CBCH mode support ...................................................................... trxcon/scheduler: add dedicated CBCH mode support This change extends sched_trx_chan_nr2pchan_config() with Osmocom specific cbits related to CBCH, so now one can to decode CBCH channels in dedicated mode (see L1CTL_DM_EST_REQ). Change-Id: I9347c45638223cac34f4b48eb736e51a5055a36f --- M src/host/trxcon/sched_trx.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/84/11184/1 diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index 0b83af3..19d1fe8 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -535,8 +535,12 @@ return GSM_PCHAN_TCH_H; else if ((cbits & 0x1c) == 0x04) return GSM_PCHAN_CCCH_SDCCH4; + else if ((cbits & 0x1f) == 0x18) + return GSM_PCHAN_CCCH_SDCCH4_CBCH; else if ((cbits & 0x18) == 0x08) return GSM_PCHAN_SDCCH8_SACCH8C; + else if ((cbits & 0x1f) == 0x19) + return GSM_PCHAN_SDCCH8_SACCH8C_CBCH; return GSM_PCHAN_NONE; } -- To view, visit https://gerrit.osmocom.org/11184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9347c45638223cac34f4b48eb736e51a5055a36f Gerrit-Change-Number: 11184 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 21:50:38 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 1 Oct 2018 21:50:38 +0000 Subject: Change in osmocom-bb[master]: firmware/layer1: add scheduler tasks for CBCH In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11181 ) Change subject: firmware/layer1: add scheduler tasks for CBCH ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1d7f02cba1cd8f6527360589d2d2747b6426f78b Gerrit-Change-Number: 11181 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 01 Oct 2018 21:50:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 21:50:45 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 1 Oct 2018 21:50:45 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: add CCCH/SDCCH mframe layouts with CBCH In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11182 ) Change subject: trxcon/scheduler: add CCCH/SDCCH mframe layouts with CBCH ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iad9905fc3a8a012ff1ada26ff95af384816f9873 Gerrit-Change-Number: 11182 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 01 Oct 2018 21:50:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 22:51:24 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 1 Oct 2018 22:51:24 +0000 Subject: Change in libosmocore[master]: mncc: Move definitions to header file Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/11185 Change subject: mncc: Move definitions to header file ...................................................................... mncc: Move definitions to header file This commit moves various gsm_mncc_* structs and the MNCC_* defines from .c file to the header. This paves the way to remove this duplicated code from the osmo-sip-connector. Change-Id: I62bc025369bd9ee9b134e064a8364aa4bd5de16e --- M include/osmocom/gsm/mncc.h M src/gsm/mncc.c 2 files changed, 150 insertions(+), 153 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/11185/1 diff --git a/include/osmocom/gsm/mncc.h b/include/osmocom/gsm/mncc.h index 7e7d12c..e314163 100644 --- a/include/osmocom/gsm/mncc.h +++ b/include/osmocom/gsm/mncc.h @@ -8,6 +8,83 @@ #define GSM_MAX_SSVERSION 128 #define GSM_MAX_USERUSER 128 +#define MNCC_SETUP_REQ 0x0101 +#define MNCC_SETUP_IND 0x0102 +#define MNCC_SETUP_RSP 0x0103 +#define MNCC_SETUP_CNF 0x0104 +#define MNCC_SETUP_COMPL_REQ 0x0105 +#define MNCC_SETUP_COMPL_IND 0x0106 +/* MNCC_REJ_* is perfomed via MNCC_REL_* */ +#define MNCC_CALL_CONF_IND 0x0107 +#define MNCC_CALL_PROC_REQ 0x0108 +#define MNCC_PROGRESS_REQ 0x0109 +#define MNCC_ALERT_REQ 0x010a +#define MNCC_ALERT_IND 0x010b +#define MNCC_NOTIFY_REQ 0x010c +#define MNCC_NOTIFY_IND 0x010d +#define MNCC_DISC_REQ 0x010e +#define MNCC_DISC_IND 0x010f +#define MNCC_REL_REQ 0x0110 +#define MNCC_REL_IND 0x0111 +#define MNCC_REL_CNF 0x0112 +#define MNCC_FACILITY_REQ 0x0113 +#define MNCC_FACILITY_IND 0x0114 +#define MNCC_START_DTMF_IND 0x0115 +#define MNCC_START_DTMF_RSP 0x0116 +#define MNCC_START_DTMF_REJ 0x0117 +#define MNCC_STOP_DTMF_IND 0x0118 +#define MNCC_STOP_DTMF_RSP 0x0119 +#define MNCC_MODIFY_REQ 0x011a +#define MNCC_MODIFY_IND 0x011b +#define MNCC_MODIFY_RSP 0x011c +#define MNCC_MODIFY_CNF 0x011d +#define MNCC_MODIFY_REJ 0x011e +#define MNCC_HOLD_IND 0x011f +#define MNCC_HOLD_CNF 0x0120 +#define MNCC_HOLD_REJ 0x0121 +#define MNCC_RETRIEVE_IND 0x0122 +#define MNCC_RETRIEVE_CNF 0x0123 +#define MNCC_RETRIEVE_REJ 0x0124 +#define MNCC_USERINFO_REQ 0x0125 +#define MNCC_USERINFO_IND 0x0126 +#define MNCC_REJ_REQ 0x0127 +#define MNCC_REJ_IND 0x0128 + +#define MNCC_BRIDGE 0x0200 +#define MNCC_FRAME_RECV 0x0201 +#define MNCC_FRAME_DROP 0x0202 +#define MNCC_LCHAN_MODIFY 0x0203 +#define MNCC_RTP_CREATE 0x0204 +#define MNCC_RTP_CONNECT 0x0205 +#define MNCC_RTP_FREE 0x0206 + +#define GSM_TCHF_FRAME 0x0300 +#define GSM_TCHF_FRAME_EFR 0x0301 +#define GSM_TCHH_FRAME 0x0302 +#define GSM_TCH_FRAME_AMR 0x0303 +#define GSM_BAD_FRAME 0x03ff + +#define MNCC_SOCKET_HELLO 0x0400 + +#define GSM_MAX_FACILITY 128 +#define GSM_MAX_SSVERSION 128 +#define GSM_MAX_USERUSER 128 + +#define MNCC_F_BEARER_CAP 0x0001 +#define MNCC_F_CALLED 0x0002 +#define MNCC_F_CALLING 0x0004 +#define MNCC_F_REDIRECTING 0x0008 +#define MNCC_F_CONNECTED 0x0010 +#define MNCC_F_CAUSE 0x0020 +#define MNCC_F_USERUSER 0x0040 +#define MNCC_F_PROGRESS 0x0080 +#define MNCC_F_EMERGENCY 0x0100 +#define MNCC_F_FACILITY 0x0200 +#define MNCC_F_SSVERSION 0x0400 +#define MNCC_F_CCCAP 0x0800 +#define MNCC_F_KEYPAD 0x1000 +#define MNCC_F_SIGNAL 0x2000 + /* Expanded fields from GSM TS 04.08, Table 10.5.102 */ struct gsm_mncc_bearer_cap { int transfer; /* Information Transfer Capability */ @@ -74,6 +151,79 @@ int pcp; }; +struct gsm_mncc { + /* context based information */ + uint32_t msg_type; + uint32_t callref; + + /* which fields are present */ + uint32_t fields; + + /* data derived informations (MNCC_F_ based) */ + struct gsm_mncc_bearer_cap bearer_cap; + struct gsm_mncc_number called; + struct gsm_mncc_number calling; + struct gsm_mncc_number redirecting; + struct gsm_mncc_number connected; + struct gsm_mncc_cause cause; + struct gsm_mncc_progress progress; + struct gsm_mncc_useruser useruser; + struct gsm_mncc_facility facility; + struct gsm_mncc_cccap cccap; + struct gsm_mncc_ssversion ssversion; + struct { + int sup; + int inv; + } clir; + int signal; + + /* data derived information, not MNCC_F based */ + int keypad; + int more; + int notify; /* 0..127 */ + int emergency; + char imsi[16]; + + unsigned char lchan_type; + unsigned char lchan_mode; +}; + +struct gsm_data_frame { + uint32_t msg_type; + uint32_t callref; + unsigned char data[0]; +}; + +#define MNCC_SOCK_VERSION 5 +struct gsm_mncc_hello { + uint32_t msg_type; + uint32_t version; + + /* send the sizes of the structs */ + uint32_t mncc_size; + uint32_t data_frame_size; + + /* send some offsets */ + uint32_t called_offset; + uint32_t signal_offset; + uint32_t emergency_offset; + uint32_t lchan_type_offset; +}; + +struct gsm_mncc_rtp { + uint32_t msg_type; + uint32_t callref; + uint32_t ip; + uint16_t port; + uint32_t payload_type; + uint32_t payload_msg_type; +}; + +struct gsm_mncc_bridge { + uint32_t msg_type; + uint32_t callref[2]; +}; + enum { GSM_MNCC_BCAP_SPEECH = 0, GSM_MNCC_BCAP_UNR_DIG = 1, diff --git a/src/gsm/mncc.c b/src/gsm/mncc.c index 938cf9a..a6c2f73 100644 --- a/src/gsm/mncc.c +++ b/src/gsm/mncc.c @@ -34,159 +34,6 @@ #include #include -/* FIXME FIXME FIXME FIXME FIXME START */ -#define MNCC_SETUP_REQ 0x0101 -#define MNCC_SETUP_IND 0x0102 -#define MNCC_SETUP_RSP 0x0103 -#define MNCC_SETUP_CNF 0x0104 -#define MNCC_SETUP_COMPL_REQ 0x0105 -#define MNCC_SETUP_COMPL_IND 0x0106 -/* MNCC_REJ_* is perfomed via MNCC_REL_* */ -#define MNCC_CALL_CONF_IND 0x0107 -#define MNCC_CALL_PROC_REQ 0x0108 -#define MNCC_PROGRESS_REQ 0x0109 -#define MNCC_ALERT_REQ 0x010a -#define MNCC_ALERT_IND 0x010b -#define MNCC_NOTIFY_REQ 0x010c -#define MNCC_NOTIFY_IND 0x010d -#define MNCC_DISC_REQ 0x010e -#define MNCC_DISC_IND 0x010f -#define MNCC_REL_REQ 0x0110 -#define MNCC_REL_IND 0x0111 -#define MNCC_REL_CNF 0x0112 -#define MNCC_FACILITY_REQ 0x0113 -#define MNCC_FACILITY_IND 0x0114 -#define MNCC_START_DTMF_IND 0x0115 -#define MNCC_START_DTMF_RSP 0x0116 -#define MNCC_START_DTMF_REJ 0x0117 -#define MNCC_STOP_DTMF_IND 0x0118 -#define MNCC_STOP_DTMF_RSP 0x0119 -#define MNCC_MODIFY_REQ 0x011a -#define MNCC_MODIFY_IND 0x011b -#define MNCC_MODIFY_RSP 0x011c -#define MNCC_MODIFY_CNF 0x011d -#define MNCC_MODIFY_REJ 0x011e -#define MNCC_HOLD_IND 0x011f -#define MNCC_HOLD_CNF 0x0120 -#define MNCC_HOLD_REJ 0x0121 -#define MNCC_RETRIEVE_IND 0x0122 -#define MNCC_RETRIEVE_CNF 0x0123 -#define MNCC_RETRIEVE_REJ 0x0124 -#define MNCC_USERINFO_REQ 0x0125 -#define MNCC_USERINFO_IND 0x0126 -#define MNCC_REJ_REQ 0x0127 -#define MNCC_REJ_IND 0x0128 - -#define MNCC_BRIDGE 0x0200 -#define MNCC_FRAME_RECV 0x0201 -#define MNCC_FRAME_DROP 0x0202 -#define MNCC_LCHAN_MODIFY 0x0203 -#define MNCC_RTP_CREATE 0x0204 -#define MNCC_RTP_CONNECT 0x0205 -#define MNCC_RTP_FREE 0x0206 - -#define GSM_TCHF_FRAME 0x0300 -#define GSM_TCHF_FRAME_EFR 0x0301 -#define GSM_TCHH_FRAME 0x0302 -#define GSM_TCH_FRAME_AMR 0x0303 -#define GSM_BAD_FRAME 0x03ff - -#define MNCC_SOCKET_HELLO 0x0400 - -#define GSM_MAX_FACILITY 128 -#define GSM_MAX_SSVERSION 128 -#define GSM_MAX_USERUSER 128 - -#define MNCC_F_BEARER_CAP 0x0001 -#define MNCC_F_CALLED 0x0002 -#define MNCC_F_CALLING 0x0004 -#define MNCC_F_REDIRECTING 0x0008 -#define MNCC_F_CONNECTED 0x0010 -#define MNCC_F_CAUSE 0x0020 -#define MNCC_F_USERUSER 0x0040 -#define MNCC_F_PROGRESS 0x0080 -#define MNCC_F_EMERGENCY 0x0100 -#define MNCC_F_FACILITY 0x0200 -#define MNCC_F_SSVERSION 0x0400 -#define MNCC_F_CCCAP 0x0800 -#define MNCC_F_KEYPAD 0x1000 -#define MNCC_F_SIGNAL 0x2000 - -struct gsm_mncc { - /* context based information */ - uint32_t msg_type; - uint32_t callref; - - /* which fields are present */ - uint32_t fields; - - /* data derived informations (MNCC_F_ based) */ - struct gsm_mncc_bearer_cap bearer_cap; - struct gsm_mncc_number called; - struct gsm_mncc_number calling; - struct gsm_mncc_number redirecting; - struct gsm_mncc_number connected; - struct gsm_mncc_cause cause; - struct gsm_mncc_progress progress; - struct gsm_mncc_useruser useruser; - struct gsm_mncc_facility facility; - struct gsm_mncc_cccap cccap; - struct gsm_mncc_ssversion ssversion; - struct { - int sup; - int inv; - } clir; - int signal; - - /* data derived information, not MNCC_F based */ - int keypad; - int more; - int notify; /* 0..127 */ - int emergency; - char imsi[16]; - - unsigned char lchan_type; - unsigned char lchan_mode; -}; - -struct gsm_data_frame { - uint32_t msg_type; - uint32_t callref; - unsigned char data[0]; -}; - -#define MNCC_SOCK_VERSION 5 -struct gsm_mncc_hello { - uint32_t msg_type; - uint32_t version; - - /* send the sizes of the structs */ - uint32_t mncc_size; - uint32_t data_frame_size; - - /* send some offsets */ - uint32_t called_offset; - uint32_t signal_offset; - uint32_t emergency_offset; - uint32_t lchan_type_offset; -}; - -struct gsm_mncc_rtp { - uint32_t msg_type; - uint32_t callref; - uint32_t ip; - uint16_t port; - uint32_t payload_type; - uint32_t payload_msg_type; -}; - -struct gsm_mncc_bridge { - uint32_t msg_type; - uint32_t callref[2]; -}; - -/* FIXME FIXME FIXME FIXME FIXME END */ - const struct value_string osmo_mncc_names[] = { { MNCC_SETUP_REQ, "MNCC_SETUP_REQ" }, { MNCC_SETUP_IND, "MNCC_SETUP_IND" }, -- To view, visit https://gerrit.osmocom.org/11185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I62bc025369bd9ee9b134e064a8364aa4bd5de16e Gerrit-Change-Number: 11185 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 22:55:04 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 1 Oct 2018 22:55:04 +0000 Subject: Change in libosmocore[master]: mncc: Move definitions to header file In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/11185 ) Change subject: mncc: Move definitions to header file ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11185/1/src/gsm/mncc.c File src/gsm/mncc.c: https://gerrit.osmocom.org/#/c/11185/1/src/gsm/mncc.c at a37 PS1, Line 37: Fixing this FIXME FIXME obviously breaks osmo-sip-connector until the duplicated defs are removed from mncc_protocol.h in that project. I don't know if it will break anything else. Just thought it'd be nice to remove this code duplication sooner rather than later. -- To view, visit https://gerrit.osmocom.org/11185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62bc025369bd9ee9b134e064a8364aa4bd5de16e Gerrit-Change-Number: 11185 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Mon, 01 Oct 2018 22:55:04 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Oct 1 23:20:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 1 Oct 2018 23:20:20 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts_?= =?UTF-8?Q?=C2=BB_sysmo,master,default,osmocom-master-debian9_#1238?= In-Reply-To: <1070953601.433.1538403863204.JavaMail.jenkins@jenkins.osmocom.org> References: <1070953601.433.1538403863204.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1342430825.435.1538436020612.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Oct 1 23:52:07 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 1 Oct 2018 23:52:07 +0000 Subject: Change in libosmocore[master]: mncc: Move definitions to header file In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/11185 ) Change subject: mncc: Move definitions to header file ...................................................................... Patch Set 1: > (1 comment) I see now that these defs are also duplicated in other projects. -- To view, visit https://gerrit.osmocom.org/11185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62bc025369bd9ee9b134e064a8364aa4bd5de16e Gerrit-Change-Number: 11185 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Mon, 01 Oct 2018 23:52:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 1 23:57:25 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 1 Oct 2018 23:57:25 +0000 Subject: Change in libosmocore[master]: mncc: Move definitions to header file In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11185 to look at the new patch set (#2). Change subject: mncc: Move definitions to header file ...................................................................... mncc: Move definitions to header file This commit moves various gsm_mncc_* structs and the MNCC_* defines from .c file to the header. This paves the way to remove this duplicated code from the osmo-sip-connector. Change-Id: I62bc025369bd9ee9b134e064a8364aa4bd5de16e --- M include/osmocom/gsm/mncc.h M src/gsm/mncc.c 2 files changed, 163 insertions(+), 153 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/11185/2 -- To view, visit https://gerrit.osmocom.org/11185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I62bc025369bd9ee9b134e064a8364aa4bd5de16e Gerrit-Change-Number: 11185 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 00:03:59 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 2 Oct 2018 00:03:59 +0000 Subject: Change in osmo-msc[master]: Moving mncc related declarations to libosmocore Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/11186 Change subject: Moving mncc related declarations to libosmocore ...................................................................... Moving mncc related declarations to libosmocore Removes gsm_mncc_* structs that are moved to libosmocore in gerrit #11185 Change-Id: I3aa0946e9f21c00a5148ecacfd9275a5c6a923f3 Related: I62bc025369bd9ee9b134e064a8364aa4bd5de16e --- M include/osmocom/msc/mncc.h 1 file changed, 0 insertions(+), 164 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/86/11186/1 diff --git a/include/osmocom/msc/mncc.h b/include/osmocom/msc/mncc.h index d2f0541..ba95bbd 100644 --- a/include/osmocom/msc/mncc.h +++ b/include/osmocom/msc/mncc.h @@ -32,170 +32,6 @@ struct gsm_network; struct msgb; - -/* One end of a call */ -struct gsm_call { - struct llist_head entry; - - /* network handle */ - void *net; - - /* the 'local' transaction */ - uint32_t callref; - /* the 'remote' transaction */ - uint32_t remote_ref; -}; - -#define MNCC_SETUP_REQ 0x0101 -#define MNCC_SETUP_IND 0x0102 -#define MNCC_SETUP_RSP 0x0103 -#define MNCC_SETUP_CNF 0x0104 -#define MNCC_SETUP_COMPL_REQ 0x0105 -#define MNCC_SETUP_COMPL_IND 0x0106 -/* MNCC_REJ_* is perfomed via MNCC_REL_* */ -#define MNCC_CALL_CONF_IND 0x0107 -#define MNCC_CALL_PROC_REQ 0x0108 -#define MNCC_PROGRESS_REQ 0x0109 -#define MNCC_ALERT_REQ 0x010a -#define MNCC_ALERT_IND 0x010b -#define MNCC_NOTIFY_REQ 0x010c -#define MNCC_NOTIFY_IND 0x010d -#define MNCC_DISC_REQ 0x010e -#define MNCC_DISC_IND 0x010f -#define MNCC_REL_REQ 0x0110 -#define MNCC_REL_IND 0x0111 -#define MNCC_REL_CNF 0x0112 -#define MNCC_FACILITY_REQ 0x0113 -#define MNCC_FACILITY_IND 0x0114 -#define MNCC_START_DTMF_IND 0x0115 -#define MNCC_START_DTMF_RSP 0x0116 -#define MNCC_START_DTMF_REJ 0x0117 -#define MNCC_STOP_DTMF_IND 0x0118 -#define MNCC_STOP_DTMF_RSP 0x0119 -#define MNCC_MODIFY_REQ 0x011a -#define MNCC_MODIFY_IND 0x011b -#define MNCC_MODIFY_RSP 0x011c -#define MNCC_MODIFY_CNF 0x011d -#define MNCC_MODIFY_REJ 0x011e -#define MNCC_HOLD_IND 0x011f -#define MNCC_HOLD_CNF 0x0120 -#define MNCC_HOLD_REJ 0x0121 -#define MNCC_RETRIEVE_IND 0x0122 -#define MNCC_RETRIEVE_CNF 0x0123 -#define MNCC_RETRIEVE_REJ 0x0124 -#define MNCC_USERINFO_REQ 0x0125 -#define MNCC_USERINFO_IND 0x0126 -#define MNCC_REJ_REQ 0x0127 -#define MNCC_REJ_IND 0x0128 - -#define MNCC_BRIDGE 0x0200 -#define MNCC_FRAME_RECV 0x0201 -#define MNCC_FRAME_DROP 0x0202 -#define MNCC_LCHAN_MODIFY 0x0203 -#define MNCC_RTP_CREATE 0x0204 -#define MNCC_RTP_CONNECT 0x0205 -#define MNCC_RTP_FREE 0x0206 - -#define GSM_TCHF_FRAME 0x0300 -#define GSM_TCHF_FRAME_EFR 0x0301 -#define GSM_TCHH_FRAME 0x0302 -#define GSM_TCH_FRAME_AMR 0x0303 -#define GSM_BAD_FRAME 0x03ff - -#define MNCC_SOCKET_HELLO 0x0400 - -#define GSM_MAX_FACILITY 128 -#define GSM_MAX_SSVERSION 128 -#define GSM_MAX_USERUSER 128 - -#define MNCC_F_BEARER_CAP 0x0001 -#define MNCC_F_CALLED 0x0002 -#define MNCC_F_CALLING 0x0004 -#define MNCC_F_REDIRECTING 0x0008 -#define MNCC_F_CONNECTED 0x0010 -#define MNCC_F_CAUSE 0x0020 -#define MNCC_F_USERUSER 0x0040 -#define MNCC_F_PROGRESS 0x0080 -#define MNCC_F_EMERGENCY 0x0100 -#define MNCC_F_FACILITY 0x0200 -#define MNCC_F_SSVERSION 0x0400 -#define MNCC_F_CCCAP 0x0800 -#define MNCC_F_KEYPAD 0x1000 -#define MNCC_F_SIGNAL 0x2000 - -struct gsm_mncc { - /* context based information */ - uint32_t msg_type; - uint32_t callref; - - /* which fields are present */ - uint32_t fields; - - /* data derived informations (MNCC_F_ based) */ - struct gsm_mncc_bearer_cap bearer_cap; - struct gsm_mncc_number called; - struct gsm_mncc_number calling; - struct gsm_mncc_number redirecting; - struct gsm_mncc_number connected; - struct gsm_mncc_cause cause; - struct gsm_mncc_progress progress; - struct gsm_mncc_useruser useruser; - struct gsm_mncc_facility facility; - struct gsm_mncc_cccap cccap; - struct gsm_mncc_ssversion ssversion; - struct { - int sup; - int inv; - } clir; - int signal; - - /* data derived information, not MNCC_F based */ - int keypad; - int more; - int notify; /* 0..127 */ - int emergency; - char imsi[16]; - - unsigned char lchan_type; - unsigned char lchan_mode; -}; - -struct gsm_data_frame { - uint32_t msg_type; - uint32_t callref; - unsigned char data[0]; -}; - -#define MNCC_SOCK_VERSION 5 -struct gsm_mncc_hello { - uint32_t msg_type; - uint32_t version; - - /* send the sizes of the structs */ - uint32_t mncc_size; - uint32_t data_frame_size; - - /* send some offsets */ - uint32_t called_offset; - uint32_t signal_offset; - uint32_t emergency_offset; - uint32_t lchan_type_offset; -}; - -struct gsm_mncc_rtp { - uint32_t msg_type; - uint32_t callref; - uint32_t ip; - uint16_t port; - uint32_t payload_type; - uint32_t payload_msg_type; -}; - -struct gsm_mncc_bridge { - uint32_t msg_type; - uint32_t callref[2]; -}; - const char *get_mncc_name(int value); void mncc_set_cause(struct gsm_mncc *data, int loc, int val); void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg); -- To view, visit https://gerrit.osmocom.org/11186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3aa0946e9f21c00a5148ecacfd9275a5c6a923f3 Gerrit-Change-Number: 11186 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 00:07:40 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 2 Oct 2018 00:07:40 +0000 Subject: Change in osmo-msc[master]: Moving mncc related declarations to libosmocore In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11186 to look at the new patch set (#2). Change subject: Moving mncc related declarations to libosmocore ...................................................................... Moving mncc related declarations to libosmocore Removes gsm_mncc_* structs that are moved to libosmocore in gerrit #11185 Depends-On: I62bc025369bd9ee9b134e064a8364aa4bd5de16e Change-Id: I3aa0946e9f21c00a5148ecacfd9275a5c6a923f3 --- M include/osmocom/msc/mncc.h 1 file changed, 0 insertions(+), 164 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/86/11186/2 -- To view, visit https://gerrit.osmocom.org/11186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3aa0946e9f21c00a5148ecacfd9275a5c6a923f3 Gerrit-Change-Number: 11186 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 00:08:58 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 2 Oct 2018 00:08:58 +0000 Subject: Change in osmo-msc[master]: Moving mncc related declarations to libosmocore In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/11186 ) Change subject: Moving mncc related declarations to libosmocore ...................................................................... Patch Set 2: Code-Review-1 > Build Failed > I'm still not sure how to submit inter-repo dependent changes. -- To view, visit https://gerrit.osmocom.org/11186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3aa0946e9f21c00a5148ecacfd9275a5c6a923f3 Gerrit-Change-Number: 11186 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Tue, 02 Oct 2018 00:08:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 00:10:53 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 2 Oct 2018 00:10:53 +0000 Subject: Change in libosmocore[master]: mncc: Move definitions to header file In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11185 to look at the new patch set (#3). Change subject: mncc: Move definitions to header file ...................................................................... mncc: Move definitions to header file This commit moves various gsm_mncc_* structs and the MNCC_* defines from .c file to the header. This paves the way to remove this duplicated code from other projects. Change-Id: I62bc025369bd9ee9b134e064a8364aa4bd5de16e --- M include/osmocom/gsm/mncc.h M src/gsm/mncc.c 2 files changed, 163 insertions(+), 153 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/11185/3 -- To view, visit https://gerrit.osmocom.org/11185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I62bc025369bd9ee9b134e064a8364aa4bd5de16e Gerrit-Change-Number: 11185 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 00:15:04 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 2 Oct 2018 00:15:04 +0000 Subject: Change in osmo-sip-connector[master]: Moving mncc related declarations to libosmocore Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/11187 Change subject: Moving mncc related declarations to libosmocore ...................................................................... Moving mncc related declarations to libosmocore Removes gsm_mncc_* structs that are moved to libosmocore in gerrit #11185 Depends-On: I62bc025369bd9ee9b134e064a8364aa4bd5de16e Change-Id: I1230a524a59bec45cd36a73e73dcd9c9edf89225 --- M src/mncc_protocol.h 1 file changed, 0 insertions(+), 164 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/87/11187/1 diff --git a/src/mncc_protocol.h b/src/mncc_protocol.h index 4950a77..fe47773 100644 --- a/src/mncc_protocol.h +++ b/src/mncc_protocol.h @@ -32,170 +32,6 @@ struct gsm_network; struct msgb; - -/* One end of a call */ -struct gsm_call { - struct llist_head entry; - - /* network handle */ - void *net; - - /* the 'local' transaction */ - uint32_t callref; - /* the 'remote' transaction */ - uint32_t remote_ref; -}; - -#define MNCC_SETUP_REQ 0x0101 -#define MNCC_SETUP_IND 0x0102 -#define MNCC_SETUP_RSP 0x0103 -#define MNCC_SETUP_CNF 0x0104 -#define MNCC_SETUP_COMPL_REQ 0x0105 -#define MNCC_SETUP_COMPL_IND 0x0106 -/* MNCC_REJ_* is perfomed via MNCC_REL_* */ -#define MNCC_CALL_CONF_IND 0x0107 -#define MNCC_CALL_PROC_REQ 0x0108 -#define MNCC_PROGRESS_REQ 0x0109 -#define MNCC_ALERT_REQ 0x010a -#define MNCC_ALERT_IND 0x010b -#define MNCC_NOTIFY_REQ 0x010c -#define MNCC_NOTIFY_IND 0x010d -#define MNCC_DISC_REQ 0x010e -#define MNCC_DISC_IND 0x010f -#define MNCC_REL_REQ 0x0110 -#define MNCC_REL_IND 0x0111 -#define MNCC_REL_CNF 0x0112 -#define MNCC_FACILITY_REQ 0x0113 -#define MNCC_FACILITY_IND 0x0114 -#define MNCC_START_DTMF_IND 0x0115 -#define MNCC_START_DTMF_RSP 0x0116 -#define MNCC_START_DTMF_REJ 0x0117 -#define MNCC_STOP_DTMF_IND 0x0118 -#define MNCC_STOP_DTMF_RSP 0x0119 -#define MNCC_MODIFY_REQ 0x011a -#define MNCC_MODIFY_IND 0x011b -#define MNCC_MODIFY_RSP 0x011c -#define MNCC_MODIFY_CNF 0x011d -#define MNCC_MODIFY_REJ 0x011e -#define MNCC_HOLD_IND 0x011f -#define MNCC_HOLD_CNF 0x0120 -#define MNCC_HOLD_REJ 0x0121 -#define MNCC_RETRIEVE_IND 0x0122 -#define MNCC_RETRIEVE_CNF 0x0123 -#define MNCC_RETRIEVE_REJ 0x0124 -#define MNCC_USERINFO_REQ 0x0125 -#define MNCC_USERINFO_IND 0x0126 -#define MNCC_REJ_REQ 0x0127 -#define MNCC_REJ_IND 0x0128 - -#define MNCC_BRIDGE 0x0200 -#define MNCC_FRAME_RECV 0x0201 -#define MNCC_FRAME_DROP 0x0202 -#define MNCC_LCHAN_MODIFY 0x0203 -#define MNCC_RTP_CREATE 0x0204 -#define MNCC_RTP_CONNECT 0x0205 -#define MNCC_RTP_FREE 0x0206 - -#define GSM_TCHF_FRAME 0x0300 -#define GSM_TCHF_FRAME_EFR 0x0301 -#define GSM_TCHH_FRAME 0x0302 -#define GSM_TCH_FRAME_AMR 0x0303 -#define GSM_BAD_FRAME 0x03ff - -#define MNCC_SOCKET_HELLO 0x0400 - -#define GSM_MAX_FACILITY 128 -#define GSM_MAX_SSVERSION 128 -#define GSM_MAX_USERUSER 128 - -#define MNCC_F_BEARER_CAP 0x0001 -#define MNCC_F_CALLED 0x0002 -#define MNCC_F_CALLING 0x0004 -#define MNCC_F_REDIRECTING 0x0008 -#define MNCC_F_CONNECTED 0x0010 -#define MNCC_F_CAUSE 0x0020 -#define MNCC_F_USERUSER 0x0040 -#define MNCC_F_PROGRESS 0x0080 -#define MNCC_F_EMERGENCY 0x0100 -#define MNCC_F_FACILITY 0x0200 -#define MNCC_F_SSVERSION 0x0400 -#define MNCC_F_CCCAP 0x0800 -#define MNCC_F_KEYPAD 0x1000 -#define MNCC_F_SIGNAL 0x2000 - -struct gsm_mncc { - /* context based information */ - uint32_t msg_type; - uint32_t callref; - - /* which fields are present */ - uint32_t fields; - - /* data derived informations (MNCC_F_ based) */ - struct gsm_mncc_bearer_cap bearer_cap; - struct gsm_mncc_number called; - struct gsm_mncc_number calling; - struct gsm_mncc_number redirecting; - struct gsm_mncc_number connected; - struct gsm_mncc_cause cause; - struct gsm_mncc_progress progress; - struct gsm_mncc_useruser useruser; - struct gsm_mncc_facility facility; - struct gsm_mncc_cccap cccap; - struct gsm_mncc_ssversion ssversion; - struct { - int sup; - int inv; - } clir; - int signal; - - /* data derived information, not MNCC_F based */ - int keypad; - int more; - int notify; /* 0..127 */ - int emergency; - char imsi[16]; - - unsigned char lchan_type; - unsigned char lchan_mode; -}; - -struct gsm_data_frame { - uint32_t msg_type; - uint32_t callref; - unsigned char data[0]; -}; - -#define MNCC_SOCK_VERSION 5 -struct gsm_mncc_hello { - uint32_t msg_type; - uint32_t version; - - /* send the sizes of the structs */ - uint32_t mncc_size; - uint32_t data_frame_size; - - /* send some offsets */ - uint32_t called_offset; - uint32_t signal_offset; - uint32_t emergency_offset; - uint32_t lchan_type_offset; -}; - -struct gsm_mncc_rtp { - uint32_t msg_type; - uint32_t callref; - uint32_t ip; - uint16_t port; - uint32_t payload_type; - uint32_t payload_msg_type; -}; - -struct gsm_mncc_bridge { - uint32_t msg_type; - uint32_t callref[2]; -}; - void mncc_set_cause(struct gsm_mncc *data, int loc, int val); void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg); -- To view, visit https://gerrit.osmocom.org/11187 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1230a524a59bec45cd36a73e73dcd9c9edf89225 Gerrit-Change-Number: 11187 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 00:27:49 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 2 Oct 2018 00:27:49 +0000 Subject: Change in openbsc[master]: Moving mncc related declarations to libosmocore Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/11188 Change subject: Moving mncc related declarations to libosmocore ...................................................................... Moving mncc related declarations to libosmocore Removes gsm_mncc_* structs that are moved to libosmocore in gerrit #11185 Depends-On: I62bc025369bd9ee9b134e064a8364aa4bd5de16e Change-Id: I38b7141a26d57c076f58f241cbc25c5ed2d77940 --- M openbsc/include/openbsc/mncc.h 1 file changed, 0 insertions(+), 164 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/88/11188/1 diff --git a/openbsc/include/openbsc/mncc.h b/openbsc/include/openbsc/mncc.h index 49f0c8b..dec2366 100644 --- a/openbsc/include/openbsc/mncc.h +++ b/openbsc/include/openbsc/mncc.h @@ -32,170 +32,6 @@ struct gsm_network; struct msgb; - -/* One end of a call */ -struct gsm_call { - struct llist_head entry; - - /* network handle */ - void *net; - - /* the 'local' transaction */ - uint32_t callref; - /* the 'remote' transaction */ - uint32_t remote_ref; -}; - -#define MNCC_SETUP_REQ 0x0101 -#define MNCC_SETUP_IND 0x0102 -#define MNCC_SETUP_RSP 0x0103 -#define MNCC_SETUP_CNF 0x0104 -#define MNCC_SETUP_COMPL_REQ 0x0105 -#define MNCC_SETUP_COMPL_IND 0x0106 -/* MNCC_REJ_* is perfomed via MNCC_REL_* */ -#define MNCC_CALL_CONF_IND 0x0107 -#define MNCC_CALL_PROC_REQ 0x0108 -#define MNCC_PROGRESS_REQ 0x0109 -#define MNCC_ALERT_REQ 0x010a -#define MNCC_ALERT_IND 0x010b -#define MNCC_NOTIFY_REQ 0x010c -#define MNCC_NOTIFY_IND 0x010d -#define MNCC_DISC_REQ 0x010e -#define MNCC_DISC_IND 0x010f -#define MNCC_REL_REQ 0x0110 -#define MNCC_REL_IND 0x0111 -#define MNCC_REL_CNF 0x0112 -#define MNCC_FACILITY_REQ 0x0113 -#define MNCC_FACILITY_IND 0x0114 -#define MNCC_START_DTMF_IND 0x0115 -#define MNCC_START_DTMF_RSP 0x0116 -#define MNCC_START_DTMF_REJ 0x0117 -#define MNCC_STOP_DTMF_IND 0x0118 -#define MNCC_STOP_DTMF_RSP 0x0119 -#define MNCC_MODIFY_REQ 0x011a -#define MNCC_MODIFY_IND 0x011b -#define MNCC_MODIFY_RSP 0x011c -#define MNCC_MODIFY_CNF 0x011d -#define MNCC_MODIFY_REJ 0x011e -#define MNCC_HOLD_IND 0x011f -#define MNCC_HOLD_CNF 0x0120 -#define MNCC_HOLD_REJ 0x0121 -#define MNCC_RETRIEVE_IND 0x0122 -#define MNCC_RETRIEVE_CNF 0x0123 -#define MNCC_RETRIEVE_REJ 0x0124 -#define MNCC_USERINFO_REQ 0x0125 -#define MNCC_USERINFO_IND 0x0126 -#define MNCC_REJ_REQ 0x0127 -#define MNCC_REJ_IND 0x0128 - -#define MNCC_BRIDGE 0x0200 -#define MNCC_FRAME_RECV 0x0201 -#define MNCC_FRAME_DROP 0x0202 -#define MNCC_LCHAN_MODIFY 0x0203 -#define MNCC_RTP_CREATE 0x0204 -#define MNCC_RTP_CONNECT 0x0205 -#define MNCC_RTP_FREE 0x0206 - -#define GSM_TCHF_FRAME 0x0300 -#define GSM_TCHF_FRAME_EFR 0x0301 -#define GSM_TCHH_FRAME 0x0302 -#define GSM_TCH_FRAME_AMR 0x0303 -#define GSM_BAD_FRAME 0x03ff - -#define MNCC_SOCKET_HELLO 0x0400 - -#define GSM_MAX_FACILITY 128 -#define GSM_MAX_SSVERSION 128 -#define GSM_MAX_USERUSER 128 - -#define MNCC_F_BEARER_CAP 0x0001 -#define MNCC_F_CALLED 0x0002 -#define MNCC_F_CALLING 0x0004 -#define MNCC_F_REDIRECTING 0x0008 -#define MNCC_F_CONNECTED 0x0010 -#define MNCC_F_CAUSE 0x0020 -#define MNCC_F_USERUSER 0x0040 -#define MNCC_F_PROGRESS 0x0080 -#define MNCC_F_EMERGENCY 0x0100 -#define MNCC_F_FACILITY 0x0200 -#define MNCC_F_SSVERSION 0x0400 -#define MNCC_F_CCCAP 0x0800 -#define MNCC_F_KEYPAD 0x1000 -#define MNCC_F_SIGNAL 0x2000 - -struct gsm_mncc { - /* context based information */ - uint32_t msg_type; - uint32_t callref; - - /* which fields are present */ - uint32_t fields; - - /* data derived informations (MNCC_F_ based) */ - struct gsm_mncc_bearer_cap bearer_cap; - struct gsm_mncc_number called; - struct gsm_mncc_number calling; - struct gsm_mncc_number redirecting; - struct gsm_mncc_number connected; - struct gsm_mncc_cause cause; - struct gsm_mncc_progress progress; - struct gsm_mncc_useruser useruser; - struct gsm_mncc_facility facility; - struct gsm_mncc_cccap cccap; - struct gsm_mncc_ssversion ssversion; - struct { - int sup; - int inv; - } clir; - int signal; - - /* data derived information, not MNCC_F based */ - int keypad; - int more; - int notify; /* 0..127 */ - int emergency; - char imsi[16]; - - unsigned char lchan_type; - unsigned char lchan_mode; -}; - -struct gsm_data_frame { - uint32_t msg_type; - uint32_t callref; - unsigned char data[0]; -}; - -#define MNCC_SOCK_VERSION 5 -struct gsm_mncc_hello { - uint32_t msg_type; - uint32_t version; - - /* send the sizes of the structs */ - uint32_t mncc_size; - uint32_t data_frame_size; - - /* send some offsets */ - uint32_t called_offset; - uint32_t signal_offset; - uint32_t emergency_offset; - uint32_t lchan_type_offset; -}; - -struct gsm_mncc_rtp { - uint32_t msg_type; - uint32_t callref; - uint32_t ip; - uint16_t port; - uint32_t payload_type; - uint32_t payload_msg_type; -}; - -struct gsm_mncc_bridge { - uint32_t msg_type; - uint32_t callref[2]; -}; - const char *get_mncc_name(int value); void mncc_set_cause(struct gsm_mncc *data, int loc, int val); void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg); -- To view, visit https://gerrit.osmocom.org/11188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I38b7141a26d57c076f58f241cbc25c5ed2d77940 Gerrit-Change-Number: 11188 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 07:36:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 2 Oct 2018 07:36:50 +0000 Subject: Change in osmo-trx[master]: CommonLibs/Makefile.am: Specify libcommon_la_LIBADD Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11189 Change subject: CommonLibs/Makefile.am: Specify libcommon_la_LIBADD ...................................................................... CommonLibs/Makefile.am: Specify libcommon_la_LIBADD This way the dependencies are passed after the .la object, which seems to be the correct order. Some setups may fail to find some symbols from libosmocore otherwise (OBS i586). Change-Id: I22c80055bcffd4179a0a8ca76533ba7aaa38c859 --- M CommonLibs/Makefile.am 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/89/11189/1 diff --git a/CommonLibs/Makefile.am b/CommonLibs/Makefile.am index 3173397..9fabcf1 100644 --- a/CommonLibs/Makefile.am +++ b/CommonLibs/Makefile.am @@ -36,6 +36,7 @@ Logger.cpp \ trx_vty.c \ debug.c +libcommon_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS) noinst_HEADERS = \ BitVector.h \ -- To view, visit https://gerrit.osmocom.org/11189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I22c80055bcffd4179a0a8ca76533ba7aaa38c859 Gerrit-Change-Number: 11189 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 08:16:57 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 2 Oct 2018 08:16:57 +0000 Subject: Change in libosmocore[master]: mncc: Move definitions to header file In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11185 ) Change subject: mncc: Move definitions to header file ...................................................................... Patch Set 3: Your change definitely makes sense! The only thing I would do here is to prefix all exposed symbols with "osmo_". -- To view, visit https://gerrit.osmocom.org/11185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62bc025369bd9ee9b134e064a8364aa4bd5de16e Gerrit-Change-Number: 11185 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 02 Oct 2018 08:16:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 08:19:07 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 2 Oct 2018 08:19:07 +0000 Subject: Change in libosmocore[master]: mncc: Move definitions to header file In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11185 ) Change subject: mncc: Move definitions to header file ...................................................................... Patch Set 3: I would also update the OsmocomBB's MNCC implementation too. -- To view, visit https://gerrit.osmocom.org/11185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62bc025369bd9ee9b134e064a8364aa4bd5de16e Gerrit-Change-Number: 11185 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 02 Oct 2018 08:19:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 08:45:11 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 2 Oct 2018 08:45:11 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix: prevent division by zero In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11157 ) Change subject: trxcon/scheduler: fix: prevent division by zero ...................................................................... Patch Set 1: Good point, thanks! Let's mark it as WIP for now. -- To view, visit https://gerrit.osmocom.org/11157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id4659de899411ec1ba1718fdcb40aec562dbfd65 Gerrit-Change-Number: 11157 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 02 Oct 2018 08:45:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 10:18:15 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 2 Oct 2018 10:18:15 +0000 Subject: Change in libosmocore[master]: mncc: Move definitions to header file In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/11185 ) Change subject: mncc: Move definitions to header file ...................................................................... Patch Set 3: > Your change definitely makes sense! > > The only thing I would do here is to prefix all exposed symbols > with "osmo_". Oh! well I guess that explains why nobody did this yet then. That's too much of a workload for me at this time. -- To view, visit https://gerrit.osmocom.org/11185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62bc025369bd9ee9b134e064a8364aa4bd5de16e Gerrit-Change-Number: 11185 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 02 Oct 2018 10:18:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 10:22:01 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 2 Oct 2018 10:22:01 +0000 Subject: Change in libosmocore[master]: mncc: Move definitions to header file In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/11185 ) Change subject: mncc: Move definitions to header file ...................................................................... Patch Set 3: but wait.. are you sure about that? so we've lived with gsm_mncc_bearer_cap for some time, for example. But you're saying that gsm_mncc must become osmo_gsm_mncc now? If one /were/ to do that work, you'ld also suggest that gsm_mncc_bearer_cap should become osmo_gsm_mncc_bearer_cap ? -- To view, visit https://gerrit.osmocom.org/11185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62bc025369bd9ee9b134e064a8364aa4bd5de16e Gerrit-Change-Number: 11185 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 02 Oct 2018 10:22:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 10:26:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 2 Oct 2018 10:26:00 +0000 Subject: Change in osmo-trx[master]: CommonLibs/Makefile.am: Specify libcommon_la_LIBADD In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11189 ) Change subject: CommonLibs/Makefile.am: Specify libcommon_la_LIBADD ...................................................................... Patch Set 1: Code-Review+2 I have been confirmed this patch also fixed build in openSUSE, merging. -- To view, visit https://gerrit.osmocom.org/11189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I22c80055bcffd4179a0a8ca76533ba7aaa38c859 Gerrit-Change-Number: 11189 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 02 Oct 2018 10:26:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 10:26:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 2 Oct 2018 10:26:02 +0000 Subject: Change in osmo-trx[master]: CommonLibs/Makefile.am: Specify libcommon_la_LIBADD In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11189 ) Change subject: CommonLibs/Makefile.am: Specify libcommon_la_LIBADD ...................................................................... CommonLibs/Makefile.am: Specify libcommon_la_LIBADD This way the dependencies are passed after the .la object, which seems to be the correct order. Some setups may fail to find some symbols from libosmocore otherwise (OBS i586). Change-Id: I22c80055bcffd4179a0a8ca76533ba7aaa38c859 --- M CommonLibs/Makefile.am 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/CommonLibs/Makefile.am b/CommonLibs/Makefile.am index 3173397..9fabcf1 100644 --- a/CommonLibs/Makefile.am +++ b/CommonLibs/Makefile.am @@ -36,6 +36,7 @@ Logger.cpp \ trx_vty.c \ debug.c +libcommon_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS) noinst_HEADERS = \ BitVector.h \ -- To view, visit https://gerrit.osmocom.org/11189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I22c80055bcffd4179a0a8ca76533ba7aaa38c859 Gerrit-Change-Number: 11189 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 11:15:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 2 Oct 2018 11:15:26 +0000 Subject: Change in osmo-gsm-tester[master]: osmotrx: Allow running osmo-trx from remote host Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11191 Change subject: osmotrx: Allow running osmo-trx from remote host ...................................................................... osmotrx: Allow running osmo-trx from remote host Change-Id: Ia31ac8eb41e02eda28d9f6f56774679300244ee8 --- M example/resources.conf.rnd M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/resource.py 3 files changed, 31 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/91/11191/1 diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd index 74b8e3e..2067efc 100644 --- a/example/resources.conf.rnd +++ b/example/resources.conf.rnd @@ -28,6 +28,8 @@ type: uhd launch_trx: true clock_reference: external + remote_user: jenkins + trx_ip: 127.0.0.1 ciphers: [a5_0, a5_1] - label: NanoBTS-ONW-1900 diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index e7e3542..3ed596a 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -141,6 +141,7 @@ class OsmoTrx(log.Origin, metaclass=ABCMeta): CONF_OSMO_TRX = 'osmo-trx.cfg' + REMOTE_DIR = '/osmo-gsm-tester-trx/last_run' ############## # PROTECTED @@ -150,8 +151,10 @@ self.suite_run = suite_run self.conf = conf self.env = {} - self.listen_ip = conf.get('trx_ip') - self.bts_ip = conf.get('bts_ip') + self.log("OSMOTRX CONF: %r" % conf) + self.listen_ip = conf.get('osmo_trx', {}).get('trx_ip') + self.bts_ip = conf.get('osmo_trx', {}).get('bts_ip') + self.remote_user = conf.get('osmo_trx', {}).get('remote_user', None) self.run_dir = None self.inst = None self.proc_trx = None @@ -184,7 +187,7 @@ self.dbg(r) f.write(r) - def launch_process(self, keepalive, binary_name, *args): + def launch_process_local(self, keepalive, binary_name, *args): binary = os.path.abspath(self.inst.child('bin', binary_name)) run_dir = self.run_dir.new_dir(binary_name) if not os.path.isfile(binary): @@ -196,6 +199,14 @@ proc.launch() return proc + def launch_process_remote(self, name, popen_args, remote_cwd=None, keepalive=False): + run_dir = self.run_dir.new_dir(name) + proc = process.RemoteProcess(name, run_dir, self.remote_user, self.listen_ip, remote_cwd, + popen_args) + self.suite_run.remember_to_stop(proc, keepalive) + proc.launch() + return proc + ############## # PUBLIC (test API included) ############## @@ -203,10 +214,21 @@ self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) self.configure() self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-trx'))) - lib = self.inst.child('lib') - self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } - self.proc_trx = self.launch_process(keepalive, self.binary_name(), + if not self.remote_user: + # Run locally if ssh user is not set + lib = self.inst.child('lib') + self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } + self.proc_trx = self.launch_process_local(keepalive, self.binary_name(), '-C', os.path.abspath(self.config_file)) + else: + remote_run_dir = util.Dir(OsmoTrx.REMOTE_DIR) + self.remote_inst = process.copy_inst_ssh(self.run_dir, self.inst, remote_run_dir, self.remote_user, + self.listen_ip, self.binary_name(), self.config_file) + remote_config_file = remote_run_dir.child(OsmoTrx.CONF_OSMO_TRX) + remote_lib = self.remote_inst.child('lib') + remote_binary = self.remote_inst.child('bin', self.binary_name()) + args = ('LD_LIBRARY_PATH=%s' % remote_lib, remote_binary, '-C', remote_config_file) + self.proc_trx = self.launch_process_remote(self.binary_name(), args, remote_cwd=remote_run_dir, keepalive=keepalive) def trx_ready(self): if not self.proc_trx or not self.proc_trx.is_running: diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index e043d87..3f2ddc7 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -72,6 +72,7 @@ 'bts[].osmo_trx.type': schema.STR, 'bts[].osmo_trx.clock_reference': schema.OSMO_TRX_CLOCK_REF, 'bts[].osmo_trx.trx_ip': schema.IPV4, + 'bts[].osmo_trx.remote_user': schema.STR, 'bts[].osmo_trx.multi_arfcn': schema.BOOL_STR, 'arfcn[].arfcn': schema.INT, 'arfcn[].band': schema.BAND, -- To view, visit https://gerrit.osmocom.org/11191 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia31ac8eb41e02eda28d9f6f56774679300244ee8 Gerrit-Change-Number: 11191 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 11:15:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 2 Oct 2018 11:15:25 +0000 Subject: Change in osmo-gsm-tester[master]: Make code copying inst through ssh generic Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11190 Change subject: Make code copying inst through ssh generic ...................................................................... Make code copying inst through ssh generic It can later on be used by other classes that need to run binaries in inst remotely. Change-Id: I838b999528695207e1147cfe76e6f7aaf3b1dd53 --- M src/osmo_gsm_tester/bts_sysmo.py M src/osmo_gsm_tester/process.py 2 files changed, 46 insertions(+), 38 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/90/11190/1 diff --git a/src/osmo_gsm_tester/bts_sysmo.py b/src/osmo_gsm_tester/bts_sysmo.py index e3f4823..bdf6bb7 100644 --- a/src/osmo_gsm_tester/bts_sysmo.py +++ b/src/osmo_gsm_tester/bts_sysmo.py @@ -41,34 +41,14 @@ def _direct_pcu_enabled(self): return util.str2bool(self.conf.get('direct_pcu')) - def _process_remote(self, name, popen_args, remote_cwd=None): - run_dir = self.run_dir.new_dir(name) - return process.RemoteProcess(name, run_dir, self.remote_user, self.remote_addr(), remote_cwd, - popen_args) - - def run_remote(self, name, popen_args, remote_cwd=None): - proc = self._process_remote(name, popen_args, remote_cwd) - proc.launch() - proc.wait() - if proc.result != 0: - log.ctx(proc) - raise log.Error('Exited in error') - def launch_remote(self, name, popen_args, remote_cwd=None, keepalive=False): - proc = self._process_remote(name, popen_args, remote_cwd) + run_dir = self.run_dir.new_dir(name) + proc = process.RemoteProcess(name, run_dir, self.remote_user, self.remote_addr(), remote_cwd, + popen_args) self.suite_run.remember_to_stop(proc, keepalive) proc.launch() return proc - def run_local(self, name, popen_args): - run_dir = self.run_dir.new_dir(name) - proc = process.Process(name, run_dir, popen_args) - proc.launch() - proc.wait() - if proc.result != 0: - log.ctx(proc) - raise log.Error('Exited in error') - def create_pcu(self): return pcu_sysmo.OsmoPcuSysmo(self.suite_run, self, self.conf) @@ -124,23 +104,14 @@ if not self.inst.isfile('bin', SysmoBts.BTS_SYSMO_BIN): raise log.Error('No osmo-bts-sysmo binary in', self.inst) - self.remote_dir = util.Dir(SysmoBts.REMOTE_DIR) - self.remote_inst = util.Dir(self.remote_dir.child(os.path.basename(str(self.inst)))) + remote_run_dir = util.Dir(SysmoBts.REMOTE_DIR) - self.run_remote('rm-remote-dir', ('test', '!', '-d', SysmoBts.REMOTE_DIR, '||', 'rm', '-rf', SysmoBts.REMOTE_DIR)) - self.run_remote('mk-remote-dir', ('mkdir', '-p', SysmoBts.REMOTE_DIR)) - self.run_local('scp-inst-to-sysmobts', - ('scp', '-r', str(self.inst), '%s@%s:%s' % (self.remote_user, self.remote_addr(), str(self.remote_inst)))) + self.remote_inst = process.copy_inst_ssh(self.run_dir, self.inst, remote_run_dir, self.remote_user, + self.remote_addr(), SysmoBts.BTS_SYSMO_BIN, self.config_file) + process.run_remote_sync(self.run_dir, self.remote_user, self.remote_addr(), 'reload-dsp-firmware', + ('/bin/sh', '-c', '"cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0 ; cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0"')) - remote_run_dir = self.remote_dir.child(SysmoBts.BTS_SYSMO_BIN) - self.run_remote('mk-remote-run-dir', ('mkdir', '-p', remote_run_dir)) - - remote_config_file = self.remote_dir.child(SysmoBts.BTS_SYSMO_CFG) - self.run_local('scp-cfg-to-sysmobts', - ('scp', '-r', self.config_file, '%s@%s:%s' % (self.remote_user, self.remote_addr(), remote_config_file))) - - self.run_remote('reload-dsp-firmware', ('/bin/sh', '-c', '"cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0 ; cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0"')) - + remote_config_file = remote_run_dir.child(SysmoBts.BTS_SYSMO_CFG) remote_lib = self.remote_inst.child('lib') remote_binary = self.remote_inst.child('bin', 'osmo-bts-sysmo') diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py index ad2405d..9db9241 100644 --- a/src/osmo_gsm_tester/process.py +++ b/src/osmo_gsm_tester/process.py @@ -233,4 +233,41 @@ ' '.join(self.popen_args))] self.dbg(self.popen_args, dir=self.run_dir, conf=self.popen_kwargs) + +def run_local_sync(run_dir, name, popen_args): + run_dir =run_dir.new_dir(name) + proc = Process(name, run_dir, popen_args) + proc.launch() + proc.wait() + if proc.result != 0: + log.ctx(proc) + raise log.Error('Exited in error') + +def run_remote_sync(run_dir, remote_user, remote_addr, name, popen_args, remote_cwd=None): + run_dir = run_dir.new_dir(name) + proc = RemoteProcess(name, run_dir, remote_user, remote_addr, remote_cwd, + popen_args) + proc.launch() + proc.wait() + if proc.result != 0: + log.ctx(proc) + raise log.Error('Exited in error') + +def scp(run_dir, remote_user, remote_addr, name, local_path, remote_path): + run_local_sync(run_dir, name, ('scp', '-r', local_path, '%s@%s:%s' % (remote_user, remote_addr, remote_path))) + +def copy_inst_ssh(run_dir, inst, remote_dir, remote_user, remote_addr, remote_rundir_append, cfg_file_name): + remote_inst = Dir(remote_dir.child(os.path.basename(str(inst)))) + remote_dir_str = str(remote_dir) + run_remote_sync(run_dir, remote_user, remote_addr, 'rm-remote-dir', ('test', '!', '-d', remote_dir_str, '||', 'rm', '-rf', remote_dir_str)) + run_remote_sync(run_dir, remote_user, remote_addr, 'mk-remote-dir', ('mkdir', '-p', remote_dir_str)) + scp(run_dir, remote_user, remote_addr, 'scp-inst-to-remote', str(inst), remote_dir_str) + + remote_run_dir = remote_dir.child(remote_rundir_append) + run_remote_sync(run_dir, remote_user, remote_addr, 'mk-remote-run-dir', ('mkdir', '-p', remote_run_dir)) + + remote_config_file = remote_dir.child(os.path.basename(cfg_file_name)) + scp(run_dir, remote_user, remote_addr, 'scp-cfg-to-remote', cfg_file_name, remote_config_file) + return remote_inst + # vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit https://gerrit.osmocom.org/11190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I838b999528695207e1147cfe76e6f7aaf3b1dd53 Gerrit-Change-Number: 11190 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 11:15:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 2 Oct 2018 11:15:26 +0000 Subject: Change in osmo-gsm-tester[master]: osmotrx: Make sure remote process stops after ssh session is closed Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11192 Change subject: osmotrx: Make sure remote process stops after ssh session is closed ...................................................................... osmotrx: Make sure remote process stops after ssh session is closed First of all, it was found that vty allocation must be forced (-t -t) during ssh session creation to make sure SIGHUP is forwarded when session is closed. Second, since osmo-trx ignores SIGHUP (osmo_init_ignore_signals()), we must add a wrapper script which converts received SIGHUP into a SIGINT to stop osmo-trx. Change-Id: Ic334a54b1a1827d74fe0b453ac32bb77b8616147 --- M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/process.py 2 files changed, 37 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/92/11192/1 diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 3ed596a..a1814dc 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -18,6 +18,7 @@ # along with this program. If not, see . import os +import stat import pprint import tempfile from abc import ABCMeta, abstractmethod @@ -142,6 +143,7 @@ CONF_OSMO_TRX = 'osmo-trx.cfg' REMOTE_DIR = '/osmo-gsm-tester-trx/last_run' + WRAPPER_SCRIPT = 'ssh_sigkiller.sh' ############## # PROTECTED @@ -207,6 +209,28 @@ proc.launch() return proc + def generate_wrapper_script(self): + wrapper_script = self.run_dir.new_file(OsmoTrx.WRAPPER_SCRIPT) + with open(wrapper_script, 'w') as f: + r = """#!/bin/bash + mypid=0 + sign_handler() { + sig=$1 + echo "received signal handler $sig, killing $mypid" + kill $mypid + } + trap 'sign_handler SIGINT' SIGINT + trap 'sign_handler SIGHUP' SIGHUP + "$@" & + mypid=$! + echo "waiting for $mypid" + wait $mypid + """ + f.write(r) + st = os.stat(wrapper_script) + os.chmod(wrapper_script, st.st_mode | stat.S_IEXEC) + return wrapper_script + ############## # PUBLIC (test API included) ############## @@ -221,13 +245,21 @@ self.proc_trx = self.launch_process_local(keepalive, self.binary_name(), '-C', os.path.abspath(self.config_file)) else: + # Run remotely through ssh. We need to run osmo-trx under a wrapper + # script since osmo-trx ignores SIGHUP and will keep running after + # we close local ssh session. The wrapper script catches SIGHUP and + # sends SIGINT to it. + wrapper_script = self.generate_wrapper_script() remote_run_dir = util.Dir(OsmoTrx.REMOTE_DIR) self.remote_inst = process.copy_inst_ssh(self.run_dir, self.inst, remote_run_dir, self.remote_user, self.listen_ip, self.binary_name(), self.config_file) + remote_wrapper_script = remote_run_dir.child(OsmoTrx.WRAPPER_SCRIPT) remote_config_file = remote_run_dir.child(OsmoTrx.CONF_OSMO_TRX) remote_lib = self.remote_inst.child('lib') remote_binary = self.remote_inst.child('bin', self.binary_name()) - args = ('LD_LIBRARY_PATH=%s' % remote_lib, remote_binary, '-C', remote_config_file) + process.scp(self.run_dir, self.remote_user, self.listen_ip, 'scp-wrapper-to-remote', wrapper_script, remote_wrapper_script) + + args = ('LD_LIBRARY_PATH=%s' % remote_lib, remote_wrapper_script, remote_binary, '-C', remote_config_file) self.proc_trx = self.launch_process_remote(self.binary_name(), args, remote_cwd=remote_run_dir, keepalive=keepalive) def trx_ready(self): diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py index 9db9241..534cdba 100644 --- a/src/osmo_gsm_tester/process.py +++ b/src/osmo_gsm_tester/process.py @@ -228,7 +228,10 @@ cd = 'cd "%s"; ' % self.remote_cwd else: cd = '' - self.popen_args = ['ssh', self.remote_user+'@'+self.remote_host, + # We need double -t to force tty and be able to forward signals to + # processes (SIGHUP) when we close ssh on the local side. As a result, + # stderr seems to be merged into stdout in ssh client. + self.popen_args = ['ssh', '-t', '-t', self.remote_user+'@'+self.remote_host, '%s%s' % (cd, ' '.join(self.popen_args))] self.dbg(self.popen_args, dir=self.run_dir, conf=self.popen_kwargs) -- To view, visit https://gerrit.osmocom.org/11192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic334a54b1a1827d74fe0b453ac32bb77b8616147 Gerrit-Change-Number: 11192 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 12:25:14 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 2 Oct 2018 12:25:14 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Further use of osmo_mncc_name() in logging Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/11193 Change subject: Logging: Further use of osmo_mncc_name() in logging ...................................................................... Logging: Further use of osmo_mncc_name() in logging Use osmo_mncc_name() in timer functions and in logging the type of MNCC message sent to the socket. Change-Id: Ic77e0d86c91c29ff7304e620fdecb69b22127d33 --- M src/mncc.c 1 file changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/93/11193/1 diff --git a/src/mncc.c b/src/mncc.c index 1b44e05..976a671 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -65,20 +65,21 @@ leg->cmd_timeout.cb = cmd_timeout; leg->cmd_timeout.data = leg; + LOGP(DMNCC, LOGL_DEBUG, "Starting Timer for %s\n", osmo_mncc_name(expected_next)); osmo_timer_schedule(&leg->cmd_timeout, 5, 0); } static void stop_cmd_timer(struct mncc_call_leg *leg, uint32_t got_res) { if (leg->rsp_wanted != got_res) { - LOGP(DMNCC, LOGL_ERROR, "Wanted rsp(%u) but got(%u) for leg(%u)\n", - leg->rsp_wanted, got_res, leg->callref); + LOGP(DMNCC, LOGL_ERROR, "Wanted rsp(%s) but got(%s) for leg(%u)\n", + osmo_mncc_name(leg->rsp_wanted), osmo_mncc_name(got_res), leg->callref); return; } LOGP(DMNCC, LOGL_DEBUG, - "Got response(0x%x), stopping timer on leg(%u)\n", - got_res, leg->callref); + "Got response(%s), stopping timer on leg(%u)\n", + osmo_mncc_name(got_res), leg->callref); osmo_timer_del(&leg->cmd_timeout); } @@ -127,6 +128,7 @@ * static struct? */ rc = write(conn->fd.fd, mncc, sizeof(*mncc)); + LOGP(DMNCC, LOGL_DEBUG, "MNCC sent message type: %s\n", osmo_mncc_name(mncc->msg_type)); if (rc != sizeof(*mncc)) { LOGP(DMNCC, LOGL_ERROR, "Failed to send message call(%u)\n", callref); close_connection(conn); -- To view, visit https://gerrit.osmocom.org/11193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic77e0d86c91c29ff7304e620fdecb69b22127d33 Gerrit-Change-Number: 11193 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 12:31:08 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 2 Oct 2018 12:31:08 +0000 Subject: Change in osmo-sip-connector[master]: MNCC: Do not continue with B leg if A leg is cancelled. Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/11194 Change subject: MNCC: Do not continue with B leg if A leg is cancelled. ...................................................................... MNCC: Do not continue with B leg if A leg is cancelled. In case we receive MNCC_RTP_CREATE after MNCC_DISC_IND, check if the call is already marked in_release in check_rtp_create() and if so, release instead of proceeding with the B leg. Change-Id: I0eca9a741f7924c2fc32c503dd1a0fc083f94f37 Related: OS#3518 --- M src/mncc.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/94/11194/1 diff --git a/src/mncc.c b/src/mncc.c index 976a671..5b06fbe 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -378,6 +378,11 @@ LOGP(DMNCC, LOGL_ERROR, "call(%u) can not be found\n", rtp->callref); return mncc_send(conn, MNCC_REJ_REQ, rtp->callref); } + if (leg->base.in_release) { + LOGP(DMNCC, LOGL_ERROR, "call(%u) is already in release!\n", rtp->callref); + mncc_leg_release(leg); + return; + } /* extract information about where the RTP is */ leg->base.ip = rtp->ip; -- To view, visit https://gerrit.osmocom.org/11194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0eca9a741f7924c2fc32c503dd1a0fc083f94f37 Gerrit-Change-Number: 11194 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 12:36:58 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 2 Oct 2018 12:36:58 +0000 Subject: Change in osmo-sip-connector[master]: MNCC: Do not continue with B leg if A leg is cancelled. In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/11194 ) Change subject: MNCC: Do not continue with B leg if A leg is cancelled. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11194/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/11194/1/src/mncc.c at 383 PS1, Line 383: mncc_leg_release(leg); This is kind of a workaround. There's probably a better way that avoids the subsequent error that will happen if this code triggers. One should investigate the upstream cause (in the MSC) of getting an RTP_CREATE after getting DISC_IND here. -- To view, visit https://gerrit.osmocom.org/11194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0eca9a741f7924c2fc32c503dd1a0fc083f94f37 Gerrit-Change-Number: 11194 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Tue, 02 Oct 2018 12:36:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 13:01:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 2 Oct 2018 13:01:36 +0000 Subject: Change in osmo-gsm-tester[master]: osmotrx: Make sure remote process stops after ssh session is closed In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11192 to look at the new patch set (#2). Change subject: osmotrx: Make sure remote process stops after ssh session is closed ...................................................................... osmotrx: Make sure remote process stops after ssh session is closed First of all, it was found that vty allocation must be forced (-t -t) during ssh session creation to make sure SIGHUP is forwarded when session is closed. Second, since osmo-trx ignores SIGHUP (osmo_init_ignore_signals()), we must add a wrapper script which converts received SIGHUP into a SIGINT to stop osmo-trx. Change-Id: Ic334a54b1a1827d74fe0b453ac32bb77b8616147 --- M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/bts_sysmo.py M src/osmo_gsm_tester/process.py 3 files changed, 43 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/92/11192/2 -- To view, visit https://gerrit.osmocom.org/11192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic334a54b1a1827d74fe0b453ac32bb77b8616147 Gerrit-Change-Number: 11192 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 13:01:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 2 Oct 2018 13:01:36 +0000 Subject: Change in osmo-gsm-tester[master]: bts_osmo: Only check for socket path in ready_for_pcu() Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11195 Change subject: bts_osmo: Only check for socket path in ready_for_pcu() ...................................................................... bts_osmo: Only check for socket path in ready_for_pcu() Previous implementation was done due to osmo-pcu dying if failed to connect to not-yet prepared BTS. This is no longer the case, so we can start osmo-pcu as soon as the socket exists. Change-Id: I3aa6bef0c4893bdcac668002ca018af019f666a3 --- M src/osmo_gsm_tester/bts_osmo.py 1 file changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/95/11195/1 diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py index 32784bd..89572ec 100644 --- a/src/osmo_gsm_tester/bts_osmo.py +++ b/src/osmo_gsm_tester/bts_osmo.py @@ -61,10 +61,10 @@ # coming from bts.Bts, we forward the implementation to children. pass + @abstractmethod def ready_for_pcu(self): - if not self.proc_bts or not self.proc_bts.is_running: - return False - return 'BTS is up' in (self.proc_bts.get_stderr() or '') + 'Used by tests to know when BTS is prepared and PCU can be started.' + pass def pcu(self): if self._pcu is None: @@ -107,6 +107,11 @@ ################### # PUBLIC (test API included) ################### + def ready_for_pcu(self): + if not self.proc_bts or not self.proc_bts.is_running: + return False + return os.path.exists(self.pcu_socket_path()) + @abstractmethod def start(self, keepalive=False): # coming from bts.Bts, we forward the implementation to children. -- To view, visit https://gerrit.osmocom.org/11195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3aa6bef0c4893bdcac668002ca018af019f666a3 Gerrit-Change-Number: 11195 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 13:56:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 2 Oct 2018 13:56:34 +0000 Subject: Change in osmo-bsc[master]: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11060 ) Change subject: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST ...................................................................... Patch Set 8: (9 comments) I must admit that I see the general idea, which looks good, but I don't fully grok the fixme-aspects. So I just found a few typos while trying to figure those out... not important. https://gerrit.osmocom.org/#/c/11060/8//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11060/8//COMMIT_MSG at 15 PS8, Line 15: in the ASSIGNMENT COMPLETE speech codec (choosen) field are hardcoded. "chosen" (yes, "to choose", but "chosen") https://gerrit.osmocom.org/#/c/11060/8/src/osmo-bsc/codec_pref.c File src/osmo-bsc/codec_pref.c: https://gerrit.osmocom.org/#/c/11060/8/src/osmo-bsc/codec_pref.c at 177 PS8, Line 177: /* Helper function to generate the bss supported amr configuration bits (S0-S15) */ (I prefer not writing "Helper function" everywhere, all functions except main() could be seen as "helpers"; just say what the function does.) https://gerrit.osmocom.org/#/c/11060/8/src/osmo-bsc/codec_pref.c at 185 PS8, Line 185: /* Lookup the BTS specific AMR rate configuration. Thsi config is set "This" https://gerrit.osmocom.org/#/c/11060/8/src/osmo-bsc/codec_pref.c at 286 PS8, Line 286: { (unusual position for '{') https://gerrit.osmocom.org/#/c/11060/8/src/osmo-bsc/codec_pref.c at 288 PS8, Line 288: * configuration that we did not previously advertised as "did .. advertise" https://gerrit.osmocom.org/#/c/11060/8/src/osmo-bsc/codec_pref.c at 290 PS8, Line 290: * configuration enters the further processing steps we agein "again" https://gerrit.osmocom.org/#/c/11060/8/src/osmo-bsc/lchan_fsm.c File src/osmo-bsc/lchan_fsm.c: https://gerrit.osmocom.org/#/c/11060/8/src/osmo-bsc/lchan_fsm.c at 435 PS8, Line 435: /* FIXME: At the moment we can not support multiple codc rates in one "codec" https://gerrit.osmocom.org/#/c/11060/8/src/osmo-bsc/lchan_fsm.c at 437 PS8, Line 437: * for Threshold and Hysteresis. Those fiels are not needed when only "fields" https://gerrit.osmocom.org/#/c/11060/8/src/osmo-bsc/lchan_fsm.c at 440 PS8, Line 440: * struct would then also be different because each rate neads its "needs" -- To view, visit https://gerrit.osmocom.org/11060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Gerrit-Change-Number: 11060 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 02 Oct 2018 13:56:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 14:16:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 2 Oct 2018 14:16:04 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf.prod: Use specific remote machine to run osmo-trx Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11196 Change subject: resources.conf.prod: Use specific remote machine to run osmo-trx ...................................................................... resources.conf.prod: Use specific remote machine to run osmo-trx Run osmo-trx in a separate more powerful machine (i5) rather than running in low end APU where osmo-gsm-tester runs. Change-Id: I0479643789783d5e8a142042a65c4d53020d1e79 --- M example/resources.conf.prod 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/96/11196/1 diff --git a/example/resources.conf.prod b/example/resources.conf.prod index 41ab009..e3c5ad8 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -27,6 +27,8 @@ ciphers: [a5_0, a5_1] osmo_trx: launch_trx: true + remote_user: jenkins + trx_ip: 10.42.42.230 clock_reference: external - label: sysmoCell 5000 -- To view, visit https://gerrit.osmocom.org/11196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0479643789783d5e8a142042a65c4d53020d1e79 Gerrit-Change-Number: 11196 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 14:16:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 2 Oct 2018 14:16:05 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-trx: Enable multi_arfcn for B200 and only in multiTRX setup Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11197 Change subject: osmo-trx: Enable multi_arfcn for B200 and only in multiTRX setup ...................................................................... osmo-trx: Enable multi_arfcn for B200 and only in multiTRX setup Change-Id: I6a29e1813f0603b00b49b7b7c805be23a72cf0e3 --- M example/resources.conf.prod M example/resources.conf.rnd M src/osmo_gsm_tester/bts_osmotrx.py 3 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/97/11197/1 diff --git a/example/resources.conf.prod b/example/resources.conf.prod index e3c5ad8..88358ac 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -30,6 +30,7 @@ remote_user: jenkins trx_ip: 10.42.42.230 clock_reference: external + multi_arfcn: true - label: sysmoCell 5000 type: osmo-bts-trx diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd index 2067efc..dbdf3cc 100644 --- a/example/resources.conf.rnd +++ b/example/resources.conf.rnd @@ -28,6 +28,7 @@ type: uhd launch_trx: true clock_reference: external + multi_arfcn: true remote_user: jenkins trx_ip: 127.0.0.1 ciphers: [a5_0, a5_1] diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index a1814dc..79c541d 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -179,7 +179,12 @@ self.dbg(config_file=self.config_file) values = self.conf - multi_arfcn_bool = util.str2bool(values.get('osmo_trx', {}).get('multi_arfcn', False)) + + # we don't need to enable multi-arfcn for single channel + if len(values.get('osmo_trx', {}).get('channels', [])) > 1: + multi_arfcn_bool = util.str2bool(values.get('osmo_trx', {}).get('multi_arfcn', False)) + else: + multi_arfcn_bool = False config.overlay(values, { 'osmo_trx': { 'multi_arfcn': multi_arfcn_bool } }) self.dbg('OSMO-TRX CONFIG:\n' + pprint.pformat(values)) -- To view, visit https://gerrit.osmocom.org/11197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6a29e1813f0603b00b49b7b7c805be23a72cf0e3 Gerrit-Change-Number: 11197 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 14:38:36 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 2 Oct 2018 14:38:36 +0000 Subject: Change in osmo-sip-connector[master]: call.h: fix spaces usage instead of tabs Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11198 Change subject: call.h: fix spaces usage instead of tabs ...................................................................... call.h: fix spaces usage instead of tabs Change-Id: I1ae638af50fa3741e84e421687270d2177e1be2d --- M src/call.h 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/98/11198/1 diff --git a/src/call.h b/src/call.h index de92a24..65d1111 100644 --- a/src/call.h +++ b/src/call.h @@ -54,15 +54,15 @@ uint32_t payload_type; uint32_t payload_msg_type; - /** - * Remote started to ring/alert - */ - void (*ring_call)(struct call_leg *); + /** + * Remote started to ring/alert + */ + void (*ring_call)(struct call_leg *); - /** - * Remote picked up - */ - void (*connect_call)(struct call_leg *); + /** + * Remote picked up + */ + void (*connect_call)(struct call_leg *); /** * Set by the call_leg implementation and will be called -- To view, visit https://gerrit.osmocom.org/11198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1ae638af50fa3741e84e421687270d2177e1be2d Gerrit-Change-Number: 11198 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 14:38:37 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 2 Oct 2018 14:38:37 +0000 Subject: Change in osmo-sip-connector[master]: Add rate counters for call handling Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11199 Change subject: Add rate counters for call handling ...................................................................... Add rate counters for call handling This creates rate counters for: * Initiated calls * Failed calls * Connected calls * Released calls Related: OS#1697 Change-Id: I6d7963266a93be631a4e0e03a39916d07a88fe01 --- A src/ctr.h M src/main.c M src/sip.c M src/sip.h 4 files changed, 61 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/99/11199/1 diff --git a/src/ctr.h b/src/ctr.h new file mode 100644 index 0000000..b3460de --- /dev/null +++ b/src/ctr.h @@ -0,0 +1,25 @@ +#pragma once +#include +#include + +enum { + SIP_CTR_CALL_INITIATED, + SIP_CTR_CALL_FAILED, + SIP_CTR_CALL_CONNECTED, + SIP_CTR_CALL_RELEASED, +}; + +static const struct rate_ctr_desc sip_ctr_description[] = { + [SIP_CTR_CALL_INITIATED] = {"call:initiated", "Call(s) initiated."}, + [SIP_CTR_CALL_FAILED] = {"call:failed", "Call(s) failed."}, + [SIP_CTR_CALL_CONNECTED] = {"call:connected", "Call(s) connected."}, + [SIP_CTR_CALL_RELEASED] = {"call:released", "Call(s) released."}, +}; + +static const struct rate_ctr_group_desc sip_ctrg_desc = { + "sip-connector", + "SIP connector", + OSMO_STATS_CLASS_GLOBAL, + ARRAY_SIZE(sip_ctr_description), + sip_ctr_description +}; diff --git a/src/main.c b/src/main.c index 560995e..d07f51b 100644 --- a/src/main.c +++ b/src/main.c @@ -26,6 +26,7 @@ #include "mncc.h" #include "app.h" #include "call.h" +#include "ctr.h" #include #include @@ -113,6 +114,7 @@ { int rc; GMainLoop *loop; + struct rate_ctr_group *ctrg; /* initialize osmocom */ tall_mncc_ctx = talloc_named_const(NULL, 0, "MNCC CTX"); @@ -120,6 +122,14 @@ osmo_init_logging2(tall_mncc_ctx, &mncc_sip_info); osmo_stats_init(tall_mncc_ctx); + /* init statistics */ + rate_ctr_init(tall_mncc_ctx); + ctrg = rate_ctr_group_alloc(tall_mncc_ctx, &sip_ctrg_desc, 0); + if (!ctrg) { + LOGP(DAPP, LOGL_ERROR, "Cannot allocate global counter group!\n"); + exit(1); + } + mncc_sip_vty_init(); logging_vty_add_cmds(&mncc_sip_info); osmo_stats_vty_add_cmds(&mncc_sip_info); @@ -144,7 +154,7 @@ mncc_connection_start(&g_app.mncc.conn); /* sofia sip */ - sip_agent_init(&g_app.sip.agent, &g_app); + sip_agent_init(&g_app.sip.agent, &g_app, ctrg); rc = sip_agent_start(&g_app.sip.agent); if (rc < 0) LOGP(DSIP, LOGL_ERROR, diff --git a/src/sip.c b/src/sip.c index adf20d8..e7eeed6 100644 --- a/src/sip.c +++ b/src/sip.c @@ -21,6 +21,7 @@ #include "sip.h" #include "app.h" #include "call.h" +#include "ctr.h" #include "logging.h" #include "sdp.h" @@ -77,6 +78,15 @@ leg->state = SIP_CC_CONNECTED; other->connect_call(other); nua_ack(leg->nua_handle, TAG_END()); + // rate_ctr_inc2(argent->ctrg, SIP_CTR_CALL_CONNECTED); +} + +static void new_call_failure(struct sip_agent *agent, nua_handle_t *nh, + int status, char const* phrase) +{ + nua_respond(nh, status, phrase, TAG_END()); + nua_handle_destroy(nh); + rate_ctr_inc2(agent->ctrg, SIP_CTR_CALL_FAILED); } static void new_call(struct sip_agent *agent, nua_handle_t *nh, @@ -90,16 +100,14 @@ if (!sdp_screen_sdp(sip)) { LOGP(DSIP, LOGL_ERROR, "No supported codec.\n"); - nua_respond(nh, SIP_406_NOT_ACCEPTABLE, TAG_END()); - nua_handle_destroy(nh); + new_call_failure(agent, nh, SIP_406_NOT_ACCEPTABLE); return; } call = call_sip_create(); if (!call) { LOGP(DSIP, LOGL_ERROR, "No supported codec.\n"); - nua_respond(nh, SIP_500_INTERNAL_SERVER_ERROR, TAG_END()); - nua_handle_destroy(nh); + new_call_failure(agent, nh, SIP_500_INTERNAL_SERVER_ERROR); return; } @@ -110,8 +118,7 @@ if (!to || !from) { LOGP(DSIP, LOGL_ERROR, "Unknown from/to for invite.\n"); - nua_respond(nh, SIP_406_NOT_ACCEPTABLE, TAG_END()); - nua_handle_destroy(nh); + new_call_failure(agent, nh, SIP_406_NOT_ACCEPTABLE); return; } @@ -128,8 +135,7 @@ */ if (!sdp_extract_sdp(leg, sip, true)) { LOGP(DSIP, LOGL_ERROR, "leg(%p) no audio, releasing\n", leg); - nua_respond(nh, SIP_406_NOT_ACCEPTABLE, TAG_END()); - nua_handle_destroy(nh); + new_call_failure(agent, nh, SIP_406_NOT_ACCEPTABLE); call_leg_release(&leg->base); return; } @@ -354,6 +360,8 @@ nua_bye(leg->nua_handle, TAG_END()); break; } + + // rate_ctr_inc2(argent->ctrg, SIP_CTR_CALL_RELEASED); } static void sip_ring_call(struct call_leg *_leg) @@ -364,6 +372,7 @@ leg = (struct sip_call_leg *) _leg; nua_respond(leg->nua_handle, SIP_180_RINGING, TAG_END()); + // rate_ctr_inc2(argent->ctrg, SIP_CTR_CALL_INITIATED); } static void sip_connect_call(struct call_leg *_leg) @@ -495,9 +504,11 @@ osmo_vlogp(DSIP, LOGL_NOTICE, "", 0, 0, fmt, ap); } -void sip_agent_init(struct sip_agent *agent, struct app_config *app) +void sip_agent_init(struct sip_agent *agent, struct app_config *app, + struct rate_ctr_group *ctrg) { agent->app = app; + agent->ctrg = ctrg; su_init(); su_home_init(&agent->home); diff --git a/src/sip.h b/src/sip.h index d25c0b1..e6b9b72 100644 --- a/src/sip.h +++ b/src/sip.h @@ -6,6 +6,7 @@ #include #include #include +#include struct app_config; struct call; @@ -16,9 +17,12 @@ su_root_t *root; nua_t *nua; + + struct rate_ctr_group *ctrg; }; -void sip_agent_init(struct sip_agent *agent, struct app_config *app); +void sip_agent_init(struct sip_agent *agent, struct app_config *app, + struct rate_ctr_group *ctrg); int sip_agent_start(struct sip_agent *agent); int sip_create_remote_leg(struct sip_agent *agent, struct call *call); -- To view, visit https://gerrit.osmocom.org/11199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6d7963266a93be631a4e0e03a39916d07a88fe01 Gerrit-Change-Number: 11199 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 15:30:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 2 Oct 2018 15:30:53 +0000 Subject: Change in osmo-trx[master]: Transciever: Log values causing Tx underrun Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11200 Change subject: Transciever: Log values causing Tx underrun ...................................................................... Transciever: Log values causing Tx underrun Change-Id: I68e18075eade55034567d96fc774d00a794afeeb --- M Transceiver52M/Transceiver.cpp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/00/11200/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 076db3e..d6ddce8 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -1001,7 +1001,8 @@ // only update latency at the defined frame interval if (radioClock->get() > mLatencyUpdateTime + GSM::Time(USB_LATENCY_INTRVL)) { mTransmitLatency = mTransmitLatency + GSM::Time(1,0); - LOG(INFO) << "new latency: " << mTransmitLatency; + LOG(INFO) << "new latency: " << mTransmitLatency << " (underrun " + << radioClock->get() << " vs " << mLatencyUpdateTime + GSM::Time(USB_LATENCY_INTRVL) << ")"; mLatencyUpdateTime = radioClock->get(); } } -- To view, visit https://gerrit.osmocom.org/11200 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I68e18075eade55034567d96fc774d00a794afeeb Gerrit-Change-Number: 11200 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 15:42:33 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 2 Oct 2018 15:42:33 +0000 Subject: Change in libosmocore[master]: mncc: Move definitions to header file In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11185 ) Change subject: mncc: Move definitions to header file ...................................................................... Patch Set 3: > but wait.. are you sure about that? > so we've lived with gsm_mncc_bearer_cap for some time, for example. > But you're saying that gsm_mncc must become osmo_gsm_mncc now? This is a problem of the current code in libosmocore - missing "osmo_" prefixes for some symbols. Most likely, they were initially introduced without that prefix, so now it's not easy (I would say no way) to add this prefix, as it would break the API compatibility. > If one /were/ to do that work, you'ld also suggest that > gsm_mncc_bearer_cap should become osmo_gsm_mncc_bearer_cap ? Let's introduce the new symbols with this prefix, as it anyway would require some modifications in existing projects. This at least wouldn't make the situation worse ;) And let's see what does @LaF0rge think? -- To view, visit https://gerrit.osmocom.org/11185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62bc025369bd9ee9b134e064a8364aa4bd5de16e Gerrit-Change-Number: 11185 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 02 Oct 2018 15:42:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 17:15:16 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 2 Oct 2018 17:15:16 +0000 Subject: Change in pysim[master]: pySim-prog: Honor international '+' in SMSC number Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11201 Change subject: pySim-prog: Honor international '+' in SMSC number ...................................................................... pySim-prog: Honor international '+' in SMSC number The smsc no. programmed by pySim-prog would always be a national number in the past. Check whether the first 'digit' is a + and indicate that it is an international number. Change-Id: Ia79913f5b0307e9786a5acea75c0811927be2eef --- M pySim-prog.py 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/01/11201/1 diff --git a/pySim-prog.py b/pySim-prog.py index eca8b4e..923a035 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -319,14 +319,18 @@ raise ValueError('SMSP must be at least 28 bytes') else: + ton = "81" if opts.smsc is not None: smsc = opts.smsc - if not _isnum(smsc): + if smsc[0] == '+': + ton = "91" + smsc = smsc[1:] + if not _isnum(smsc): raise ValueError('SMSC must be digits only !') else: smsc = '00%d' % opts.country + '5555' # Hack ... - smsc = '%02d' % ((len(smsc) + 3)//2,) + "81" + swap_nibbles(rpad(smsc, 20)) + smsc = '%02d' % ((len(smsc) + 3)//2,) + ton + swap_nibbles(rpad(smsc, 20)) smsp = ( 'e1' + # Parameters indicator -- To view, visit https://gerrit.osmocom.org/11201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia79913f5b0307e9786a5acea75c0811927be2eef Gerrit-Change-Number: 11201 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 17:58:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 2 Oct 2018 17:58:37 +0000 Subject: Change in pysim[master]: pySim-prog: Honor international '+' in SMSC number In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11201 ) Change subject: pySim-prog: Honor international '+' in SMSC number ...................................................................... Patch Set 1: Verified+1 Code-Review+2 tested and it works for me! -- To view, visit https://gerrit.osmocom.org/11201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia79913f5b0307e9786a5acea75c0811927be2eef Gerrit-Change-Number: 11201 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 02 Oct 2018 17:58:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 17:59:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 2 Oct 2018 17:59:23 +0000 Subject: Change in pysim[master]: pySim-prog: Honor international '+' in SMSC number In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11201 ) Change subject: pySim-prog: Honor international '+' in SMSC number ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11201/1/pySim-prog.py File pySim-prog.py: https://gerrit.osmocom.org/#/c/11201/1/pySim-prog.py at 325 PS1, Line 325: if smsc[0] == '+': cosmetic: the rest of the file is indented by tabs, the new lines by spaces -- To view, visit https://gerrit.osmocom.org/11201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia79913f5b0307e9786a5acea75c0811927be2eef Gerrit-Change-Number: 11201 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 02 Oct 2018 17:59:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 18:01:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 2 Oct 2018 18:01:05 +0000 Subject: Change in pysim[master]: pySim-prog: Honor international '+' in SMSC number In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11201 ) Change subject: pySim-prog: Honor international '+' in SMSC number ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11201/1/pySim-prog.py File pySim-prog.py: https://gerrit.osmocom.org/#/c/11201/1/pySim-prog.py at 100 PS1, Line 100: help="SMSP [default: '00 + country code + 5555']", "If it starts with a '+', Type-of-Number is programmed as 'international'" ? ... is "SMSP" correct? https://gerrit.osmocom.org/#/c/11201/1/pySim-prog.py at 329 PS1, Line 329: raise ValueError('SMSC must be digits only !') "and optionally start with a '+'" ? -- To view, visit https://gerrit.osmocom.org/11201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia79913f5b0307e9786a5acea75c0811927be2eef Gerrit-Change-Number: 11201 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 02 Oct 2018 18:01:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 18:06:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 2 Oct 2018 18:06:59 +0000 Subject: Change in libosmo-abis[master]: ipacces: Log correct trx_nr during IPA GET Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11202 Change subject: ipacces: Log correct trx_nr during IPA GET ...................................................................... ipacces: Log correct trx_nr during IPA GET dev->trx_id points to a structure used for whole BTS and doesn't point to related TRX ID, which is encoded in priv_nr. Change-Id: I00b01790990c8d21fdbe0f5750fa02f13ddb2009 --- M src/input/ipaccess.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/02/11202/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 566fd64..f8e8e09 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -690,7 +690,7 @@ trx_nr = link->ofd->priv_nr - E1INP_SIGN_RSL; LOGP(DLINP, LOGL_NOTICE, "received ID get from %u/%u/%u\n", - dev->site_id, dev->bts_id, dev->trx_id); + dev->site_id, dev->bts_id, trx_nr); rmsg = ipa_bts_id_resp(dev, data + 1, len - 1, trx_nr); ret = ipa_send(link->ofd->fd, rmsg->data, rmsg->len); if (ret != rmsg->len) { -- To view, visit https://gerrit.osmocom.org/11202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I00b01790990c8d21fdbe0f5750fa02f13ddb2009 Gerrit-Change-Number: 11202 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 18:19:47 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 2 Oct 2018 18:19:47 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: Fix missing Security Command for 3G when attaching In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11150 to look at the new patch set (#3). Change subject: gprs_gmm: Fix missing Security Command for 3G when attaching ...................................................................... gprs_gmm: Fix missing Security Command for 3G when attaching Introduce a new FSM step in GMM Attach to send the Security Command to the RNC after completing the Authentication. Fixes: f7198d7dbb84 ("gprs_gmm: introduce a GMM Attach Request FSM") Change-Id: I1e12b0a32e58c6f78dba7b548f7d7016567229db --- M include/osmocom/sgsn/gprs_gmm_attach.h M src/gprs/gprs_gmm.c M src/gprs/gprs_gmm_attach.c 3 files changed, 44 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/50/11150/3 -- To view, visit https://gerrit.osmocom.org/11150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1e12b0a32e58c6f78dba7b548f7d7016567229db Gerrit-Change-Number: 11150 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 19:24:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 2 Oct 2018 19:24:09 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Simplify handling of e1line ts Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11203 Change subject: ipaccess: Simplify handling of e1line ts ...................................................................... ipaccess: Simplify handling of e1line ts Handle encoding specifics behind a macro to make code easier to understand and follow. Change-Id: Ibf251673bff95b7a0b066b19ef4dc6c0f94fff6b --- M include/osmocom/abis/e1_input.h M src/input/ipaccess.c M tests/e1inp_ipa_bsc_test.c M tests/e1inp_ipa_bts_test.c 4 files changed, 36 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/03/11203/1 diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index 79455e1..3d0c820 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -195,6 +195,8 @@ /* array of timestlots */ struct e1inp_ts ts[NUM_E1_TS]; unsigned int num_ts; + #define e1inp_line_oml_ts(line) (&line->ts[0]) + #define e1inp_line_rsl_ts(line, trx_id) (&line->ts[1 + (trx_id)]) const struct e1inp_line_ops *ops; diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index f8e8e09..cce09c3 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -62,8 +62,11 @@ static int ipaccess_drop(struct osmo_fd *bfd, struct e1inp_line *line) { int ret = 1; - unsigned int ts_nr = bfd->priv_nr; - struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1]; + struct e1inp_ts *e1i_ts; + if (bfd->priv_nr == E1INP_SIGN_OML) + e1i_ts = e1inp_line_oml_ts(line); + else + e1i_ts = e1inp_line_rsl_ts(line, bfd->priv_nr - E1INP_SIGN_RSL); /* Error case: we did not see any ID_RESP yet for this socket. */ if (bfd->fd != -1) { @@ -185,7 +188,7 @@ * this RSL link, attach it to this socket. */ bfd->data = new_line = sign_link->ts->line; e1inp_line_get(new_line); - ts = &new_line->ts[E1INP_SIGN_RSL+unit_data.trx_id-1]; + ts = e1inp_line_rsl_ts(new_line, unit_data.trx_id); newbfd = &ts->driver.ipaccess.fd; /* get rid of our old temporary bfd */ @@ -223,12 +226,17 @@ { struct e1inp_line *line = bfd->data; unsigned int ts_nr = bfd->priv_nr; - struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1]; + struct e1inp_ts *e1i_ts; struct e1inp_sign_link *link; struct ipaccess_head *hh; struct msgb *msg = NULL; int ret, rc; + if (bfd->priv_nr == E1INP_SIGN_OML) + e1i_ts = e1inp_line_oml_ts(line); + else + e1i_ts = e1inp_line_rsl_ts(line, bfd->priv_nr - E1INP_SIGN_RSL); + ret = ipa_msg_recv_buffered(bfd->fd, &msg, &e1i_ts->pending_msg); if (ret < 0) { if (ret == -EAGAIN) @@ -312,11 +320,16 @@ static int __handle_ts1_write(struct osmo_fd *bfd, struct e1inp_line *line) { unsigned int ts_nr = bfd->priv_nr; - struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1]; + struct e1inp_ts *e1i_ts; struct e1inp_sign_link *sign_link; struct msgb *msg; int ret; + if (bfd->priv_nr == E1INP_SIGN_OML) + e1i_ts = e1inp_line_oml_ts(line); + else + e1i_ts = e1inp_line_rsl_ts(line, bfd->priv_nr - E1INP_SIGN_RSL); + bfd->when &= ~BSC_FD_WRITE; /* get the next msg for this timeslot */ @@ -454,7 +467,6 @@ static int ipaccess_bsc_oml_cb(struct ipa_server_link *link, int fd) { int ret; - int idx = 0; int i; struct e1inp_line *line; struct e1inp_ts *e1i_ts; @@ -468,13 +480,13 @@ } /* create virrtual E1 timeslots for signalling */ - e1inp_ts_config_sign(&line->ts[E1INP_SIGN_OML-1], line); + e1inp_ts_config_sign(e1inp_line_oml_ts(line), line); /* initialize the fds */ for (i = 0; i < ARRAY_SIZE(line->ts); ++i) line->ts[i].driver.ipaccess.fd.fd = -1; - e1i_ts = &line->ts[idx]; + e1i_ts = e1inp_line_oml_ts(line); bfd = &e1i_ts->driver.ipaccess.fd; osmo_fd_setup(bfd, fd, BSC_FD_READ, ipaccess_fd_cb, line, E1INP_SIGN_OML); @@ -524,9 +536,9 @@ /* we need this to initialize this in case to avoid crashes in case * that the socket is closed before we've seen an ID_RESP. */ - e1inp_ts_config_sign(&line->ts[E1INP_SIGN_OML-1], line); + e1inp_ts_config_sign(e1inp_line_oml_ts(line), line); - e1i_ts = &line->ts[E1INP_SIGN_RSL-1]; + e1i_ts = e1inp_line_rsl_ts(line, 0); bfd = &e1i_ts->driver.ipaccess.fd; osmo_fd_setup(bfd, fd, BSC_FD_READ, ipaccess_fd_cb, line, E1INP_SIGN_RSL); @@ -763,9 +775,9 @@ msgb_free(msg); return ret; } else if (link->port == IPA_TCP_PORT_OML) - e1i_ts = &link->line->ts[0]; + e1i_ts = e1inp_line_oml_ts(link->line); else if (link->port == IPA_TCP_PORT_RSL) - e1i_ts = &link->line->ts[link->ofd->priv_nr-1]; + e1i_ts = e1inp_line_rsl_ts(link->line, link->ofd->priv_nr - E1INP_SIGN_RSL); OSMO_ASSERT(e1i_ts != NULL); @@ -870,7 +882,7 @@ IPA_TCP_PORT_OML); link = ipa_client_conn_create(tall_ipa_ctx, - &line->ts[E1INP_SIGN_OML-1], + e1inp_line_oml_ts(line), E1INP_SIGN_OML, line->ops->cfg.ipa.addr, IPA_TCP_PORT_OML, @@ -920,7 +932,7 @@ } rsl_link = ipa_client_conn_create(tall_ipa_ctx, - &line->ts[E1INP_SIGN_RSL+trx_nr-1], + e1inp_line_rsl_ts(line, trx_nr), E1INP_SIGN_RSL+trx_nr, rem_addr, rem_port, ipaccess_bts_updown_cb, diff --git a/tests/e1inp_ipa_bsc_test.c b/tests/e1inp_ipa_bsc_test.c index 9064d0a..9eb3674 100644 --- a/tests/e1inp_ipa_bsc_test.c +++ b/tests/e1inp_ipa_bsc_test.c @@ -30,9 +30,9 @@ switch(type) { case E1INP_SIGN_OML: LOGP(DBSCTEST, LOGL_NOTICE, "OML link up request received.\n"); - e1inp_ts_config_sign(&line->ts[E1INP_SIGN_OML - 1], line); + e1inp_ts_config_sign(e1inp_line_oml_ts(line), line); sign_link = oml_sign_link = - e1inp_sign_link_create(&line->ts[E1INP_SIGN_OML - 1], + e1inp_sign_link_create(e1inp_line_oml_ts(line), E1INP_SIGN_OML, NULL, 255, 0); break; case E1INP_SIGN_RSL: @@ -45,10 +45,10 @@ /* We have to use the same line that the OML link. */ oml_line = oml_sign_link->ts->line; - e1inp_ts_config_sign(&oml_line->ts[E1INP_SIGN_RSL - 1], + e1inp_ts_config_sign(e1inp_line_rsl_ts(oml_line, 0), oml_line); sign_link = rsl_sign_link = - e1inp_sign_link_create(&oml_line->ts[E1INP_SIGN_RSL - 1], + e1inp_sign_link_create(e1inp_line_rsl_ts(oml_line, 0), E1INP_SIGN_RSL, NULL, 0, 0); break; default: diff --git a/tests/e1inp_ipa_bts_test.c b/tests/e1inp_ipa_bts_test.c index 48a5c59..7ebdf56 100644 --- a/tests/e1inp_ipa_bts_test.c +++ b/tests/e1inp_ipa_bts_test.c @@ -51,9 +51,9 @@ case E1INP_SIGN_OML: LOGP(DBTSTEST, LOGL_NOTICE, "OML link up request received.\n"); - e1inp_ts_config_sign(&line->ts[E1INP_SIGN_OML - 1], line); + e1inp_ts_config_sign(e1inp_line_oml_ts(line), line); sign_link = oml_sign_link = - e1inp_sign_link_create(&line->ts[E1INP_SIGN_OML - 1], + e1inp_sign_link_create(e1inp_line_oml_ts(line), E1INP_SIGN_OML, NULL, 255, 0); if (!oml_sign_link) { LOGP(DBTSTEST, LOGL_ERROR, @@ -76,10 +76,10 @@ case E1INP_SIGN_RSL: LOGP(DBTSTEST, LOGL_NOTICE, "RSL link up request received.\n"); - e1inp_ts_config_sign(&line->ts[E1INP_SIGN_RSL - 1], line); + e1inp_ts_config_sign(e1inp_line_rsl_ts(line, 0), line); sign_link = rsl_sign_link = - e1inp_sign_link_create(&line->ts[E1INP_SIGN_RSL - 1], + e1inp_sign_link_create(e1inp_line_rsl_ts(line, 0), E1INP_SIGN_RSL, NULL, 0, 0); if (!rsl_sign_link) { LOGP(DBTSTEST, LOGL_ERROR, -- To view, visit https://gerrit.osmocom.org/11203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf251673bff95b7a0b066b19ef4dc6c0f94fff6b Gerrit-Change-Number: 11203 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 21:16:30 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 2 Oct 2018 21:16:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11204 Change subject: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() ...................................................................... BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() For some reason, in f_TC_encr_cmd() it was expected / assumed that when a ciphered I-frame is sent from MS on L1CTL, nothing else than this frame would arrive. But since we have fixed Measurement Reporting in trxcon (see OS#2988), the MR related messages do appear on A-bis interface now! This change introduces a new function f_data_mo(), which should be used to send I-frames from MS, and expect them on A-bis ignoring all other other RSL messages (e.g. Measurement Reports). So, the following test cases: - TC_encr_cmd_a51; - TC_encr_cmd_a52; - TC_encr_cmd_a53; should pass with both trxcon and Calypso PHY now :) Change-Id: I08cb28dd9fa23f3ef8b0c9ede3d4c47f5702a1c1 --- M bts/BTS_Tests.ttcn 1 file changed, 24 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/11204/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 809a403..a3209b7 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3748,6 +3748,28 @@ } } +/* Send I-frame from MS and expect it to arrive as RLL DATA IND on Abis */ +function f_data_mo( + RslLinkId link_id, + boolean p, uint3_t nr, uint3_t ns, + octetstring l3 +) runs on ConnHdlr { + timer T := 3.0; + f_tx_lapdm(ts_LAPDm_I(link_id.sapi, cr_MO_CMD, p, nr, ns, l3), link_id); + T.start; + /* Expect RLL DATA IND on RSL side */ + alt { + [] RSL.receive(tr_RSL_DATA_IND(g_chan_nr, link_id, l3)) { + setverdict(pass); + } + [] T.timeout { + setverdict(fail, "Timeout waiting for DATA_IND"); + mtc.stop; + } + [] RSL.receive { repeat; } + } +} + /* Test channel activation with A5/n right from the beginning (like in assignment + hand-over) */ function f_TC_chan_act_encr(charstring id) runs on ConnHdlr { f_l1_tune(L1CTL); @@ -3811,10 +3833,8 @@ var uint8_t alg_id := f_alg_id_to_l1ctl(g_pars.encr.alg_id); f_L1CTL_CRYPTO_REQ(L1CTL, g_pars.chan_nr, alg_id, g_pars.encr.key); - /* send first ciphered I-frame in response */ - l3 := '0a0b0c0d'O; - f_tx_lapdm(ts_LAPDm_I(link_id.sapi, cr_MO_CMD, true, 1, 0, l3), link_id); - RSL.receive(tr_RSL_DATA_IND(g_chan_nr, link_id, l3)); + /* send first ciphered I-frame in response and expect it on RSL */ + f_data_mo(link_id, true, 1, 0, '0a0b0c0d'O); /* now the BTS code should have detected the first properly encrypted uplink I-frame, * and hence enable encryption also on the downlink */ -- To view, visit https://gerrit.osmocom.org/11204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I08cb28dd9fa23f3ef8b0c9ede3d4c47f5702a1c1 Gerrit-Change-Number: 11204 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 2 22:44:29 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 2 Oct 2018 22:44:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: update expected-results Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/11205 Change subject: sgsn: update expected-results ...................................................................... sgsn: update expected-results Change-Id: Ie08fb0b5a94728640f65f56430a217b51aea3dde --- M sgsn/expected-results.xml 1 file changed, 15 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/11205/1 diff --git a/sgsn/expected-results.xml b/sgsn/expected-results.xml index 459355a..3d9117f 100644 --- a/sgsn/expected-results.xml +++ b/sgsn/expected-results.xml @@ -1,30 +1,20 @@ - + - - Tguard timeout - SGSN_Tests.ttcn:MASKED SGSN_Tests control part - SGSN_Tests.ttcn:MASKED TC_attach_auth_sai_timeout testcase - - - - Tguard timeout - SGSN_Tests.ttcn:MASKED SGSN_Tests control part - SGSN_Tests.ttcn:MASKED TC_attach_auth_sai_reject testcase - - + + - Tguard timeout + SGSN_Tests.ttcn:MASKED SGSN_Tests control part SGSN_Tests.ttcn:MASKED TC_attach_gsup_lu_timeout testcase - Tguard timeout + SGSN_Tests.ttcn:MASKED SGSN_Tests control part SGSN_Tests.ttcn:MASKED TC_attach_gsup_lu_reject testcase @@ -35,20 +25,15 @@ - + + Non-matching VTY response: "" + SGSN_Tests.ttcn:MASKED SGSN_Tests control part + SGSN_Tests.ttcn:MASKED TC_attach_check_subscriber_list testcase + + - - Did not received GMM Attach Complete. - SGSN_Tests.ttcn:MASKED SGSN_Tests control part - SGSN_Tests.ttcn:MASKED TC_attach_check_complete_resend testcase - - - - Unexpected GMM Detach Request - SGSN_Tests.ttcn:MASKED SGSN_Tests control part - SGSN_Tests.ttcn:MASKED TC_hlr_location_cancel_request_update testcase - - + + @@ -56,6 +41,7 @@ + @@ -76,10 +62,5 @@ - - Unexpected GMM ID REQ (IMEI). - SGSN_Tests.ttcn:MASKED SGSN_Tests control part - SGSN_Tests.ttcn:MASKED TC_attach_gmm_attach_req_while_gmm_attach testcase - - + -- To view, visit https://gerrit.osmocom.org/11205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie08fb0b5a94728640f65f56430a217b51aea3dde Gerrit-Change-Number: 11205 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:01:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 08:01:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11204 ) Change subject: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() ...................................................................... Patch Set 1: (2 comments) Other than cosmetic issues, looks good. https://gerrit.osmocom.org/#/c/11204/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11204/1/bts/BTS_Tests.ttcn at 3753 PS1, Line 3753: RslLinkId link_id, I think we aren't using this format anywhere and was first a bit confusing to me. Please format parameters accordingly. https://gerrit.osmocom.org/#/c/11204/1/bts/BTS_Tests.ttcn at 3769 PS1, Line 3769: [] RSL.receive { repeat; } picky: Easier to read: Move this one up and leave timeout at the end. -- To view, visit https://gerrit.osmocom.org/11204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I08cb28dd9fa23f3ef8b0c9ede3d4c47f5702a1c1 Gerrit-Change-Number: 11204 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 03 Oct 2018 08:01:32 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:06:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:06:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11204 ) Change subject: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() ...................................................................... Patch Set 1: Code-Review-1 I agre with the cosmetic feedback from Pau, but that's not critical. What I think is more critical is that we ignore/accept *all* other messages on RSL for this lchan. This is way too tolerant. We should explicitly white-list only those messages that are actually permitted here, which as it seems right now are only measurement reports. Tests should be as tight as possible. -- To view, visit https://gerrit.osmocom.org/11204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I08cb28dd9fa23f3ef8b0c9ede3d4c47f5702a1c1 Gerrit-Change-Number: 11204 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 03 Oct 2018 08:06:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:10:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 08:10:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add timing offset tolerance module parameter to support real HW In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11083 to look at the new patch set (#6). Change subject: bts: Add timing offset tolerance module parameter to support real HW ...................................................................... bts: Add timing offset tolerance module parameter to support real HW When we don't use trxcon (ie we run real HW) we need to relax template matching when we receive UL measurements in that case. Change-Id: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b --- M bts/BTS_Tests.ttcn 1 file changed, 15 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/11083/6 -- To view, visit https://gerrit.osmocom.org/11083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:10:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 08:10:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Use f_L1CTL_PARAM to set expected ms power level for dummy MeasRep In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11149 to look at the new patch set (#2). Change subject: bts: Use f_L1CTL_PARAM to set expected ms power level for dummy MeasRep ...................................................................... bts: Use f_L1CTL_PARAM to set expected ms power level for dummy MeasRep If for whatever reason (eg. CPU scheduling saturation) the L1CTL cli (TTCN3) doesn't send Measurement Reports on time and no previous one is cached or has been erased by L1CTL_DM_REL_REQ, lower osmocombb layers will generate their own dummy Measurement Reports since SACCH must always be filled. Those dummy Measurement Reports are filled from parameters previosuly set using L1CTL_PARAM_REQ (implemented by f_L1CTL_PARAM() in TTCN3). Since that function is never called, we need to call it to set the expected MS power level values in case the cache is empty and we don't send expected values in case we don't send the Measurement Report through L1CTL on time. Change-Id: Ie1fd9cee3472c7aa6580f846d277f485d3401641 --- M bts/BTS_Tests.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/11149/2 -- To view, visit https://gerrit.osmocom.org/11149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie1fd9cee3472c7aa6580f846d277f485d3401641 Gerrit-Change-Number: 11149 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:12:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:12:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add timing offset tolerance module parameter to support real HW In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11083 ) Change subject: bts: Add timing offset tolerance module parameter to support real HW ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 03 Oct 2018 08:12:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:15:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:15:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L1CTL_Types: Add support to set L1 Header params during SACCH tx In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11147 ) Change subject: L1CTL_Types: Add support to set L1 Header params during SACCH tx ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11147/2/library/L1CTL_Types.ttcn File library/L1CTL_Types.ttcn: https://gerrit.osmocom.org/#/c/11147/2/library/L1CTL_Types.ttcn at 267 PS2, Line 267: type record SACCH_L1_HEADER { one could argue that this is not a L1CTL specific structure/type and should hence go into GSM_Types or some other place related to GSM specs and not L1CTL. I would probably put it in GSM_RR_Types. -- To view, visit https://gerrit.osmocom.org/11147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id014f790ee2ede8ae796c37b1c6b25c4af9034d2 Gerrit-Change-Number: 11147 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:15:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:15:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:15:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Use f_L1CTL_PARAM to set expected ms power level for dummy MeasRep In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11149 ) Change subject: bts: Use f_L1CTL_PARAM to set expected ms power level for dummy MeasRep ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie1fd9cee3472c7aa6580f846d277f485d3401641 Gerrit-Change-Number: 11149 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 03 Oct 2018 08:15:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:16:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:16:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: update expected-results In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11205 ) Change subject: sgsn: update expected-results ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie08fb0b5a94728640f65f56430a217b51aea3dde Gerrit-Change-Number: 11205 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:16:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:16:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:16:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: update expected-results In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11205 ) Change subject: sgsn: update expected-results ...................................................................... sgsn: update expected-results Change-Id: Ie08fb0b5a94728640f65f56430a217b51aea3dde --- M sgsn/expected-results.xml 1 file changed, 15 insertions(+), 34 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/sgsn/expected-results.xml b/sgsn/expected-results.xml index 459355a..3d9117f 100644 --- a/sgsn/expected-results.xml +++ b/sgsn/expected-results.xml @@ -1,30 +1,20 @@ - + - - Tguard timeout - SGSN_Tests.ttcn:MASKED SGSN_Tests control part - SGSN_Tests.ttcn:MASKED TC_attach_auth_sai_timeout testcase - - - - Tguard timeout - SGSN_Tests.ttcn:MASKED SGSN_Tests control part - SGSN_Tests.ttcn:MASKED TC_attach_auth_sai_reject testcase - - + + - Tguard timeout + SGSN_Tests.ttcn:MASKED SGSN_Tests control part SGSN_Tests.ttcn:MASKED TC_attach_gsup_lu_timeout testcase - Tguard timeout + SGSN_Tests.ttcn:MASKED SGSN_Tests control part SGSN_Tests.ttcn:MASKED TC_attach_gsup_lu_reject testcase @@ -35,20 +25,15 @@ - + + Non-matching VTY response: "" + SGSN_Tests.ttcn:MASKED SGSN_Tests control part + SGSN_Tests.ttcn:MASKED TC_attach_check_subscriber_list testcase + + - - Did not received GMM Attach Complete. - SGSN_Tests.ttcn:MASKED SGSN_Tests control part - SGSN_Tests.ttcn:MASKED TC_attach_check_complete_resend testcase - - - - Unexpected GMM Detach Request - SGSN_Tests.ttcn:MASKED SGSN_Tests control part - SGSN_Tests.ttcn:MASKED TC_hlr_location_cancel_request_update testcase - - + + @@ -56,6 +41,7 @@ + @@ -76,10 +62,5 @@ - - Unexpected GMM ID REQ (IMEI). - SGSN_Tests.ttcn:MASKED SGSN_Tests control part - SGSN_Tests.ttcn:MASKED TC_attach_gmm_attach_req_while_gmm_attach testcase - - + -- To view, visit https://gerrit.osmocom.org/11205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie08fb0b5a94728640f65f56430a217b51aea3dde Gerrit-Change-Number: 11205 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:19:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:19:35 +0000 Subject: Change in libosmo-abis[master]: ipacces: Log correct trx_nr during IPA GET In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11202 ) Change subject: ipacces: Log correct trx_nr during IPA GET ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I00b01790990c8d21fdbe0f5750fa02f13ddb2009 Gerrit-Change-Number: 11202 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:19:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:19:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:19:36 +0000 Subject: Change in libosmo-abis[master]: ipacces: Log correct trx_nr during IPA GET In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11202 ) Change subject: ipacces: Log correct trx_nr during IPA GET ...................................................................... ipacces: Log correct trx_nr during IPA GET dev->trx_id points to a structure used for whole BTS and doesn't point to related TRX ID, which is encoded in priv_nr. Change-Id: I00b01790990c8d21fdbe0f5750fa02f13ddb2009 --- M src/input/ipaccess.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 566fd64..f8e8e09 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -690,7 +690,7 @@ trx_nr = link->ofd->priv_nr - E1INP_SIGN_RSL; LOGP(DLINP, LOGL_NOTICE, "received ID get from %u/%u/%u\n", - dev->site_id, dev->bts_id, dev->trx_id); + dev->site_id, dev->bts_id, trx_nr); rmsg = ipa_bts_id_resp(dev, data + 1, len - 1, trx_nr); ret = ipa_send(link->ofd->fd, rmsg->data, rmsg->len); if (ret != rmsg->len) { -- To view, visit https://gerrit.osmocom.org/11202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I00b01790990c8d21fdbe0f5750fa02f13ddb2009 Gerrit-Change-Number: 11202 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:20:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:20:16 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: Fix missing Security Command for 3G when attaching In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11150 ) Change subject: gprs_gmm: Fix missing Security Command for 3G when attaching ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1e12b0a32e58c6f78dba7b548f7d7016567229db Gerrit-Change-Number: 11150 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 03 Oct 2018 08:20:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:24:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:24:13 +0000 Subject: Change in libosmocore[master]: mncc: Move definitions to header file In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11185 ) Change subject: mncc: Move definitions to header file ...................................................................... Patch Set 3: so in general, the most important goal is to keep as much as possible forward/backward compatibility. So we cannot introduce build breakage in osmo-sip-connector or any other related program. How that is solved, is left to the implementor. It could be different naming, it could be "#ifndef ..." clauses or whatever elegang or not so elegant solution one may come up with. the osmo_ prefix is generally required for new code/symbols/definitions going in libosmo*. However, if the code extends/adds to existing code/symbols already present, and those alrady present don't have an osmo-prefix, then way stay bug-compatible to the old code. So e.g. if gsm48_* functions are extended with a new function, the new one also just starts with gsm48_. -- To view, visit https://gerrit.osmocom.org/11185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62bc025369bd9ee9b134e064a8364aa4bd5de16e Gerrit-Change-Number: 11185 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 03 Oct 2018 08:24:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:24:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:24:44 +0000 Subject: Change in osmo-trx[master]: Transciever: Log values causing Tx underrun In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11200 ) Change subject: Transciever: Log values causing Tx underrun ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11200 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I68e18075eade55034567d96fc774d00a794afeeb Gerrit-Change-Number: 11200 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:24:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:24:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:24:45 +0000 Subject: Change in osmo-trx[master]: Transciever: Log values causing Tx underrun In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11200 ) Change subject: Transciever: Log values causing Tx underrun ...................................................................... Transciever: Log values causing Tx underrun Change-Id: I68e18075eade55034567d96fc774d00a794afeeb --- M Transceiver52M/Transceiver.cpp 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 076db3e..d6ddce8 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -1001,7 +1001,8 @@ // only update latency at the defined frame interval if (radioClock->get() > mLatencyUpdateTime + GSM::Time(USB_LATENCY_INTRVL)) { mTransmitLatency = mTransmitLatency + GSM::Time(1,0); - LOG(INFO) << "new latency: " << mTransmitLatency; + LOG(INFO) << "new latency: " << mTransmitLatency << " (underrun " + << radioClock->get() << " vs " << mLatencyUpdateTime + GSM::Time(USB_LATENCY_INTRVL) << ")"; mLatencyUpdateTime = radioClock->get(); } } -- To view, visit https://gerrit.osmocom.org/11200 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I68e18075eade55034567d96fc774d00a794afeeb Gerrit-Change-Number: 11200 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:25:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:25:34 +0000 Subject: Change in osmo-gsm-tester[master]: Make code copying inst through ssh generic In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11190 ) Change subject: Make code copying inst through ssh generic ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I838b999528695207e1147cfe76e6f7aaf3b1dd53 Gerrit-Change-Number: 11190 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:25:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:25:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:25:38 +0000 Subject: Change in osmo-gsm-tester[master]: osmotrx: Allow running osmo-trx from remote host In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11191 ) Change subject: osmotrx: Allow running osmo-trx from remote host ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11191 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia31ac8eb41e02eda28d9f6f56774679300244ee8 Gerrit-Change-Number: 11191 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:25:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:25:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:25:50 +0000 Subject: Change in osmo-gsm-tester[master]: osmotrx: Make sure remote process stops after ssh session is closed In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11192 ) Change subject: osmotrx: Make sure remote process stops after ssh session is closed ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic334a54b1a1827d74fe0b453ac32bb77b8616147 Gerrit-Change-Number: 11192 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:25:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:26:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:26:00 +0000 Subject: Change in osmo-gsm-tester[master]: bts_osmo: Only check for socket path in ready_for_pcu() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11195 ) Change subject: bts_osmo: Only check for socket path in ready_for_pcu() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3aa6bef0c4893bdcac668002ca018af019f666a3 Gerrit-Change-Number: 11195 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:26:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:26:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:26:07 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf.prod: Use specific remote machine to run osmo-trx In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11196 ) Change subject: resources.conf.prod: Use specific remote machine to run osmo-trx ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0479643789783d5e8a142042a65c4d53020d1e79 Gerrit-Change-Number: 11196 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:26:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:26:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:26:23 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-trx: Enable multi_arfcn for B200 and only in multiTRX setup In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11197 ) Change subject: osmo-trx: Enable multi_arfcn for B200 and only in multiTRX setup ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6a29e1813f0603b00b49b7b7c805be23a72cf0e3 Gerrit-Change-Number: 11197 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:26:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:27:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:27:16 +0000 Subject: Change in osmo-sip-connector[master]: call.h: fix spaces usage instead of tabs In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11198 ) Change subject: call.h: fix spaces usage instead of tabs ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11198/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11198/1//COMMIT_MSG at 7 PS1, Line 7: call.h: fix spaces usage instead of tabs we typically include "cosmetic:" or so in the commit subject for changes that don't chagne the logic. -- To view, visit https://gerrit.osmocom.org/11198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1ae638af50fa3741e84e421687270d2177e1be2d Gerrit-Change-Number: 11198 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 03 Oct 2018 08:27:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:28:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:28:18 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Further use of osmo_mncc_name() in logging In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11193 ) Change subject: Logging: Further use of osmo_mncc_name() in logging ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic77e0d86c91c29ff7304e620fdecb69b22127d33 Gerrit-Change-Number: 11193 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:28:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:28:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:28:20 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Further use of osmo_mncc_name() in logging In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11193 ) Change subject: Logging: Further use of osmo_mncc_name() in logging ...................................................................... Logging: Further use of osmo_mncc_name() in logging Use osmo_mncc_name() in timer functions and in logging the type of MNCC message sent to the socket. Change-Id: Ic77e0d86c91c29ff7304e620fdecb69b22127d33 --- M src/mncc.c 1 file changed, 6 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/mncc.c b/src/mncc.c index 1b44e05..976a671 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -65,20 +65,21 @@ leg->cmd_timeout.cb = cmd_timeout; leg->cmd_timeout.data = leg; + LOGP(DMNCC, LOGL_DEBUG, "Starting Timer for %s\n", osmo_mncc_name(expected_next)); osmo_timer_schedule(&leg->cmd_timeout, 5, 0); } static void stop_cmd_timer(struct mncc_call_leg *leg, uint32_t got_res) { if (leg->rsp_wanted != got_res) { - LOGP(DMNCC, LOGL_ERROR, "Wanted rsp(%u) but got(%u) for leg(%u)\n", - leg->rsp_wanted, got_res, leg->callref); + LOGP(DMNCC, LOGL_ERROR, "Wanted rsp(%s) but got(%s) for leg(%u)\n", + osmo_mncc_name(leg->rsp_wanted), osmo_mncc_name(got_res), leg->callref); return; } LOGP(DMNCC, LOGL_DEBUG, - "Got response(0x%x), stopping timer on leg(%u)\n", - got_res, leg->callref); + "Got response(%s), stopping timer on leg(%u)\n", + osmo_mncc_name(got_res), leg->callref); osmo_timer_del(&leg->cmd_timeout); } @@ -127,6 +128,7 @@ * static struct? */ rc = write(conn->fd.fd, mncc, sizeof(*mncc)); + LOGP(DMNCC, LOGL_DEBUG, "MNCC sent message type: %s\n", osmo_mncc_name(mncc->msg_type)); if (rc != sizeof(*mncc)) { LOGP(DMNCC, LOGL_ERROR, "Failed to send message call(%u)\n", callref); close_connection(conn); -- To view, visit https://gerrit.osmocom.org/11193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic77e0d86c91c29ff7304e620fdecb69b22127d33 Gerrit-Change-Number: 11193 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:30:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:30:02 +0000 Subject: Change in osmo-gsm-manuals[master]: running: Add note about DTMF support In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11169 ) Change subject: running: Add note about DTMF support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I578e50b0a42d88b05cf6da80443b71494b5eb26f Gerrit-Change-Number: 11169 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:30:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:30:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:30:10 +0000 Subject: Change in osmo-gsm-manuals[master]: mncc: add missing DTMF message types. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11170 ) Change subject: mncc: add missing DTMF message types. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4251b296e043e7583518d6672e614b376331d25e Gerrit-Change-Number: 11170 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:30:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:30:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:30:20 +0000 Subject: Change in osmo-gsm-manuals[master]: mncc: add note about DTMF considerations In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11171 ) Change subject: mncc: add note about DTMF considerations ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iedcf4ad5e0e4697c6a05ebdd4f43173c14c7c448 Gerrit-Change-Number: 11171 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:30:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:30:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:30:21 +0000 Subject: Change in osmo-gsm-manuals[master]: running: Add note about DTMF support In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11169 ) Change subject: running: Add note about DTMF support ...................................................................... running: Add note about DTMF support osmo-sip-connector does not yet support full DTMF support. The current implementation only supports DTMF tones to be send from MNCC to SIP, but not in the opposite direction. Change-Id: I578e50b0a42d88b05cf6da80443b71494b5eb26f Related: OS#2777 --- M OsmoSIPConnector/chapters/running.adoc 1 file changed, 26 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/OsmoSIPConnector/chapters/running.adoc b/OsmoSIPConnector/chapters/running.adoc index 5e0d583..85ccddc 100644 --- a/OsmoSIPConnector/chapters/running.adoc +++ b/OsmoSIPConnector/chapters/running.adoc @@ -56,3 +56,29 @@ socket-path /tmp/msc2_mncc ---- +=== DTMF signaling + +In VoIP based telephony networks DTMF (Dual-tone multi-frequency signaling) can +be signaled through multiple methods. Common methods are in-band, RFC2833 and +sip-info messages. + +Osmo-sip-connector is using sip-info messages to signal DTMF tones. When a DTMF +tone is signaled at the MNCC socket interface, osmo-sip-connector will generate +a matching sip-info message to forward the DTMF signal to the PBX. Depending on +the PBX software reconfiguring the DTMF signaling method to sip-info may be +necessary. + +While sending DTMF tones through the MNCC interface to a SIP leg, the current +implementation of osmo-sip-connector does not support sending DTMF tones in the +opposite direction. Any attempts to send DTMF tones to an MNCC leg will be +confirmed with a status 405 "Method not allowed". + +The reason for this limitation is that in mobile networks, depending on the +signaling direction, the signaling of DTMF tones is implemented differently. +A mobile originated DTMF tone is signaled through out of band messages, +which arrive at osmo-sip-connector on as MNCC DTMF START/STOP messages. Those +messages can be directly translated to sip-info messages. However, in the +other direction (mobile terminated), an in-band signaling method is used. This +means that osmo-sip-connector would have to translate an incoming DTMF sip-info +message into an audio sample that then would have to be injected into the +voice stream. Currently this scheme is not implemented in osmo-sip-connector. \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/11169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I578e50b0a42d88b05cf6da80443b71494b5eb26f Gerrit-Change-Number: 11169 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:30:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:30:21 +0000 Subject: Change in osmo-gsm-manuals[master]: mncc: add missing DTMF message types. In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11170 ) Change subject: mncc: add missing DTMF message types. ...................................................................... mncc: add missing DTMF message types. The list that describes the MNCC message types lacks the message types used for DTMF. Change-Id: I4251b296e043e7583518d6672e614b376331d25e Related: OS#2777 --- M common/chapters/mncc.adoc 1 file changed, 30 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/common/chapters/mncc.adoc b/common/chapters/mncc.adoc index 4f098e6..8825be3 100644 --- a/common/chapters/mncc.adoc +++ b/common/chapters/mncc.adoc @@ -220,3 +220,33 @@ Indicate that no valid voice frame, but a 'bad frame' was received over the radio link from the MS. + +==== MNCC_START_DTMF_IND + +Direction: {program-name} -> Handler + +Indicate the beginning of a DTMF tone playback. + +==== MNCC_START_DTMF_RSP + +Direction: Handler -> {program-name} + +Acknowledge that the DTMF tone playback has been started. + +==== MNCC_START_DTMF_REJ + +Direction: both + +Indicate that starting a DTMF tone playback was not possible. + +==== MNCC_STOP_DTMF_IND + +Direction: {program-name} -> Handler + +Indicate the ending of a DTMF tone playback. + +==== MNCC_STOP_DTMF_RSP + +Direction: Handler -> {program-name} + +Acknowledge that the DTMF tone playback has been stopped. -- To view, visit https://gerrit.osmocom.org/11170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4251b296e043e7583518d6672e614b376331d25e Gerrit-Change-Number: 11170 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:30:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:30:22 +0000 Subject: Change in osmo-gsm-manuals[master]: mncc: add note about DTMF considerations In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11171 ) Change subject: mncc: add note about DTMF considerations ...................................................................... mncc: add note about DTMF considerations Add an informative note on how DTMF signalling is done in mobile networks and mention the limitations regarding DTMF, when internal MNCC is used. Change-Id: Iedcf4ad5e0e4697c6a05ebdd4f43173c14c7c448 Related: OS#2777 --- M common/chapters/mncc.adoc 1 file changed, 26 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/common/chapters/mncc.adoc b/common/chapters/mncc.adoc index 8825be3..3adbf7f 100644 --- a/common/chapters/mncc.adoc +++ b/common/chapters/mncc.adoc @@ -60,6 +60,32 @@ Router. More widespread integration of external call routing is available via the OsmoSIPConnector. + +=== DTMF considerations + +In mobile networks, the signaling of DTMF tones is implemented differently, +depending on the signaling direction. A mobile originated DTMF tone is +signaled using START/STOP DTMF messages which are hauled through various +protocols upwards into the core network. + +Contrary to that, a mobile terminated DTMF tone is not transfered as an out of +band message. Instead, in-band signaling is used, which means a tone is injected +early inside a PBX or MGW. + +When using {program-name} with its built in MNCC functionality a mobile +originated DTMF message will not be translated into an in-band tone. Therefore, +sending DTMF will not work when internal MNCC is used. + +For external MNCC, the network integrator must make sure that the back-end +components are configured properly in order to handle the two different +signaling schemes depending on the signaling direction. + +NOTE: osmo-sip-connector will translate MNCC DTMF signaling into sip-info +messages. DTMF signaling in the opposite direction is not possible. +osmo-sip-connector will reject sip-info messages that attempt to signal +a DTMF tone. + + === MNCC protocol description The protocol follows the primitives specified in 3GPP TS 04.07 Chapter 7.1. -- To view, visit https://gerrit.osmocom.org/11171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iedcf4ad5e0e4697c6a05ebdd4f43173c14c7c448 Gerrit-Change-Number: 11171 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:30:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:30:55 +0000 Subject: Change in osmocom-bb[master]: layer23/app_ccch_scan.c: clean up copy-pasted code In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11172 ) Change subject: layer23/app_ccch_scan.c: clean up copy-pasted code ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7c2f47cbc825a5e5a50863d842729d3d8408b9dd Gerrit-Change-Number: 11172 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:30:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:31:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:31:15 +0000 Subject: Change in osmocom-bb[master]: layer23/app_ccch_scan.c: print 'new-line' char locally In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11173 ) Change subject: layer23/app_ccch_scan.c: print 'new-line' char locally ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I03da1329501ce9b3c5cca49a1654ba68e9bb6a98 Gerrit-Change-Number: 11173 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:31:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:32:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:32:04 +0000 Subject: Change in osmocom-bb[master]: layer23/app_ccch_scan.c: clean up System Information handling In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11174 ) Change subject: layer23/app_ccch_scan.c: clean up System Information handling ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8c2594920fcad8a3e346b938bd0c20409f4d01c9 Gerrit-Change-Number: 11174 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:32:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:32:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:32:13 +0000 Subject: Change in osmocom-bb[master]: layer23/app_ccch_scan.c: print pdisc in error message In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11175 ) Change subject: layer23/app_ccch_scan.c: print pdisc in error message ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic88f5d4b263610a376bbb9729e882097393ef2be Gerrit-Change-Number: 11175 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:32:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:32:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:32:21 +0000 Subject: Change in osmocom-bb[master]: layer23/app_ccch_scan.c: hexdump unhandled PCH/AGCH messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11176 ) Change subject: layer23/app_ccch_scan.c: hexdump unhandled PCH/AGCH messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I81d6558525e7f68c4fcd6c6272224d58532e2efb Gerrit-Change-Number: 11176 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:32:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:32:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:32:36 +0000 Subject: Change in osmocom-bb[master]: layer23/app_ccch_scan.c: omit dummy (fill) frames In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11177 ) Change subject: layer23/app_ccch_scan.c: omit dummy (fill) frames ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6ccecb1a78bdac3e467bdc14b7a01afbe17aa53c Gerrit-Change-Number: 11177 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:32:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:32:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:32:38 +0000 Subject: Change in osmocom-bb[master]: layer23/app_ccch_scan.c: clean up copy-pasted code In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11172 ) Change subject: layer23/app_ccch_scan.c: clean up copy-pasted code ...................................................................... layer23/app_ccch_scan.c: clean up copy-pasted code By definition, 'ccch_scan' application is intended to be used for monitoring of CCCH channels on C0/TS0. There is no need to send RACH requests, therefore there is no need to care about the mobile allocation from SI1 message. Most likely, this "dead" code was copy-pasted from mobile application. Let's clean it up! Change-Id: I7c2f47cbc825a5e5a50863d842729d3d8408b9dd --- M src/host/layer23/src/misc/app_ccch_scan.c 1 file changed, 1 insertion(+), 47 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/src/misc/app_ccch_scan.c b/src/host/layer23/src/misc/app_ccch_scan.c index f92b13b..d8cb912 100644 --- a/src/host/layer23/src/misc/app_ccch_scan.c +++ b/src/host/layer23/src/misc/app_ccch_scan.c @@ -42,14 +42,9 @@ #include static struct { - int has_si1; int ccch_mode; - int ccch_enabled; - int rach_count; - struct gsm_sysinfo_freq cell_arfcns[1024]; } app_state; - static void dump_bcch(struct osmocom_ms *ms, uint8_t tc, const uint8_t *data) { struct gsm48_system_information_type_header *si_hdr; @@ -62,18 +57,6 @@ if (tc != 0) LOGP(DRR, LOGL_ERROR, "SI1 on the wrong TC: %d\n", tc); #endif - if (!app_state.has_si1) { - struct gsm48_system_information_type_1 *si1 = - (struct gsm48_system_information_type_1 *)data; - - gsm48_decode_freq_list(app_state.cell_arfcns, - si1->cell_channel_description, - sizeof(si1->cell_channel_description), - 0xff, 0x01); - - app_state.has_si1 = 1; - LOGP(DRR, LOGL_ERROR, "SI1 received.\n"); - } break; case GSM48_MT_RR_SYSINFO_2: #ifdef BCCH_TC_CHECK @@ -182,8 +165,6 @@ if (ia->page_mode & 0xf0) return 0; - /* FIXME: compare RA and GSM time with when we sent RACH req */ - rsl_dec_chan_nr(ia->chan_desc.chan_nr, &ch_type, &ch_subch, &ch_ts); if (!ia->chan_desc.h0.h) { @@ -199,9 +180,7 @@ } else { /* Hopping */ - uint8_t maio, hsn, ma_len; - uint16_t ma[64], arfcn; - int i, j, k; + uint8_t maio, hsn; hsn = ia->chan_desc.h1.hsn; maio = ia->chan_desc.h1.maio_low | (ia->chan_desc.h1.maio_high << 2); @@ -210,19 +189,6 @@ "HSN=%u, MAIO=%u, TS=%u, SS=%u, TSC=%u) ", ia->req_ref.ra, ia->chan_desc.chan_nr, hsn, maio, ch_ts, ch_subch, ia->chan_desc.h1.tsc); - - /* decode mobile allocation */ - ma_len = 0; - for (i=1, j=0; i<=1024; i++) { - arfcn = i & 1023; - if (app_state.cell_arfcns[arfcn].mask & 0x01) { - k = ia->mob_alloc_len - (j>>3) - 1; - if (ia->mob_alloc[k] & (1 << (j&7))) { - ma[ma_len++] = arfcn; - } - j++; - } - } } LOGPC(DRR, LOGL_NOTICE, "\n"); @@ -449,25 +415,13 @@ //dump_bcch(dl->time.tc, ccch->data); dump_bcch(ms, 0, msg->l3h); - /* Req channel logic */ - if (app_state.ccch_enabled && (app_state.rach_count < 2)) { - l1ctl_tx_rach_req(ms, app_state.rach_count, 0, - app_state.ccch_mode == CCCH_MODE_COMBINED); - app_state.rach_count++; - } - return 0; } void layer3_app_reset(void) { /* Reset state */ - app_state.has_si1 = 0; app_state.ccch_mode = CCCH_MODE_NONE; - app_state.ccch_enabled = 0; - app_state.rach_count = 0; - - memset(&app_state.cell_arfcns, 0x00, sizeof(app_state.cell_arfcns)); } static int signal_cb(unsigned int subsys, unsigned int signal, -- To view, visit https://gerrit.osmocom.org/11172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7c2f47cbc825a5e5a50863d842729d3d8408b9dd Gerrit-Change-Number: 11172 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:32:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:32:38 +0000 Subject: Change in osmocom-bb[master]: layer23/app_ccch_scan.c: print 'new-line' char locally In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11173 ) Change subject: layer23/app_ccch_scan.c: print 'new-line' char locally ...................................................................... layer23/app_ccch_scan.c: print 'new-line' char locally Change-Id: I03da1329501ce9b3c5cca49a1654ba68e9bb6a98 --- M src/host/layer23/src/misc/app_ccch_scan.c 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/src/misc/app_ccch_scan.c b/src/host/layer23/src/misc/app_ccch_scan.c index d8cb912..31b72f8 100644 --- a/src/host/layer23/src/misc/app_ccch_scan.c +++ b/src/host/layer23/src/misc/app_ccch_scan.c @@ -174,7 +174,7 @@ arfcn = ia->chan_desc.h0.arfcn_low | (ia->chan_desc.h0.arfcn_high << 8); LOGP(DRR, LOGL_NOTICE, "GSM48 IMM ASS (ra=0x%02x, chan_nr=0x%02x, " - "ARFCN=%u, TS=%u, SS=%u, TSC=%u) ", ia->req_ref.ra, + "ARFCN=%u, TS=%u, SS=%u, TSC=%u)\n", ia->req_ref.ra, ia->chan_desc.chan_nr, arfcn, ch_ts, ch_subch, ia->chan_desc.h0.tsc); @@ -186,12 +186,11 @@ maio = ia->chan_desc.h1.maio_low | (ia->chan_desc.h1.maio_high << 2); LOGP(DRR, LOGL_NOTICE, "GSM48 IMM ASS (ra=0x%02x, chan_nr=0x%02x, " - "HSN=%u, MAIO=%u, TS=%u, SS=%u, TSC=%u) ", ia->req_ref.ra, + "HSN=%u, MAIO=%u, TS=%u, SS=%u, TSC=%u)\n", ia->req_ref.ra, ia->chan_desc.chan_nr, hsn, maio, ch_ts, ch_subch, ia->chan_desc.h1.tsc); } - LOGPC(DRR, LOGL_NOTICE, "\n"); return 0; } -- To view, visit https://gerrit.osmocom.org/11173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I03da1329501ce9b3c5cca49a1654ba68e9bb6a98 Gerrit-Change-Number: 11173 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:32:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:32:38 +0000 Subject: Change in osmocom-bb[master]: layer23/app_ccch_scan.c: clean up System Information handling In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11174 ) Change subject: layer23/app_ccch_scan.c: clean up System Information handling ...................................................................... layer23/app_ccch_scan.c: clean up System Information handling Change-Id: I8c2594920fcad8a3e346b938bd0c20409f4d01c9 --- M src/host/layer23/src/misc/app_ccch_scan.c 1 file changed, 98 insertions(+), 93 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/src/misc/app_ccch_scan.c b/src/host/layer23/src/misc/app_ccch_scan.c index 31b72f8..49adee9 100644 --- a/src/host/layer23/src/misc/app_ccch_scan.c +++ b/src/host/layer23/src/misc/app_ccch_scan.c @@ -45,108 +45,113 @@ int ccch_mode; } app_state; +static int bcch_check_tc(uint8_t si_type, uint8_t tc) +{ + /* FIXME: there is no tc information (always 0) */ + return 0; + + switch (si_type) { + case GSM48_MT_RR_SYSINFO_1: + if (tc != 0) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_2: + if (tc != 1) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_3: + if (tc != 2 && tc != 6) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_4: + if (tc != 3 && tc != 7) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_7: + if (tc != 7) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_8: + if (tc != 3) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_9: + if (tc != 4) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_13: + if (tc != 4 && tc != 0) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_16: + if (tc != 6) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_17: + if (tc != 2) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_2bis: + if (tc != 5) + return -EINVAL; + break; + case GSM48_MT_RR_SYSINFO_2ter: + if (tc != 5 && tc != 4) + return -EINVAL; + break; + + /* The following types are used on SACCH only */ + case GSM48_MT_RR_SYSINFO_5: + case GSM48_MT_RR_SYSINFO_6: + case GSM48_MT_RR_SYSINFO_5bis: + case GSM48_MT_RR_SYSINFO_5ter: + break; + + /* Unknown SI type */ + default: + LOGP(DRR, LOGL_INFO, "Unknown SI (type=0x%02x)\n", si_type); + return -ENOTSUP; + }; + + return 0; +} + +static void handle_si3(struct osmocom_ms *ms, + struct gsm48_system_information_type_3 *si) +{ + if (app_state.ccch_mode != CCCH_MODE_NONE) + return; + + if (si->control_channel_desc.ccch_conf == RSL_BCCH_CCCH_CONF_1_C) + app_state.ccch_mode = CCCH_MODE_COMBINED; + else + app_state.ccch_mode = CCCH_MODE_NON_COMBINED; + + l1ctl_tx_ccch_mode_req(ms, app_state.ccch_mode); +} + static void dump_bcch(struct osmocom_ms *ms, uint8_t tc, const uint8_t *data) { struct gsm48_system_information_type_header *si_hdr; si_hdr = (struct gsm48_system_information_type_header *) data; + uint8_t si_type = si_hdr->system_information; + + LOGP(DRR, LOGL_INFO, "BCCH message (type=0x%02x): %s\n", + si_type, gsm48_rr_msg_name(si_type)); + + if (bcch_check_tc(si_type, tc) == -EINVAL) + LOGP(DRR, LOGL_INFO, "SI on wrong tc=%u\n", tc); /* GSM 05.02 ?6.3.1.3 Mapping of BCCH data */ - switch (si_hdr->system_information) { - case GSM48_MT_RR_SYSINFO_1: -#ifdef BCCH_TC_CHECK - if (tc != 0) - LOGP(DRR, LOGL_ERROR, "SI1 on the wrong TC: %d\n", tc); -#endif - break; - case GSM48_MT_RR_SYSINFO_2: -#ifdef BCCH_TC_CHECK - if (tc != 1) - LOGP(DRR, LOGL_ERROR, "SI2 on the wrong TC: %d\n", tc); -#endif - break; + switch (si_type) { case GSM48_MT_RR_SYSINFO_3: -#ifdef BCCH_TC_CHECK - if (tc != 2 && tc != 6) - LOGP(DRR, LOGL_ERROR, "SI3 on the wrong TC: %d\n", tc); -#endif - if (app_state.ccch_mode == CCCH_MODE_NONE) { - struct gsm48_system_information_type_3 *si3 = - (struct gsm48_system_information_type_3 *)data; + handle_si3(ms, + (struct gsm48_system_information_type_3 *) data); + break; - if (si3->control_channel_desc.ccch_conf == RSL_BCCH_CCCH_CONF_1_C) - app_state.ccch_mode = CCCH_MODE_COMBINED; - else - app_state.ccch_mode = CCCH_MODE_NON_COMBINED; - - l1ctl_tx_ccch_mode_req(ms, app_state.ccch_mode); - } - break; - case GSM48_MT_RR_SYSINFO_4: -#ifdef BCCH_TC_CHECK - if (tc != 3 && tc != 7) - LOGP(DRR, LOGL_ERROR, "SI4 on the wrong TC: %d\n", tc); -#endif - break; - case GSM48_MT_RR_SYSINFO_5: - break; - case GSM48_MT_RR_SYSINFO_6: - break; - case GSM48_MT_RR_SYSINFO_7: -#ifdef BCCH_TC_CHECK - if (tc != 7) - LOGP(DRR, LOGL_ERROR, "SI7 on the wrong TC: %d\n", tc); -#endif - break; - case GSM48_MT_RR_SYSINFO_8: -#ifdef BCCH_TC_CHECK - if (tc != 3) - LOGP(DRR, LOGL_ERROR, "SI8 on the wrong TC: %d\n", tc); -#endif - break; - case GSM48_MT_RR_SYSINFO_9: -#ifdef BCCH_TC_CHECK - if (tc != 4) - LOGP(DRR, LOGL_ERROR, "SI9 on the wrong TC: %d\n", tc); -#endif - break; - case GSM48_MT_RR_SYSINFO_13: -#ifdef BCCH_TC_CHECK - if (tc != 4 && tc != 0) - LOGP(DRR, LOGL_ERROR, "SI13 on the wrong TC: %d\n", tc); -#endif - break; - case GSM48_MT_RR_SYSINFO_16: -#ifdef BCCH_TC_CHECK - if (tc != 6) - LOGP(DRR, LOGL_ERROR, "SI16 on the wrong TC: %d\n", tc); -#endif - break; - case GSM48_MT_RR_SYSINFO_17: -#ifdef BCCH_TC_CHECK - if (tc != 2) - LOGP(DRR, LOGL_ERROR, "SI17 on the wrong TC: %d\n", tc); -#endif - break; - case GSM48_MT_RR_SYSINFO_2bis: -#ifdef BCCH_TC_CHECK - if (tc != 5) - LOGP(DRR, LOGL_ERROR, "SI2bis on the wrong TC: %d\n", tc); -#endif - break; - case GSM48_MT_RR_SYSINFO_2ter: -#ifdef BCCH_TC_CHECK - if (tc != 5 && tc != 4) - LOGP(DRR, LOGL_ERROR, "SI2ter on the wrong TC: %d\n", tc); -#endif - break; - case GSM48_MT_RR_SYSINFO_5bis: - break; - case GSM48_MT_RR_SYSINFO_5ter: - break; default: - LOGP(DRR, LOGL_ERROR, "Unknown SI: %d\n", - si_hdr->system_information); - break; + /* We don't care about other types of SI */ + break; /* thus there is nothing to do */ }; } -- To view, visit https://gerrit.osmocom.org/11174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8c2594920fcad8a3e346b938bd0c20409f4d01c9 Gerrit-Change-Number: 11174 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:32:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:32:39 +0000 Subject: Change in osmocom-bb[master]: layer23/app_ccch_scan.c: print pdisc in error message In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11175 ) Change subject: layer23/app_ccch_scan.c: print pdisc in error message ...................................................................... layer23/app_ccch_scan.c: print pdisc in error message Change-Id: Ic88f5d4b263610a376bbb9729e882097393ef2be --- M src/host/layer23/src/misc/app_ccch_scan.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/src/misc/app_ccch_scan.c b/src/host/layer23/src/misc/app_ccch_scan.c index 49adee9..5727174 100644 --- a/src/host/layer23/src/misc/app_ccch_scan.c +++ b/src/host/layer23/src/misc/app_ccch_scan.c @@ -382,7 +382,8 @@ int rc = 0; if (sih->rr_protocol_discriminator != GSM48_PDISC_RR) - LOGP(DRR, LOGL_ERROR, "PCH pdisc != RR\n"); + LOGP(DRR, LOGL_ERROR, "PCH pdisc (%s) != RR\n", + gsm48_pdisc_name(sih->rr_protocol_discriminator)); switch (sih->system_information) { case GSM48_MT_RR_PAG_REQ_1: -- To view, visit https://gerrit.osmocom.org/11175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic88f5d4b263610a376bbb9729e882097393ef2be Gerrit-Change-Number: 11175 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:32:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:32:39 +0000 Subject: Change in osmocom-bb[master]: layer23/app_ccch_scan.c: hexdump unhandled PCH/AGCH messages In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11176 ) Change subject: layer23/app_ccch_scan.c: hexdump unhandled PCH/AGCH messages ...................................................................... layer23/app_ccch_scan.c: hexdump unhandled PCH/AGCH messages Change-Id: I81d6558525e7f68c4fcd6c6272224d58532e2efb --- M src/host/layer23/src/misc/app_ccch_scan.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/src/misc/app_ccch_scan.c b/src/host/layer23/src/misc/app_ccch_scan.c index 5727174..3a55226 100644 --- a/src/host/layer23/src/misc/app_ccch_scan.c +++ b/src/host/layer23/src/misc/app_ccch_scan.c @@ -405,8 +405,9 @@ /* wireshark know that this is SI2 quater and for 3G interop */ break; default: - LOGP(DRR, LOGL_NOTICE, "unknown PCH/AGCH type 0x%02x\n", - sih->system_information); + LOGP(DRR, LOGL_NOTICE, "Unknown PCH/AGCH message " + "(type 0x%02x): %s\n", sih->system_information, + msgb_hexdump_l3(msg)); rc = -EINVAL; } -- To view, visit https://gerrit.osmocom.org/11176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I81d6558525e7f68c4fcd6c6272224d58532e2efb Gerrit-Change-Number: 11176 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:32:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:32:39 +0000 Subject: Change in osmocom-bb[master]: layer23/app_ccch_scan.c: omit dummy (fill) frames In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11177 ) Change subject: layer23/app_ccch_scan.c: omit dummy (fill) frames ...................................................................... layer23/app_ccch_scan.c: omit dummy (fill) frames In some conditions it's required to maintain continuous burst transmission (e.g. on C0). If there is nothing to transmit at a given moment, either a LAPDm func=UI fill frame, or a "dummy" Paging Request is used. In case of 'ccch_scan' application, they are useless. Let's detect and omit them. Change-Id: I6ccecb1a78bdac3e467bdc14b7a01afbe17aa53c --- M src/host/layer23/src/misc/app_ccch_scan.c 1 file changed, 32 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/src/misc/app_ccch_scan.c b/src/host/layer23/src/misc/app_ccch_scan.c index 3a55226..88a2bef 100644 --- a/src/host/layer23/src/misc/app_ccch_scan.c +++ b/src/host/layer23/src/misc/app_ccch_scan.c @@ -376,11 +376,43 @@ return 0; } +/* Dummy Paging Request 1 with "no identity" */ +static const uint8_t paging_fill[] = { + 0x15, 0x06, 0x21, 0x00, 0x01, 0xf0, 0x2b, + /* The rest part may be randomized */ +}; + +/* LAPDm func=UI fill frame (for the BTS side) */ +static const uint8_t lapdm_fill[] = { + 0x03, 0x03, 0x01, 0x2b, + /* The rest part may be randomized */ +}; + +/* TODO: share / generalize this code */ +static bool is_fill_frame(struct msgb *msg) +{ + size_t l2_len = msgb_l3len(msg); + uint8_t *l2 = msgb_l3(msg); + + OSMO_ASSERT(l2_len == GSM_MACBLOCK_LEN); + + if (!memcmp(l2, paging_fill, sizeof(paging_fill))) + return true; + if (!memcmp(l2, lapdm_fill, sizeof(lapdm_fill))) + return true; + + return false; +} + int gsm48_rx_ccch(struct msgb *msg, struct osmocom_ms *ms) { struct gsm48_system_information_type_header *sih = msgb_l3(msg); int rc = 0; + /* Skip dummy (fill) frames */ + if (is_fill_frame(msg)) + return 0; + if (sih->rr_protocol_discriminator != GSM48_PDISC_RR) LOGP(DRR, LOGL_ERROR, "PCH pdisc (%s) != RR\n", gsm48_pdisc_name(sih->rr_protocol_discriminator)); -- To view, visit https://gerrit.osmocom.org/11177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6ccecb1a78bdac3e467bdc14b7a01afbe17aa53c Gerrit-Change-Number: 11177 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:33:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:33:18 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_lchan_desc.c: fix wrong chan_nr for PDCH In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11178 ) Change subject: trxcon/sched_lchan_desc.c: fix wrong chan_nr for PDCH ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I11925408d6e63baf1eac880839ecd717843fba6a Gerrit-Change-Number: 11178 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:33:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:33:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:33:43 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: properly handle indicated CCCH mode In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11179 ) Change subject: trxcon/l1ctl.c: properly handle indicated CCCH mode ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11179 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I75e3b8deac1da296efb178e65ff6992b5c407b80 Gerrit-Change-Number: 11179 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:33:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:34:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:34:06 +0000 Subject: Change in osmocom-bb[master]: firmware/layer1: inform about unhandled scheduler tasks In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11180 ) Change subject: firmware/layer1: inform about unhandled scheduler tasks ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I34587b6c67015513de35d85a7a3291f452ee7f3b Gerrit-Change-Number: 11180 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:34:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:35:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:35:48 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: add CCCH/SDCCH mframe layouts with CBCH In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11182 ) Change subject: trxcon/scheduler: add CCCH/SDCCH mframe layouts with CBCH ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iad9905fc3a8a012ff1ada26ff95af384816f9873 Gerrit-Change-Number: 11182 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:35:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:36:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:36:32 +0000 Subject: Change in osmocom-bb[master]: l1ctl_proto.h: extend ccch_mode enum with CBCH In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11183 ) Change subject: l1ctl_proto.h: extend ccch_mode enum with CBCH ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia94ebf22a2ec439dfe1f31d703b832ae57b48ef2 Gerrit-Change-Number: 11183 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:36:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:37:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:37:05 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: add dedicated CBCH mode support In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11184 ) Change subject: trxcon/scheduler: add dedicated CBCH mode support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9347c45638223cac34f4b48eb736e51a5055a36f Gerrit-Change-Number: 11184 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 08:37:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:37:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:37:09 +0000 Subject: Change in osmocom-bb[master]: firmware/layer1: add scheduler tasks for CBCH In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11181 ) Change subject: firmware/layer1: add scheduler tasks for CBCH ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1d7f02cba1cd8f6527360589d2d2747b6426f78b Gerrit-Change-Number: 11181 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 03 Oct 2018 08:37:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:37:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:37:11 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_lchan_desc.c: fix wrong chan_nr for PDCH In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11178 ) Change subject: trxcon/sched_lchan_desc.c: fix wrong chan_nr for PDCH ...................................................................... trxcon/sched_lchan_desc.c: fix wrong chan_nr for PDCH According to GSM TS 08.58, chapter 9.3.1, channel number 0x08 describes sub-slot number 0 of SDCCH/8+ACCH. This is definitely wrong. In OsmoBTS we use an Osmocom specific extension for packet switched channels - 0xc0, so let's use it here too. Change-Id: I11925408d6e63baf1eac880839ecd717843fba6a --- M src/host/trxcon/sched_lchan_desc.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/trxcon/sched_lchan_desc.c b/src/host/trxcon/sched_lchan_desc.c index 4cac439..05443f6 100644 --- a/src/host/trxcon/sched_lchan_desc.c +++ b/src/host/trxcon/sched_lchan_desc.c @@ -290,13 +290,13 @@ }, { TRXC_PDTCH, "PDTCH", - 0x08, TRX_CH_LID_DEDIC, + 0xc0, TRX_CH_LID_DEDIC, 12 * GSM_BURST_PL_LEN, TRX_CH_FLAG_PDCH, rx_pdtch_fn, tx_pdtch_fn, }, { TRXC_PTCCH, "PTCCH", - 0x08, TRX_CH_LID_DEDIC, + 0xc0, TRX_CH_LID_DEDIC, 4 * GSM_BURST_PL_LEN, TRX_CH_FLAG_PDCH, rx_data_fn, tx_data_fn, }, -- To view, visit https://gerrit.osmocom.org/11178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I11925408d6e63baf1eac880839ecd717843fba6a Gerrit-Change-Number: 11178 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:37:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:37:12 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: properly handle indicated CCCH mode In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11179 ) Change subject: trxcon/l1ctl.c: properly handle indicated CCCH mode ...................................................................... trxcon/l1ctl.c: properly handle indicated CCCH mode The 'ccch_mode' enum from 'l1ctl_proto.h' to be extended in the near future in order to reflect persistence of CBCH. Thus it should be handled in a switch statement. Change-Id: I75e3b8deac1da296efb178e65ff6992b5c407b80 --- M src/host/trxcon/l1ctl.c 1 file changed, 29 insertions(+), 12 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index a8a1289..f7f48af 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -256,6 +256,25 @@ return l1ctl_link_send(l1l, msg); } +static enum gsm_phys_chan_config l1ctl_ccch_mode2pchan_config(enum ccch_mode mode) +{ + switch (mode) { + /* TODO: distinguish extended BCCH */ + case CCCH_MODE_NON_COMBINED: + case CCCH_MODE_NONE: + return GSM_PCHAN_CCCH; + + /* TODO: distinguish CBCH */ + case CCCH_MODE_COMBINED: + return GSM_PCHAN_CCCH_SDCCH4; + + default: + LOGP(DL1C, LOGL_NOTICE, "Undandled CCCH mode (%u), " + "assuming non-combined configuration\n", mode); + return GSM_PCHAN_CCCH; + } +} + /* FBSB expire timer */ static void fbsb_timer_cb(void *data) { @@ -292,6 +311,7 @@ static int l1ctl_rx_fbsb_req(struct l1ctl_link *l1l, struct msgb *msg) { + enum gsm_phys_chan_config ch_config; struct l1ctl_fbsb_req *fbsb; uint16_t band_arfcn; uint16_t timeout; @@ -305,6 +325,7 @@ goto exit; } + ch_config = l1ctl_ccch_mode2pchan_config(fbsb->ccch_mode); band_arfcn = ntohs(fbsb->band_arfcn); timeout = ntohs(fbsb->timeout); @@ -316,10 +337,7 @@ sched_trx_reset(l1l->trx, 1); /* Configure a single timeslot */ - if (fbsb->ccch_mode == CCCH_MODE_COMBINED) - sched_trx_configure_ts(l1l->trx, 0, GSM_PCHAN_CCCH_SDCCH4); - else - sched_trx_configure_ts(l1l->trx, 0, GSM_PCHAN_CCCH); + sched_trx_configure_ts(l1l->trx, 0, ch_config); /* Ask SCH handler to send L1CTL_FBSB_CONF */ l1l->fbsb_conf_sent = 0; @@ -434,9 +452,10 @@ static int l1ctl_rx_ccch_mode_req(struct l1ctl_link *l1l, struct msgb *msg) { + enum gsm_phys_chan_config ch_config; struct l1ctl_ccch_mode_req *req; struct trx_ts *ts; - int mode, rc = 0; + int rc = 0; req = (struct l1ctl_ccch_mode_req *) msg->l1h; if (msgb_l1len(msg) < sizeof(*req)) { @@ -446,9 +465,8 @@ goto exit; } - LOGP(DL1C, LOGL_NOTICE, "Received CCCH mode request (%s)\n", - req->ccch_mode == CCCH_MODE_COMBINED ? - "combined" : "not combined"); + LOGP(DL1C, LOGL_NOTICE, "Received CCCH mode request (%u)\n", + req->ccch_mode); /* TODO: add value-string for ccch_mode */ /* Make sure that TS0 is allocated and configured */ ts = l1l->trx->ts_list[0]; @@ -459,12 +477,11 @@ } /* Choose corresponding channel combination */ - mode = req->ccch_mode == CCCH_MODE_COMBINED ? - GSM_PCHAN_CCCH_SDCCH4 : GSM_PCHAN_CCCH; + ch_config = l1ctl_ccch_mode2pchan_config(req->ccch_mode); /* Do nothing if the current mode matches required */ - if (ts->mf_layout->chan_config != mode) - rc = sched_trx_configure_ts(l1l->trx, 0, mode); + if (ts->mf_layout->chan_config != ch_config) + rc = sched_trx_configure_ts(l1l->trx, 0, ch_config); /* Confirm reconfiguration */ if (!rc) -- To view, visit https://gerrit.osmocom.org/11179 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I75e3b8deac1da296efb178e65ff6992b5c407b80 Gerrit-Change-Number: 11179 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:37:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:37:12 +0000 Subject: Change in osmocom-bb[master]: firmware/layer1: inform about unhandled scheduler tasks In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11180 ) Change subject: firmware/layer1: inform about unhandled scheduler tasks ...................................................................... firmware/layer1: inform about unhandled scheduler tasks The mframe_task2chan_nr() is used to get the channel number (encoded according to 08.58 Chapter 9.3.1) corresponding to a given multi-frame task type. It makes sense to at least print some debug message in cases when there is no matching channel number for a given task type. Change-Id: I34587b6c67015513de35d85a7a3291f452ee7f3b --- M src/target/firmware/layer1/mframe_sched.c 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/target/firmware/layer1/mframe_sched.c b/src/target/firmware/layer1/mframe_sched.c index f3a6b43..01ae167 100644 --- a/src/target/firmware/layer1/mframe_sched.c +++ b/src/target/firmware/layer1/mframe_sched.c @@ -400,10 +400,12 @@ case MF_TASK_TCH_H_1: cbits = 0x02 + 1; break; + case MF_TASK_UL_ALL_NB: - /* ERROR: cannot express as channel number */ - cbits = 0; - break; + default: + printd("ERROR: cannot express mf_task=%d as " + "channel number, using 0x00\n", mft); + cbits = 0x00; } return (cbits << 3) | (ts & 0x7); -- To view, visit https://gerrit.osmocom.org/11180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I34587b6c67015513de35d85a7a3291f452ee7f3b Gerrit-Change-Number: 11180 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:37:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:37:12 +0000 Subject: Change in osmocom-bb[master]: firmware/layer1: add scheduler tasks for CBCH In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11181 ) Change subject: firmware/layer1: add scheduler tasks for CBCH ...................................................................... firmware/layer1: add scheduler tasks for CBCH According to GSM TS 05.02, section 3.3.5, Cell Broadcast Channel (CBCH) is a downlink only channel, which is used to carry the short message service cell broadcast (SMSCB). CBCH is optional, and uses the same physical channel as SDCCH. More precisely, CBCH replaces sub-slot number 2 of SDCCH channels when enabled. This change introduces the following CBCH related tasks: - MF_TASK_SDCCH4_CBCH (CBCH on C0/TS0 SDCCH/4), - MF_TASK_SDCCH8_CBCH (CBCH on SDCCH/8), which are identified using the following Osmocom specific cbits: - MF_TASK_SDCCH4_CBCH - 0x18 (0b11000), - MF_TASK_SDCCH8_CBCH - 0x19 (0b11001). The only way to enable these tasks at the moment is to send L1CTL_DM_EST_REQ message with required cbits and tn. Change-Id: I1d7f02cba1cd8f6527360589d2d2747b6426f78b --- M src/target/firmware/include/layer1/mframe_sched.h M src/target/firmware/include/layer1/sync.h M src/target/firmware/layer1/l23_api.c M src/target/firmware/layer1/mframe_sched.c 4 files changed, 36 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/target/firmware/include/layer1/mframe_sched.h b/src/target/firmware/include/layer1/mframe_sched.h index ecdb1ec..74e2d27 100644 --- a/src/target/firmware/include/layer1/mframe_sched.h +++ b/src/target/firmware/include/layer1/mframe_sched.h @@ -23,6 +23,9 @@ MF_TASK_SDCCH8_6, MF_TASK_SDCCH8_7, + MF_TASK_SDCCH4_CBCH, + MF_TASK_SDCCH8_CBCH, + MF_TASK_TCH_F_EVEN, MF_TASK_TCH_F_ODD, MF_TASK_TCH_H_0, diff --git a/src/target/firmware/include/layer1/sync.h b/src/target/firmware/include/layer1/sync.h index dae85a1..3565ee2 100644 --- a/src/target/firmware/include/layer1/sync.h +++ b/src/target/firmware/include/layer1/sync.h @@ -119,7 +119,9 @@ enum { GSM_DCHAN_NONE = 0, GSM_DCHAN_SDCCH_4, + GSM_DCHAN_SDCCH_4_CBCH, GSM_DCHAN_SDCCH_8, + GSM_DCHAN_SDCCH_8_CBCH, GSM_DCHAN_TCH_H, GSM_DCHAN_TCH_F, GSM_DCHAN_UNKNOWN, diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c index e46ca09..404a2f9 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -97,6 +97,11 @@ lch_idx = cbits & 0x7; master_task = MF_TASK_SDCCH8_0 + lch_idx; multiframe = MF51; + } else if ((cbits & 0x1e) == 0x18) { + /* Osmocom specific extension for CBCH */ + master_task = (cbits & 0x01) ? /* 0b1100T */ + MF_TASK_SDCCH4_CBCH : MF_TASK_SDCCH8_CBCH; + multiframe = MF51; #if 0 } else if (cbits == 0x10) { /* FIXME: when to do extended BCCH? */ @@ -136,7 +141,12 @@ return GSM_DCHAN_SDCCH_4; } else if ((cbits & 0x18) == 0x08) { return GSM_DCHAN_SDCCH_8; + } else if ((cbits & 0x1e) == 0x18) { + /* Osmocom-specific extension for CBCH */ + return (cbits & 0x01) ? /* 0b1100T */ + GSM_DCHAN_SDCCH_8_CBCH : GSM_DCHAN_SDCCH_4_CBCH; } + return GSM_DCHAN_UNKNOWN; } diff --git a/src/target/firmware/layer1/mframe_sched.c b/src/target/firmware/layer1/mframe_sched.c index 01ae167..7fa38c1 100644 --- a/src/target/firmware/layer1/mframe_sched.c +++ b/src/target/firmware/layer1/mframe_sched.c @@ -198,6 +198,16 @@ { .sched_set = NULL } }; +/* CBCH replaces sub-slot 2 of SDCCH, see GSM 05.02, section 6.4 */ +static const struct mframe_sched_item mf_sdcch8_cbch[] = { + { .sched_set = NB_QUAD_FH_DL, .modulo = 51, .frame_nr = 8 }, + { .sched_set = NULL } +}; +static const struct mframe_sched_item mf_sdcch4_cbch[] = { + { .sched_set = NB_QUAD_DL, .modulo = 51, .frame_nr = 32 }, + { .sched_set = NULL } +}; + /* Measurement for MF 51 C0 */ static const struct mframe_sched_item mf_neigh_pm51_c0t0[] = { { .sched_set = NEIGH_PM , .modulo = 51, .frame_nr = 0 }, @@ -327,6 +337,9 @@ [MF_TASK_SDCCH8_6] = mf_sdcch8_6, [MF_TASK_SDCCH8_7] = mf_sdcch8_7, + [MF_TASK_SDCCH4_CBCH] = mf_sdcch4_cbch, + [MF_TASK_SDCCH8_CBCH] = mf_sdcch8_cbch, + [MF_TASK_TCH_F_EVEN] = mf_tch_f_even, [MF_TASK_TCH_F_ODD] = mf_tch_f_odd, [MF_TASK_TCH_H_0] = mf_tch_h_0, @@ -401,6 +414,14 @@ cbits = 0x02 + 1; break; + /* Osmocom specific extensions */ + case MF_TASK_SDCCH4_CBCH: + cbits = 0x18; + break; + case MF_TASK_SDCCH8_CBCH: + cbits = 0x19; + break; + case MF_TASK_UL_ALL_NB: default: printd("ERROR: cannot express mf_task=%d as " -- To view, visit https://gerrit.osmocom.org/11181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1d7f02cba1cd8f6527360589d2d2747b6426f78b Gerrit-Change-Number: 11181 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:37:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:37:12 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: add CCCH/SDCCH mframe layouts with CBCH In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11182 ) Change subject: trxcon/scheduler: add CCCH/SDCCH mframe layouts with CBCH ...................................................................... trxcon/scheduler: add CCCH/SDCCH mframe layouts with CBCH According to GSM TS 05.02, section 3.3.5, Cell Broadcast Channel (CBCH) is a downlink only channel, which is used to carry the short message service cell broadcast (SMSCB). CBCH is optional, and uses the same physical channel as SDCCH. More precisely, CBCH replaces sub-slot number 2 of SDCCH channels when enabled. This change introduces the CBCH enabled multi-frame layouts, and two separate logical channel types: - GSM_PCHAN_CCCH_SDCCH4_CBCH (lchan TRXC_SDCCH4_CBCH), - GSM_PCHAN_SDCCH8_SACCH8C_CBCH (lchan TRXC_SDCCH8_CBCH). Both logical channels are separately identified using the following Osmocom specific cbits: - TRXC_SDCCH4_CBCH - 0x18 (0b11000), - TRXC_SDCCH8_CBCH - 0x19 (0b11001). The reason of this separation is that we somehow need to distinguish between CBCH on C0/TS0, and CBCH on CX/TS0. Unlike TRXC_SDCCH8_CBCH, TRXC_SDCCH4_CBCH is enabled automatically (TRX_CH_FLAG_AUTO), so CBCH messages can be decoded on C0 while being in idle mode. Change-Id: Iad9905fc3a8a012ff1ada26ff95af384816f9873 --- M src/host/trxcon/sched_lchan_desc.c M src/host/trxcon/sched_mframe.c M src/host/trxcon/sched_trx.h 3 files changed, 238 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/trxcon/sched_lchan_desc.c b/src/host/trxcon/sched_lchan_desc.c index 05443f6..8b2b5e1 100644 --- a/src/host/trxcon/sched_lchan_desc.c +++ b/src/host/trxcon/sched_lchan_desc.c @@ -300,4 +300,16 @@ 4 * GSM_BURST_PL_LEN, TRX_CH_FLAG_PDCH, rx_data_fn, tx_data_fn, }, + [TRXC_SDCCH4_CBCH] = { + TRXC_SDCCH4_CBCH, "SDCCH/4(CBCH)", + 0xc0, TRX_CH_LID_DEDIC, + 4 * GSM_BURST_PL_LEN, TRX_CH_FLAG_AUTO, + rx_data_fn, NULL, + }, + [TRXC_SDCCH8_CBCH] = { + TRXC_SDCCH8_CBCH, "SDCCH/8(CBCH)", + 0xc8, TRX_CH_LID_DEDIC, + 4 * GSM_BURST_PL_LEN, 0x00, + rx_data_fn, NULL, + }, }; diff --git a/src/host/trxcon/sched_mframe.c b/src/host/trxcon/sched_mframe.c index 25e7c29..0dcf3e7 100644 --- a/src/host/trxcon/sched_mframe.c +++ b/src/host/trxcon/sched_mframe.c @@ -191,6 +191,113 @@ { TRXC_IDLE, 0, TRXC_SDCCH4_2, 3 }, }; +static const struct trx_frame frame_bcch_sdcch4_cbch[102] = { + /* dl_chan dl_bid ul_chan ul_bid */ + { TRXC_FCCH, 0, TRXC_SDCCH4_3, 0 }, + { TRXC_SCH, 0, TRXC_SDCCH4_3, 1 }, + { TRXC_BCCH, 0, TRXC_SDCCH4_3, 2 }, + { TRXC_BCCH, 1, TRXC_SDCCH4_3, 3 }, + { TRXC_BCCH, 2, TRXC_RACH, 0 }, + { TRXC_BCCH, 3, TRXC_RACH, 0 }, + { TRXC_CCCH, 0, TRXC_IDLE, 0 }, + { TRXC_CCCH, 1, TRXC_IDLE, 1 }, + { TRXC_CCCH, 2, TRXC_IDLE, 2 }, + { TRXC_CCCH, 3, TRXC_IDLE, 3 }, + { TRXC_FCCH, 0, TRXC_SACCH4_3, 0 }, + { TRXC_SCH, 0, TRXC_SACCH4_3, 1 }, + { TRXC_CCCH, 0, TRXC_SACCH4_3, 2 }, + { TRXC_CCCH, 1, TRXC_SACCH4_3, 3 }, + { TRXC_CCCH, 2, TRXC_RACH, 0 }, + { TRXC_CCCH, 3, TRXC_RACH, 0 }, + { TRXC_CCCH, 0, TRXC_RACH, 0 }, + { TRXC_CCCH, 1, TRXC_RACH, 0 }, + { TRXC_CCCH, 2, TRXC_RACH, 0 }, + { TRXC_CCCH, 3, TRXC_RACH, 0 }, + { TRXC_FCCH, 0, TRXC_RACH, 0 }, + { TRXC_SCH, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 1, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 2, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 3, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 1, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 2, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 3, TRXC_RACH, 0 }, + { TRXC_FCCH, 0, TRXC_RACH, 0 }, + { TRXC_SCH, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_CBCH, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_CBCH, 1, TRXC_RACH, 0 }, + { TRXC_SDCCH4_CBCH, 2, TRXC_RACH, 0 }, + { TRXC_SDCCH4_CBCH, 3, TRXC_RACH, 0 }, + { TRXC_SDCCH4_3, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_3, 1, TRXC_SDCCH4_0, 0 }, + { TRXC_SDCCH4_3, 2, TRXC_SDCCH4_0, 1 }, + { TRXC_SDCCH4_3, 3, TRXC_SDCCH4_0, 2 }, + { TRXC_FCCH, 0, TRXC_SDCCH4_0, 3 }, + { TRXC_SCH, 0, TRXC_SDCCH4_1, 0 }, + { TRXC_SACCH4_0, 0, TRXC_SDCCH4_1, 1 }, + { TRXC_SACCH4_0, 1, TRXC_SDCCH4_1, 2 }, + { TRXC_SACCH4_0, 2, TRXC_SDCCH4_1, 3 }, + { TRXC_SACCH4_0, 3, TRXC_RACH, 0 }, + { TRXC_SACCH4_1, 0, TRXC_RACH, 0 }, + { TRXC_SACCH4_1, 1, TRXC_IDLE, 0 }, + { TRXC_SACCH4_1, 2, TRXC_IDLE, 1 }, + { TRXC_SACCH4_1, 3, TRXC_IDLE, 2 }, + { TRXC_IDLE, 0, TRXC_IDLE, 3 }, + + { TRXC_FCCH, 0, TRXC_SDCCH4_3, 0 }, + { TRXC_SCH, 0, TRXC_SDCCH4_3, 1 }, + { TRXC_BCCH, 0, TRXC_SDCCH4_3, 2 }, + { TRXC_BCCH, 1, TRXC_SDCCH4_3, 3 }, + { TRXC_BCCH, 2, TRXC_RACH, 0 }, + { TRXC_BCCH, 3, TRXC_RACH, 0 }, + { TRXC_CCCH, 0, TRXC_SACCH4_0, 0 }, + { TRXC_CCCH, 1, TRXC_SACCH4_0, 1 }, + { TRXC_CCCH, 2, TRXC_SACCH4_0, 2 }, + { TRXC_CCCH, 3, TRXC_SACCH4_0, 3 }, + { TRXC_FCCH, 0, TRXC_SACCH4_1, 0 }, + { TRXC_SCH, 0, TRXC_SACCH4_1, 1 }, + { TRXC_CCCH, 0, TRXC_SACCH4_1, 2 }, + { TRXC_CCCH, 1, TRXC_SACCH4_1, 3 }, + { TRXC_CCCH, 2, TRXC_RACH, 0 }, + { TRXC_CCCH, 3, TRXC_RACH, 0 }, + { TRXC_CCCH, 0, TRXC_RACH, 0 }, + { TRXC_CCCH, 1, TRXC_RACH, 0 }, + { TRXC_CCCH, 2, TRXC_RACH, 0 }, + { TRXC_CCCH, 3, TRXC_RACH, 0 }, + { TRXC_FCCH, 0, TRXC_RACH, 0 }, + { TRXC_SCH, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 1, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 2, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 3, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 1, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 2, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 3, TRXC_RACH, 0 }, + { TRXC_FCCH, 0, TRXC_RACH, 0 }, + { TRXC_SCH, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_CBCH, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_CBCH, 1, TRXC_RACH, 0 }, + { TRXC_SDCCH4_CBCH, 2, TRXC_RACH, 0 }, + { TRXC_SDCCH4_CBCH, 3, TRXC_RACH, 0 }, + { TRXC_SDCCH4_3, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_3, 1, TRXC_SDCCH4_0, 0 }, + { TRXC_SDCCH4_3, 2, TRXC_SDCCH4_0, 1 }, + { TRXC_SDCCH4_3, 3, TRXC_SDCCH4_0, 2 }, + { TRXC_FCCH, 0, TRXC_SDCCH4_0, 3 }, + { TRXC_SCH, 0, TRXC_SDCCH4_1, 0 }, + { TRXC_IDLE, 0, TRXC_SDCCH4_1, 1 }, + { TRXC_IDLE, 1, TRXC_SDCCH4_1, 2 }, + { TRXC_IDLE, 2, TRXC_SDCCH4_1, 3 }, + { TRXC_IDLE, 3, TRXC_RACH, 0 }, + { TRXC_SACCH4_3, 0, TRXC_RACH, 0 }, + { TRXC_SACCH4_3, 1, TRXC_SDCCH4_2, 0 }, + { TRXC_SACCH4_3, 2, TRXC_SDCCH4_2, 1 }, + { TRXC_SACCH4_3, 3, TRXC_SDCCH4_2, 2 }, + { TRXC_IDLE, 0, TRXC_SDCCH4_2, 3 }, +}; + static const struct trx_frame frame_sdcch8[102] = { /* dl_chan dl_bid ul_chan ul_bid */ { TRXC_SDCCH8_0, 0, TRXC_SACCH8_5, 0 }, @@ -298,6 +405,113 @@ { TRXC_IDLE, 0, TRXC_SACCH8_4, 3 }, }; +static const struct trx_frame frame_sdcch8_cbch[102] = { + /* dl_chan dl_bid ul_chan ul_bid */ + { TRXC_SDCCH8_0, 0, TRXC_SACCH8_5, 0 }, + { TRXC_SDCCH8_0, 1, TRXC_SACCH8_5, 1 }, + { TRXC_SDCCH8_0, 2, TRXC_SACCH8_5, 2 }, + { TRXC_SDCCH8_0, 3, TRXC_SACCH8_5, 3 }, + { TRXC_SDCCH8_1, 0, TRXC_SACCH8_6, 0 }, + { TRXC_SDCCH8_1, 1, TRXC_SACCH8_6, 1 }, + { TRXC_SDCCH8_1, 2, TRXC_SACCH8_6, 2 }, + { TRXC_SDCCH8_1, 3, TRXC_SACCH8_6, 3 }, + { TRXC_SDCCH8_CBCH, 0, TRXC_SACCH8_7, 0 }, + { TRXC_SDCCH8_CBCH, 1, TRXC_SACCH8_7, 1 }, + { TRXC_SDCCH8_CBCH, 2, TRXC_SACCH8_7, 2 }, + { TRXC_SDCCH8_CBCH, 3, TRXC_SACCH8_7, 3 }, + { TRXC_SDCCH8_3, 0, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_3, 1, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_3, 2, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_3, 3, TRXC_SDCCH8_0, 0 }, + { TRXC_SDCCH8_4, 0, TRXC_SDCCH8_0, 1 }, + { TRXC_SDCCH8_4, 1, TRXC_SDCCH8_0, 2 }, + { TRXC_SDCCH8_4, 2, TRXC_SDCCH8_0, 3 }, + { TRXC_SDCCH8_4, 3, TRXC_SDCCH8_1, 0 }, + { TRXC_SDCCH8_5, 0, TRXC_SDCCH8_1, 1 }, + { TRXC_SDCCH8_5, 1, TRXC_SDCCH8_1, 2 }, + { TRXC_SDCCH8_5, 2, TRXC_SDCCH8_1, 3 }, + { TRXC_SDCCH8_5, 3, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_6, 0, TRXC_IDLE, 1 }, + { TRXC_SDCCH8_6, 1, TRXC_IDLE, 2 }, + { TRXC_SDCCH8_6, 2, TRXC_IDLE, 3 }, + { TRXC_SDCCH8_6, 3, TRXC_SDCCH8_3, 0 }, + { TRXC_SDCCH8_7, 0, TRXC_SDCCH8_3, 1 }, + { TRXC_SDCCH8_7, 1, TRXC_SDCCH8_3, 2 }, + { TRXC_SDCCH8_7, 2, TRXC_SDCCH8_3, 3 }, + { TRXC_SDCCH8_7, 3, TRXC_SDCCH8_4, 0 }, + { TRXC_SACCH8_0, 0, TRXC_SDCCH8_4, 1 }, + { TRXC_SACCH8_0, 1, TRXC_SDCCH8_4, 2 }, + { TRXC_SACCH8_0, 2, TRXC_SDCCH8_4, 3 }, + { TRXC_SACCH8_0, 3, TRXC_SDCCH8_5, 0 }, + { TRXC_SACCH8_1, 0, TRXC_SDCCH8_5, 1 }, + { TRXC_SACCH8_1, 1, TRXC_SDCCH8_5, 2 }, + { TRXC_SACCH8_1, 2, TRXC_SDCCH8_5, 3 }, + { TRXC_SACCH8_1, 3, TRXC_SDCCH8_6, 0 }, + { TRXC_IDLE, 0, TRXC_SDCCH8_6, 1 }, + { TRXC_IDLE, 1, TRXC_SDCCH8_6, 2 }, + { TRXC_IDLE, 2, TRXC_SDCCH8_6, 3 }, + { TRXC_IDLE, 3, TRXC_SDCCH8_7, 0 }, + { TRXC_SACCH8_3, 0, TRXC_SDCCH8_7, 1 }, + { TRXC_SACCH8_3, 1, TRXC_SDCCH8_7, 2 }, + { TRXC_SACCH8_3, 2, TRXC_SDCCH8_7, 3 }, + { TRXC_SACCH8_3, 3, TRXC_SACCH8_0, 0 }, + { TRXC_IDLE, 0, TRXC_SACCH8_0, 1 }, + { TRXC_IDLE, 0, TRXC_SACCH8_0, 2 }, + { TRXC_IDLE, 0, TRXC_SACCH8_0, 3 }, + + { TRXC_SDCCH8_0, 0, TRXC_SACCH8_1, 0 }, + { TRXC_SDCCH8_0, 1, TRXC_SACCH8_1, 1 }, + { TRXC_SDCCH8_0, 2, TRXC_SACCH8_1, 2 }, + { TRXC_SDCCH8_0, 3, TRXC_SACCH8_1, 3 }, + { TRXC_SDCCH8_1, 0, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_1, 1, TRXC_IDLE, 1 }, + { TRXC_SDCCH8_1, 2, TRXC_IDLE, 2 }, + { TRXC_SDCCH8_1, 3, TRXC_IDLE, 3 }, + { TRXC_SDCCH8_CBCH, 0, TRXC_SACCH8_3, 0 }, + { TRXC_SDCCH8_CBCH, 1, TRXC_SACCH8_3, 1 }, + { TRXC_SDCCH8_CBCH, 2, TRXC_SACCH8_3, 2 }, + { TRXC_SDCCH8_CBCH, 3, TRXC_SACCH8_3, 3 }, + { TRXC_SDCCH8_3, 0, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_3, 1, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_3, 2, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_3, 3, TRXC_SDCCH8_0, 0 }, + { TRXC_SDCCH8_4, 0, TRXC_SDCCH8_0, 1 }, + { TRXC_SDCCH8_4, 1, TRXC_SDCCH8_0, 2 }, + { TRXC_SDCCH8_4, 2, TRXC_SDCCH8_0, 3 }, + { TRXC_SDCCH8_4, 3, TRXC_SDCCH8_1, 0 }, + { TRXC_SDCCH8_5, 0, TRXC_SDCCH8_1, 1 }, + { TRXC_SDCCH8_5, 1, TRXC_SDCCH8_1, 2 }, + { TRXC_SDCCH8_5, 2, TRXC_SDCCH8_1, 3 }, + { TRXC_SDCCH8_5, 3, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_6, 0, TRXC_IDLE, 1 }, + { TRXC_SDCCH8_6, 1, TRXC_IDLE, 2 }, + { TRXC_SDCCH8_6, 2, TRXC_IDLE, 3 }, + { TRXC_SDCCH8_6, 3, TRXC_SDCCH8_3, 0 }, + { TRXC_SDCCH8_7, 0, TRXC_SDCCH8_3, 1 }, + { TRXC_SDCCH8_7, 1, TRXC_SDCCH8_3, 2 }, + { TRXC_SDCCH8_7, 2, TRXC_SDCCH8_3, 3 }, + { TRXC_SDCCH8_7, 3, TRXC_SDCCH8_4, 0 }, + { TRXC_SACCH8_4, 0, TRXC_SDCCH8_4, 1 }, + { TRXC_SACCH8_4, 1, TRXC_SDCCH8_4, 2 }, + { TRXC_SACCH8_4, 2, TRXC_SDCCH8_4, 3 }, + { TRXC_SACCH8_4, 3, TRXC_SDCCH8_5, 0 }, + { TRXC_SACCH8_5, 0, TRXC_SDCCH8_5, 1 }, + { TRXC_SACCH8_5, 1, TRXC_SDCCH8_5, 2 }, + { TRXC_SACCH8_5, 2, TRXC_SDCCH8_5, 3 }, + { TRXC_SACCH8_5, 3, TRXC_SDCCH8_6, 0 }, + { TRXC_SACCH8_6, 0, TRXC_SDCCH8_6, 1 }, + { TRXC_SACCH8_6, 1, TRXC_SDCCH8_6, 2 }, + { TRXC_SACCH8_6, 2, TRXC_SDCCH8_6, 3 }, + { TRXC_SACCH8_6, 3, TRXC_SDCCH8_7, 0 }, + { TRXC_SACCH8_7, 0, TRXC_SDCCH8_7, 1 }, + { TRXC_SACCH8_7, 1, TRXC_SDCCH8_7, 2 }, + { TRXC_SACCH8_7, 2, TRXC_SDCCH8_7, 3 }, + { TRXC_SACCH8_7, 3, TRXC_SACCH8_4, 0 }, + { TRXC_IDLE, 0, TRXC_SACCH8_4, 1 }, + { TRXC_IDLE, 0, TRXC_SACCH8_4, 2 }, + { TRXC_IDLE, 0, TRXC_SACCH8_4, 3 }, +}; + static const struct trx_frame frame_tchf_ts0[104] = { /* dl_chan dl_bid ul_chan ul_bid */ { TRXC_TCHF, 0, TRXC_TCHF, 0 }, @@ -1728,11 +1942,21 @@ frame_bcch_sdcch4 }, { + GSM_PCHAN_CCCH_SDCCH4_CBCH, "BCCH+CCCH+SDCCH/4+SACCH/4+CBCH", + 102, 0xff, (uint64_t) 0x400f001e3e, + frame_bcch_sdcch4_cbch + }, + { GSM_PCHAN_SDCCH8_SACCH8C, "SDCCH/8+SACCH/8", 102, 0xff, (uint64_t) 0xff01fe000, frame_sdcch8 }, { + GSM_PCHAN_SDCCH8_SACCH8C_CBCH, "SDCCH/8+SACCH/8+CBCH", + 102, 0xff, (uint64_t) 0x8ff01fe000, + frame_sdcch8_cbch + }, + { GSM_PCHAN_TCH_F, "TCH/F+SACCH", 104, 0x01, (uint64_t) 0x200040, frame_tchf_ts0 diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index 10ae256..1f0dbc2 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -83,6 +83,8 @@ TRXC_SACCH8_7, TRXC_PDTCH, TRXC_PTCCH, + TRXC_SDCCH4_CBCH, + TRXC_SDCCH8_CBCH, _TRX_CHAN_MAX }; -- To view, visit https://gerrit.osmocom.org/11182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iad9905fc3a8a012ff1ada26ff95af384816f9873 Gerrit-Change-Number: 11182 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:37:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:37:13 +0000 Subject: Change in osmocom-bb[master]: l1ctl_proto.h: extend ccch_mode enum with CBCH In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11183 ) Change subject: l1ctl_proto.h: extend ccch_mode enum with CBCH ...................................................................... l1ctl_proto.h: extend ccch_mode enum with CBCH According to GSM TS 05.02, there are two ways to enable CBCH: a) replace sub-slot number 2 of CCCH+SDCCH/4 (comb. V), b) replace sub-slot number 2 of SDCCH/8 (comb. VII). Unlike SDCCH/8 (case b), CCCH+SDCCH/4 can be allocated on TS0 only, and shall not use frequency hopping. This means that implementing CBCH support on SDCCH/8 would require much more efforts than on combined CCCH+SDCCH/4, as in last case CBCH messages can be received without the need to switch from idle to dedicated mode. This change introduces a new ccch_mode item, which should be used by the higher layers to indicate presence of CBCH channel on C0/TS0, so the PHY would enable decoding of CBCH messages on CCCH+SDCCH/4 (case a) in idle mode. Regarding to CBCH on SDCCH/8 (case b), it makes sense to extend the 'l1ctl_dm_est_req', so it would be handled in dedicated mode on request from the higher layers. Change-Id: Ia94ebf22a2ec439dfe1f31d703b832ae57b48ef2 --- M include/l1ctl_proto.h M src/host/trxcon/l1ctl.c M src/target/firmware/layer1/l23_api.c M src/target/firmware/layer1/prim_fbsb.c 4 files changed, 11 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/l1ctl_proto.h b/include/l1ctl_proto.h index 9d548bc..f1bff86 100644 --- a/include/l1ctl_proto.h +++ b/include/l1ctl_proto.h @@ -70,6 +70,7 @@ CCCH_MODE_NONE = 0, CCCH_MODE_NON_COMBINED, CCCH_MODE_COMBINED, + CCCH_MODE_COMBINED_CBCH, }; enum neigh_mode { diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index f7f48af..83cdc2e 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -264,9 +264,10 @@ case CCCH_MODE_NONE: return GSM_PCHAN_CCCH; - /* TODO: distinguish CBCH */ case CCCH_MODE_COMBINED: return GSM_PCHAN_CCCH_SDCCH4; + case CCCH_MODE_COMBINED_CBCH: + return GSM_PCHAN_CCCH_SDCCH4_CBCH; default: LOGP(DL1C, LOGL_NOTICE, "Undandled CCCH mode (%u), " diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c index 404a2f9..daffaf8 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -489,6 +489,10 @@ mframe_enable(MF_TASK_CCCH_COMB); else if (ccch_mode == CCCH_MODE_NON_COMBINED) mframe_enable(MF_TASK_CCCH); + else if (ccch_mode == CCCH_MODE_COMBINED_CBCH) { + mframe_enable(MF_TASK_CCCH_COMB); + mframe_enable(MF_TASK_SDCCH4_CBCH); + } l1ctl_tx_ccch_mode_conf(ccch_mode); } diff --git a/src/target/firmware/layer1/prim_fbsb.c b/src/target/firmware/layer1/prim_fbsb.c index 9eb56c6..50acefc 100644 --- a/src/target/firmware/layer1/prim_fbsb.c +++ b/src/target/firmware/layer1/prim_fbsb.c @@ -262,6 +262,10 @@ mframe_enable(MF_TASK_CCCH_COMB); else if (l1s.serving_cell.ccch_mode == CCCH_MODE_NON_COMBINED) mframe_enable(MF_TASK_CCCH); + else if (l1s.serving_cell.ccch_mode == CCCH_MODE_COMBINED_CBCH) { + mframe_enable(MF_TASK_CCCH_COMB); + mframe_enable(MF_TASK_SDCCH4_CBCH); + } l1s_compl_sched(L1_COMPL_FB); -- To view, visit https://gerrit.osmocom.org/11183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia94ebf22a2ec439dfe1f31d703b832ae57b48ef2 Gerrit-Change-Number: 11183 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:37:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 08:37:13 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: add dedicated CBCH mode support In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11184 ) Change subject: trxcon/scheduler: add dedicated CBCH mode support ...................................................................... trxcon/scheduler: add dedicated CBCH mode support This change extends sched_trx_chan_nr2pchan_config() with Osmocom specific cbits related to CBCH, so now one can to decode CBCH channels in dedicated mode (see L1CTL_DM_EST_REQ). Change-Id: I9347c45638223cac34f4b48eb736e51a5055a36f --- M src/host/trxcon/sched_trx.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index 0b83af3..19d1fe8 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -535,8 +535,12 @@ return GSM_PCHAN_TCH_H; else if ((cbits & 0x1c) == 0x04) return GSM_PCHAN_CCCH_SDCCH4; + else if ((cbits & 0x1f) == 0x18) + return GSM_PCHAN_CCCH_SDCCH4_CBCH; else if ((cbits & 0x18) == 0x08) return GSM_PCHAN_SDCCH8_SACCH8C; + else if ((cbits & 0x1f) == 0x19) + return GSM_PCHAN_SDCCH8_SACCH8C_CBCH; return GSM_PCHAN_NONE; } -- To view, visit https://gerrit.osmocom.org/11184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9347c45638223cac34f4b48eb736e51a5055a36f Gerrit-Change-Number: 11184 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:53:05 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 3 Oct 2018 08:53:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Use f_L1CTL_PARAM to set expected ms power level for dummy MeasRep In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11149 ) Change subject: bts: Use f_L1CTL_PARAM to set expected ms power level for dummy MeasRep ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie1fd9cee3472c7aa6580f846d277f485d3401641 Gerrit-Change-Number: 11149 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 03 Oct 2018 08:53:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 08:54:01 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 3 Oct 2018 08:54:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add parameter to set and expect a specific MS power level In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11148 ) Change subject: bts: Add parameter to set and expect a specific MS power level ...................................................................... Patch Set 2: -Code-Review -- To view, visit https://gerrit.osmocom.org/11148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iedab8681a0ba4652a6bb1c001418599a4ff746b6 Gerrit-Change-Number: 11148 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 03 Oct 2018 08:54:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 09:06:51 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 3 Oct 2018 09:06:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11204 ) Change subject: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11204/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11204/1/bts/BTS_Tests.ttcn at 3753 PS1, Line 3753: RslLinkId link_id, > I think we aren't using this format anywhere and was first a bit confusing to me. [?] Hmm, this format is used at least for SS/USSD related templates ;) Personally, I would prefer exactly this formatting, because: - when we add/modify the list of arguments, it looks much cleaner in the git history; - one can easily comment each argument separately. The first point is similar to what we have in our multiple Makefile.am files - some of them are well-formatted, but in some one would see long lines with multiple files... If you don't share my opinion, and this formatting looks over-confusing, I can change it for sure. https://gerrit.osmocom.org/#/c/11204/1/bts/BTS_Tests.ttcn at 3769 PS1, Line 3769: [] RSL.receive { repeat; } > picky: Easier to read: Move this one up and leave timeout at the end. What if I do this in a separate change for both f_unitdata_mo and f_data_mo? -- To view, visit https://gerrit.osmocom.org/11204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I08cb28dd9fa23f3ef8b0c9ede3d4c47f5702a1c1 Gerrit-Change-Number: 11204 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 03 Oct 2018 09:06:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 09:20:50 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 3 Oct 2018 09:20:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11204 ) Change subject: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() ...................................................................... Patch Set 1: Hi, > What I think is more critical is that we ignore/accept *all* other > messages on RSL for this lchan. This is way too tolerant. We > should explicitly white-list only those messages that are actually > permitted here, which as it seems right now are only measurement > reports. > > Tests should be as tight as possible. I think this also makes sense for f_unitdata_mo(), right? So I could limit both functions in that way, e.g. in a separate preceding change. Agree? -- To view, visit https://gerrit.osmocom.org/11204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I08cb28dd9fa23f3ef8b0c9ede3d4c47f5702a1c1 Gerrit-Change-Number: 11204 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 03 Oct 2018 09:20:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 09:39:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 09:39:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11204 ) Change subject: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11204/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11204/1/bts/BTS_Tests.ttcn at 3753 PS1, Line 3753: RslLinkId link_id, > Hmm, this format is used at least for SS/USSD related templates ;) [?] I'd personally stick to regular "fit everything as much as possible into one line" format, that's what I'm used to (and I guess most people too) when looking at functions. https://gerrit.osmocom.org/#/c/11204/1/bts/BTS_Tests.ttcn at 3769 PS1, Line 3769: [] RSL.receive { repeat; } > What if I do this in a separate change for both f_unitdata_mo and f_data_mo? Sure, np. -- To view, visit https://gerrit.osmocom.org/11204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I08cb28dd9fa23f3ef8b0c9ede3d4c47f5702a1c1 Gerrit-Change-Number: 11204 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 03 Oct 2018 09:39:32 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 09:43:05 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 3 Oct 2018 09:43:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11204 ) Change subject: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11204/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11204/1/bts/BTS_Tests.ttcn at 3753 PS1, Line 3753: RslLinkId link_id, > "fit everything as much as possible into one line" Just like in web-development - the whole library in one line ;) https://code.jquery.com/jquery-3.3.1.min.js -- To view, visit https://gerrit.osmocom.org/11204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I08cb28dd9fa23f3ef8b0c9ede3d4c47f5702a1c1 Gerrit-Change-Number: 11204 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 03 Oct 2018 09:43:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 09:57:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 09:57:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L1CTL_Types: Add support to set L1 Header params during SACCH tx In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11147 to look at the new patch set (#3). Change subject: L1CTL_Types: Add support to set L1 Header params during SACCH tx ...................................................................... L1CTL_Types: Add support to set L1 Header params during SACCH tx Change-Id: Id014f790ee2ede8ae796c37b1c6b25c4af9034d2 --- M library/GSM_RR_Types.ttcn M library/L1CTL_Types.ttcn 2 files changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/11147/3 -- To view, visit https://gerrit.osmocom.org/11147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id014f790ee2ede8ae796c37b1c6b25c4af9034d2 Gerrit-Change-Number: 11147 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 09:57:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 09:57:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add parameter to set and expect a specific MS power level In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11148 to look at the new patch set (#3). Change subject: bts: Add parameter to set and expect a specific MS power level ...................................................................... bts: Add parameter to set and expect a specific MS power level This change uses recently added ts_L1CTL_DATA_REQ_SACCH to be able to set the L1 Header parameters to match the expected MS power level announced by the BTS. Change-Id: Iedab8681a0ba4652a6bb1c001418599a4ff746b6 --- M bts/BTS_Tests.ttcn 1 file changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/11148/3 -- To view, visit https://gerrit.osmocom.org/11148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iedab8681a0ba4652a6bb1c001418599a4ff746b6 Gerrit-Change-Number: 11148 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 10:17:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 10:17:36 +0000 Subject: Change in osmo-gsm-tester[master]: Make code copying inst through ssh generic In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11190 ) Change subject: Make code copying inst through ssh generic ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I838b999528695207e1147cfe76e6f7aaf3b1dd53 Gerrit-Change-Number: 11190 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 03 Oct 2018 10:17:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 10:17:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 10:17:38 +0000 Subject: Change in osmo-gsm-tester[master]: osmotrx: Allow running osmo-trx from remote host In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11191 ) Change subject: osmotrx: Allow running osmo-trx from remote host ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11191 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia31ac8eb41e02eda28d9f6f56774679300244ee8 Gerrit-Change-Number: 11191 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 03 Oct 2018 10:17:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 10:17:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 10:17:41 +0000 Subject: Change in osmo-gsm-tester[master]: osmotrx: Make sure remote process stops after ssh session is closed In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11192 ) Change subject: osmotrx: Make sure remote process stops after ssh session is closed ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic334a54b1a1827d74fe0b453ac32bb77b8616147 Gerrit-Change-Number: 11192 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 03 Oct 2018 10:17:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 10:17:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 10:17:43 +0000 Subject: Change in osmo-gsm-tester[master]: bts_osmo: Only check for socket path in ready_for_pcu() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11195 ) Change subject: bts_osmo: Only check for socket path in ready_for_pcu() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3aa6bef0c4893bdcac668002ca018af019f666a3 Gerrit-Change-Number: 11195 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 03 Oct 2018 10:17:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 10:18:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 10:18:08 +0000 Subject: Change in osmo-gsm-tester[master]: Make code copying inst through ssh generic In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11190 ) Change subject: Make code copying inst through ssh generic ...................................................................... Make code copying inst through ssh generic It can later on be used by other classes that need to run binaries in inst remotely. Change-Id: I838b999528695207e1147cfe76e6f7aaf3b1dd53 --- M src/osmo_gsm_tester/bts_sysmo.py M src/osmo_gsm_tester/process.py 2 files changed, 46 insertions(+), 38 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo_gsm_tester/bts_sysmo.py b/src/osmo_gsm_tester/bts_sysmo.py index e3f4823..bdf6bb7 100644 --- a/src/osmo_gsm_tester/bts_sysmo.py +++ b/src/osmo_gsm_tester/bts_sysmo.py @@ -41,34 +41,14 @@ def _direct_pcu_enabled(self): return util.str2bool(self.conf.get('direct_pcu')) - def _process_remote(self, name, popen_args, remote_cwd=None): - run_dir = self.run_dir.new_dir(name) - return process.RemoteProcess(name, run_dir, self.remote_user, self.remote_addr(), remote_cwd, - popen_args) - - def run_remote(self, name, popen_args, remote_cwd=None): - proc = self._process_remote(name, popen_args, remote_cwd) - proc.launch() - proc.wait() - if proc.result != 0: - log.ctx(proc) - raise log.Error('Exited in error') - def launch_remote(self, name, popen_args, remote_cwd=None, keepalive=False): - proc = self._process_remote(name, popen_args, remote_cwd) + run_dir = self.run_dir.new_dir(name) + proc = process.RemoteProcess(name, run_dir, self.remote_user, self.remote_addr(), remote_cwd, + popen_args) self.suite_run.remember_to_stop(proc, keepalive) proc.launch() return proc - def run_local(self, name, popen_args): - run_dir = self.run_dir.new_dir(name) - proc = process.Process(name, run_dir, popen_args) - proc.launch() - proc.wait() - if proc.result != 0: - log.ctx(proc) - raise log.Error('Exited in error') - def create_pcu(self): return pcu_sysmo.OsmoPcuSysmo(self.suite_run, self, self.conf) @@ -124,23 +104,14 @@ if not self.inst.isfile('bin', SysmoBts.BTS_SYSMO_BIN): raise log.Error('No osmo-bts-sysmo binary in', self.inst) - self.remote_dir = util.Dir(SysmoBts.REMOTE_DIR) - self.remote_inst = util.Dir(self.remote_dir.child(os.path.basename(str(self.inst)))) + remote_run_dir = util.Dir(SysmoBts.REMOTE_DIR) - self.run_remote('rm-remote-dir', ('test', '!', '-d', SysmoBts.REMOTE_DIR, '||', 'rm', '-rf', SysmoBts.REMOTE_DIR)) - self.run_remote('mk-remote-dir', ('mkdir', '-p', SysmoBts.REMOTE_DIR)) - self.run_local('scp-inst-to-sysmobts', - ('scp', '-r', str(self.inst), '%s@%s:%s' % (self.remote_user, self.remote_addr(), str(self.remote_inst)))) + self.remote_inst = process.copy_inst_ssh(self.run_dir, self.inst, remote_run_dir, self.remote_user, + self.remote_addr(), SysmoBts.BTS_SYSMO_BIN, self.config_file) + process.run_remote_sync(self.run_dir, self.remote_user, self.remote_addr(), 'reload-dsp-firmware', + ('/bin/sh', '-c', '"cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0 ; cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0"')) - remote_run_dir = self.remote_dir.child(SysmoBts.BTS_SYSMO_BIN) - self.run_remote('mk-remote-run-dir', ('mkdir', '-p', remote_run_dir)) - - remote_config_file = self.remote_dir.child(SysmoBts.BTS_SYSMO_CFG) - self.run_local('scp-cfg-to-sysmobts', - ('scp', '-r', self.config_file, '%s@%s:%s' % (self.remote_user, self.remote_addr(), remote_config_file))) - - self.run_remote('reload-dsp-firmware', ('/bin/sh', '-c', '"cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0 ; cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0"')) - + remote_config_file = remote_run_dir.child(SysmoBts.BTS_SYSMO_CFG) remote_lib = self.remote_inst.child('lib') remote_binary = self.remote_inst.child('bin', 'osmo-bts-sysmo') diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py index ad2405d..9db9241 100644 --- a/src/osmo_gsm_tester/process.py +++ b/src/osmo_gsm_tester/process.py @@ -233,4 +233,41 @@ ' '.join(self.popen_args))] self.dbg(self.popen_args, dir=self.run_dir, conf=self.popen_kwargs) + +def run_local_sync(run_dir, name, popen_args): + run_dir =run_dir.new_dir(name) + proc = Process(name, run_dir, popen_args) + proc.launch() + proc.wait() + if proc.result != 0: + log.ctx(proc) + raise log.Error('Exited in error') + +def run_remote_sync(run_dir, remote_user, remote_addr, name, popen_args, remote_cwd=None): + run_dir = run_dir.new_dir(name) + proc = RemoteProcess(name, run_dir, remote_user, remote_addr, remote_cwd, + popen_args) + proc.launch() + proc.wait() + if proc.result != 0: + log.ctx(proc) + raise log.Error('Exited in error') + +def scp(run_dir, remote_user, remote_addr, name, local_path, remote_path): + run_local_sync(run_dir, name, ('scp', '-r', local_path, '%s@%s:%s' % (remote_user, remote_addr, remote_path))) + +def copy_inst_ssh(run_dir, inst, remote_dir, remote_user, remote_addr, remote_rundir_append, cfg_file_name): + remote_inst = Dir(remote_dir.child(os.path.basename(str(inst)))) + remote_dir_str = str(remote_dir) + run_remote_sync(run_dir, remote_user, remote_addr, 'rm-remote-dir', ('test', '!', '-d', remote_dir_str, '||', 'rm', '-rf', remote_dir_str)) + run_remote_sync(run_dir, remote_user, remote_addr, 'mk-remote-dir', ('mkdir', '-p', remote_dir_str)) + scp(run_dir, remote_user, remote_addr, 'scp-inst-to-remote', str(inst), remote_dir_str) + + remote_run_dir = remote_dir.child(remote_rundir_append) + run_remote_sync(run_dir, remote_user, remote_addr, 'mk-remote-run-dir', ('mkdir', '-p', remote_run_dir)) + + remote_config_file = remote_dir.child(os.path.basename(cfg_file_name)) + scp(run_dir, remote_user, remote_addr, 'scp-cfg-to-remote', cfg_file_name, remote_config_file) + return remote_inst + # vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit https://gerrit.osmocom.org/11190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I838b999528695207e1147cfe76e6f7aaf3b1dd53 Gerrit-Change-Number: 11190 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 10:18:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 10:18:09 +0000 Subject: Change in osmo-gsm-tester[master]: osmotrx: Allow running osmo-trx from remote host In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11191 ) Change subject: osmotrx: Allow running osmo-trx from remote host ...................................................................... osmotrx: Allow running osmo-trx from remote host Change-Id: Ia31ac8eb41e02eda28d9f6f56774679300244ee8 --- M example/resources.conf.rnd M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/resource.py 3 files changed, 31 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd index 74b8e3e..2067efc 100644 --- a/example/resources.conf.rnd +++ b/example/resources.conf.rnd @@ -28,6 +28,8 @@ type: uhd launch_trx: true clock_reference: external + remote_user: jenkins + trx_ip: 127.0.0.1 ciphers: [a5_0, a5_1] - label: NanoBTS-ONW-1900 diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index e7e3542..3ed596a 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -141,6 +141,7 @@ class OsmoTrx(log.Origin, metaclass=ABCMeta): CONF_OSMO_TRX = 'osmo-trx.cfg' + REMOTE_DIR = '/osmo-gsm-tester-trx/last_run' ############## # PROTECTED @@ -150,8 +151,10 @@ self.suite_run = suite_run self.conf = conf self.env = {} - self.listen_ip = conf.get('trx_ip') - self.bts_ip = conf.get('bts_ip') + self.log("OSMOTRX CONF: %r" % conf) + self.listen_ip = conf.get('osmo_trx', {}).get('trx_ip') + self.bts_ip = conf.get('osmo_trx', {}).get('bts_ip') + self.remote_user = conf.get('osmo_trx', {}).get('remote_user', None) self.run_dir = None self.inst = None self.proc_trx = None @@ -184,7 +187,7 @@ self.dbg(r) f.write(r) - def launch_process(self, keepalive, binary_name, *args): + def launch_process_local(self, keepalive, binary_name, *args): binary = os.path.abspath(self.inst.child('bin', binary_name)) run_dir = self.run_dir.new_dir(binary_name) if not os.path.isfile(binary): @@ -196,6 +199,14 @@ proc.launch() return proc + def launch_process_remote(self, name, popen_args, remote_cwd=None, keepalive=False): + run_dir = self.run_dir.new_dir(name) + proc = process.RemoteProcess(name, run_dir, self.remote_user, self.listen_ip, remote_cwd, + popen_args) + self.suite_run.remember_to_stop(proc, keepalive) + proc.launch() + return proc + ############## # PUBLIC (test API included) ############## @@ -203,10 +214,21 @@ self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) self.configure() self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-trx'))) - lib = self.inst.child('lib') - self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } - self.proc_trx = self.launch_process(keepalive, self.binary_name(), + if not self.remote_user: + # Run locally if ssh user is not set + lib = self.inst.child('lib') + self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } + self.proc_trx = self.launch_process_local(keepalive, self.binary_name(), '-C', os.path.abspath(self.config_file)) + else: + remote_run_dir = util.Dir(OsmoTrx.REMOTE_DIR) + self.remote_inst = process.copy_inst_ssh(self.run_dir, self.inst, remote_run_dir, self.remote_user, + self.listen_ip, self.binary_name(), self.config_file) + remote_config_file = remote_run_dir.child(OsmoTrx.CONF_OSMO_TRX) + remote_lib = self.remote_inst.child('lib') + remote_binary = self.remote_inst.child('bin', self.binary_name()) + args = ('LD_LIBRARY_PATH=%s' % remote_lib, remote_binary, '-C', remote_config_file) + self.proc_trx = self.launch_process_remote(self.binary_name(), args, remote_cwd=remote_run_dir, keepalive=keepalive) def trx_ready(self): if not self.proc_trx or not self.proc_trx.is_running: diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index e043d87..3f2ddc7 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -72,6 +72,7 @@ 'bts[].osmo_trx.type': schema.STR, 'bts[].osmo_trx.clock_reference': schema.OSMO_TRX_CLOCK_REF, 'bts[].osmo_trx.trx_ip': schema.IPV4, + 'bts[].osmo_trx.remote_user': schema.STR, 'bts[].osmo_trx.multi_arfcn': schema.BOOL_STR, 'arfcn[].arfcn': schema.INT, 'arfcn[].band': schema.BAND, -- To view, visit https://gerrit.osmocom.org/11191 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia31ac8eb41e02eda28d9f6f56774679300244ee8 Gerrit-Change-Number: 11191 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 10:18:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 10:18:09 +0000 Subject: Change in osmo-gsm-tester[master]: osmotrx: Make sure remote process stops after ssh session is closed In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11192 ) Change subject: osmotrx: Make sure remote process stops after ssh session is closed ...................................................................... osmotrx: Make sure remote process stops after ssh session is closed First of all, it was found that vty allocation must be forced (-t -t) during ssh session creation to make sure SIGHUP is forwarded when session is closed. Second, since osmo-trx ignores SIGHUP (osmo_init_ignore_signals()), we must add a wrapper script which converts received SIGHUP into a SIGINT to stop osmo-trx. Change-Id: Ic334a54b1a1827d74fe0b453ac32bb77b8616147 --- M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/bts_sysmo.py M src/osmo_gsm_tester/process.py 3 files changed, 43 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 3ed596a..a1814dc 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -18,6 +18,7 @@ # along with this program. If not, see . import os +import stat import pprint import tempfile from abc import ABCMeta, abstractmethod @@ -142,6 +143,7 @@ CONF_OSMO_TRX = 'osmo-trx.cfg' REMOTE_DIR = '/osmo-gsm-tester-trx/last_run' + WRAPPER_SCRIPT = 'ssh_sigkiller.sh' ############## # PROTECTED @@ -207,6 +209,28 @@ proc.launch() return proc + def generate_wrapper_script(self): + wrapper_script = self.run_dir.new_file(OsmoTrx.WRAPPER_SCRIPT) + with open(wrapper_script, 'w') as f: + r = """#!/bin/bash + mypid=0 + sign_handler() { + sig=$1 + echo "received signal handler $sig, killing $mypid" + kill $mypid + } + trap 'sign_handler SIGINT' SIGINT + trap 'sign_handler SIGHUP' SIGHUP + "$@" & + mypid=$! + echo "waiting for $mypid" + wait $mypid + """ + f.write(r) + st = os.stat(wrapper_script) + os.chmod(wrapper_script, st.st_mode | stat.S_IEXEC) + return wrapper_script + ############## # PUBLIC (test API included) ############## @@ -221,13 +245,21 @@ self.proc_trx = self.launch_process_local(keepalive, self.binary_name(), '-C', os.path.abspath(self.config_file)) else: + # Run remotely through ssh. We need to run osmo-trx under a wrapper + # script since osmo-trx ignores SIGHUP and will keep running after + # we close local ssh session. The wrapper script catches SIGHUP and + # sends SIGINT to it. + wrapper_script = self.generate_wrapper_script() remote_run_dir = util.Dir(OsmoTrx.REMOTE_DIR) self.remote_inst = process.copy_inst_ssh(self.run_dir, self.inst, remote_run_dir, self.remote_user, self.listen_ip, self.binary_name(), self.config_file) + remote_wrapper_script = remote_run_dir.child(OsmoTrx.WRAPPER_SCRIPT) remote_config_file = remote_run_dir.child(OsmoTrx.CONF_OSMO_TRX) remote_lib = self.remote_inst.child('lib') remote_binary = self.remote_inst.child('bin', self.binary_name()) - args = ('LD_LIBRARY_PATH=%s' % remote_lib, remote_binary, '-C', remote_config_file) + process.scp(self.run_dir, self.remote_user, self.listen_ip, 'scp-wrapper-to-remote', wrapper_script, remote_wrapper_script) + + args = ('LD_LIBRARY_PATH=%s' % remote_lib, remote_wrapper_script, remote_binary, '-C', remote_config_file) self.proc_trx = self.launch_process_remote(self.binary_name(), args, remote_cwd=remote_run_dir, keepalive=keepalive) def trx_ready(self): diff --git a/src/osmo_gsm_tester/bts_sysmo.py b/src/osmo_gsm_tester/bts_sysmo.py index bdf6bb7..66d305a 100644 --- a/src/osmo_gsm_tester/bts_sysmo.py +++ b/src/osmo_gsm_tester/bts_sysmo.py @@ -90,6 +90,12 @@ ################### # PUBLIC (test API included) ################### + # We get log from ssh stdout instead of usual stderr. + def ready_for_pcu(self): + if not self.proc_bts or not self.proc_bts.is_running: + return False + return 'BTS is up' in (self.proc_bts.get_stdout() or '') + def start(self, keepalive=False): if self.bsc is None: raise RuntimeError('BTS needs to be added to a BSC or NITB before it can be started') diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py index 9db9241..534cdba 100644 --- a/src/osmo_gsm_tester/process.py +++ b/src/osmo_gsm_tester/process.py @@ -228,7 +228,10 @@ cd = 'cd "%s"; ' % self.remote_cwd else: cd = '' - self.popen_args = ['ssh', self.remote_user+'@'+self.remote_host, + # We need double -t to force tty and be able to forward signals to + # processes (SIGHUP) when we close ssh on the local side. As a result, + # stderr seems to be merged into stdout in ssh client. + self.popen_args = ['ssh', '-t', '-t', self.remote_user+'@'+self.remote_host, '%s%s' % (cd, ' '.join(self.popen_args))] self.dbg(self.popen_args, dir=self.run_dir, conf=self.popen_kwargs) -- To view, visit https://gerrit.osmocom.org/11192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic334a54b1a1827d74fe0b453ac32bb77b8616147 Gerrit-Change-Number: 11192 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 10:18:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 10:18:10 +0000 Subject: Change in osmo-gsm-tester[master]: bts_osmo: Only check for socket path in ready_for_pcu() In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11195 ) Change subject: bts_osmo: Only check for socket path in ready_for_pcu() ...................................................................... bts_osmo: Only check for socket path in ready_for_pcu() Previous implementation was done due to osmo-pcu dying if failed to connect to not-yet prepared BTS. This is no longer the case, so we can start osmo-pcu as soon as the socket exists. Change-Id: I3aa6bef0c4893bdcac668002ca018af019f666a3 --- M src/osmo_gsm_tester/bts_osmo.py 1 file changed, 8 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py index 32784bd..89572ec 100644 --- a/src/osmo_gsm_tester/bts_osmo.py +++ b/src/osmo_gsm_tester/bts_osmo.py @@ -61,10 +61,10 @@ # coming from bts.Bts, we forward the implementation to children. pass + @abstractmethod def ready_for_pcu(self): - if not self.proc_bts or not self.proc_bts.is_running: - return False - return 'BTS is up' in (self.proc_bts.get_stderr() or '') + 'Used by tests to know when BTS is prepared and PCU can be started.' + pass def pcu(self): if self._pcu is None: @@ -107,6 +107,11 @@ ################### # PUBLIC (test API included) ################### + def ready_for_pcu(self): + if not self.proc_bts or not self.proc_bts.is_running: + return False + return os.path.exists(self.pcu_socket_path()) + @abstractmethod def start(self, keepalive=False): # coming from bts.Bts, we forward the implementation to children. -- To view, visit https://gerrit.osmocom.org/11195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3aa6bef0c4893bdcac668002ca018af019f666a3 Gerrit-Change-Number: 11195 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 10:18:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 10:18:10 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf.prod: Use specific remote machine to run osmo-trx In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11196 ) Change subject: resources.conf.prod: Use specific remote machine to run osmo-trx ...................................................................... resources.conf.prod: Use specific remote machine to run osmo-trx Run osmo-trx in a separate more powerful machine (i5) rather than running in low end APU where osmo-gsm-tester runs. Change-Id: I0479643789783d5e8a142042a65c4d53020d1e79 --- M example/resources.conf.prod 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/example/resources.conf.prod b/example/resources.conf.prod index 41ab009..e3c5ad8 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -27,6 +27,8 @@ ciphers: [a5_0, a5_1] osmo_trx: launch_trx: true + remote_user: jenkins + trx_ip: 10.42.42.230 clock_reference: external - label: sysmoCell 5000 -- To view, visit https://gerrit.osmocom.org/11196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0479643789783d5e8a142042a65c4d53020d1e79 Gerrit-Change-Number: 11196 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 10:18:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 10:18:11 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-trx: Enable multi_arfcn for B200 and only in multiTRX setup In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11197 ) Change subject: osmo-trx: Enable multi_arfcn for B200 and only in multiTRX setup ...................................................................... osmo-trx: Enable multi_arfcn for B200 and only in multiTRX setup Change-Id: I6a29e1813f0603b00b49b7b7c805be23a72cf0e3 --- M example/resources.conf.prod M example/resources.conf.rnd M src/osmo_gsm_tester/bts_osmotrx.py 3 files changed, 8 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/example/resources.conf.prod b/example/resources.conf.prod index e3c5ad8..88358ac 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -30,6 +30,7 @@ remote_user: jenkins trx_ip: 10.42.42.230 clock_reference: external + multi_arfcn: true - label: sysmoCell 5000 type: osmo-bts-trx diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd index 2067efc..dbdf3cc 100644 --- a/example/resources.conf.rnd +++ b/example/resources.conf.rnd @@ -28,6 +28,7 @@ type: uhd launch_trx: true clock_reference: external + multi_arfcn: true remote_user: jenkins trx_ip: 127.0.0.1 ciphers: [a5_0, a5_1] diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index a1814dc..79c541d 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -179,7 +179,12 @@ self.dbg(config_file=self.config_file) values = self.conf - multi_arfcn_bool = util.str2bool(values.get('osmo_trx', {}).get('multi_arfcn', False)) + + # we don't need to enable multi-arfcn for single channel + if len(values.get('osmo_trx', {}).get('channels', [])) > 1: + multi_arfcn_bool = util.str2bool(values.get('osmo_trx', {}).get('multi_arfcn', False)) + else: + multi_arfcn_bool = False config.overlay(values, { 'osmo_trx': { 'multi_arfcn': multi_arfcn_bool } }) self.dbg('OSMO-TRX CONFIG:\n' + pprint.pformat(values)) -- To view, visit https://gerrit.osmocom.org/11197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6a29e1813f0603b00b49b7b7c805be23a72cf0e3 Gerrit-Change-Number: 11197 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 10:37:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 10:37:42 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites.conf: Add test to check multiTRX with Ettus B200 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11206 Change subject: default-suites.conf: Add test to check multiTRX with Ettus B200 ...................................................................... default-suites.conf: Add test to check multiTRX with Ettus B200 Change-Id: Ied768938851488c3f502b2d41334afa17f7f5401 --- M example/default-suites.conf 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/06/11206/1 diff --git a/example/default-suites.conf b/example/default-suites.conf index 14e30d4..597dc0d 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -26,9 +26,11 @@ - voice:trx-b200+mod-bts0-ts-tchh+cfg-codec-hr3 - voice:trx-b200+mod-bts0-dynts-ipa - voice:trx-b200+mod-bts0-dynts-osmo +- voice:trx-b200+mod-bts0-numtrx2+mod-bts0-chanallocdescend - gprs:trx-b200 - gprs:trx-b200+mod-bts0-dynts-ipa - gprs:trx-b200+mod-bts0-dynts-osmo +- gprs:trx-b200+mod-bts0-numtrx2+mod-bts0-chanallocdescend - dynts:trx-b200+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 - dynts:trx-b200+mod-bts0-dynts67-osmo.conf+cfg-codec-fr1 -- To view, visit https://gerrit.osmocom.org/11206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ied768938851488c3f502b2d41334afa17f7f5401 Gerrit-Change-Number: 11206 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 11:20:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 11:20:35 +0000 Subject: Change in libosmo-abis[master]: e1_input.h: Set correct type for input_signal_data->link_type Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11207 Change subject: e1_input.h: Set correct type for input_signal_data->link_type ...................................................................... e1_input.h: Set correct type for input_signal_data->link_type link_type field holds values from link->type as set in e1inp_int_snd_event(). Change-Id: Iaa33b793f89f2d16c9d949503c5ecc195bbcd2a4 --- M include/osmocom/abis/e1_input.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/07/11207/1 diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index f9b4850..e6d5154 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -314,7 +314,7 @@ /* XXX */ struct input_signal_data { - int link_type; + enum e1inp_sign_type link_type; uint8_t tei; uint8_t sapi; uint8_t ts_nr; -- To view, visit https://gerrit.osmocom.org/11207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa33b793f89f2d16c9d949503c5ecc195bbcd2a4 Gerrit-Change-Number: 11207 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 11:25:05 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 3 Oct 2018 11:25:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11204 to look at the new patch set (#2). Change subject: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() ...................................................................... BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() For some reason, in f_TC_encr_cmd() it was expected / assumed that when a ciphered I-frame is sent from MS on L1CTL, nothing else than this frame would arrive. But since we have fixed Measurement Reporting in trxcon (see OS#2988), the MR related messages do appear on A-bis interface now! This change introduces a new function f_data_mo(), which should be used to send I-frames from MS and expect them on A-bis. So, the following test cases: - TC_encr_cmd_a51; - TC_encr_cmd_a52; - TC_encr_cmd_a53; should pass with both trxcon and Calypso PHY now :) Change-Id: I08cb28dd9fa23f3ef8b0c9ede3d4c47f5702a1c1 --- M bts/BTS_Tests.ttcn 1 file changed, 37 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/11204/2 -- To view, visit https://gerrit.osmocom.org/11204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I08cb28dd9fa23f3ef8b0c9ede3d4c47f5702a1c1 Gerrit-Change-Number: 11204 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 11:25:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 3 Oct 2018 11:25:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RSL_Types.ttcn: fix inadequate template restriction Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11208 Change subject: library/RSL_Types.ttcn: fix inadequate template restriction ...................................................................... library/RSL_Types.ttcn: fix inadequate template restriction The 'tr_RSL_UNITDATA_IND' is a 'response' template, so there is no reason to restrict 'link_id' to any obvious value. Change-Id: I29ac0a2828b565baa1d2f3ac0a922bc441378f94 --- M library/RSL_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/11208/1 diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index 7992132..5afabe1 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -1076,7 +1076,7 @@ msg_type := RSL_MT_UNIT_DATA_IND } template RSL_Message tr_RSL_UNITDATA_IND(template RslChannelNr chan_nr, - template (value) RslLinkId link_id, + template RslLinkId link_id, template octetstring l3_info) modifies tr_RSL_DATA_IND := { msg_type := RSL_MT_UNIT_DATA_IND -- To view, visit https://gerrit.osmocom.org/11208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I29ac0a2828b565baa1d2f3ac0a922bc441378f94 Gerrit-Change-Number: 11208 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 11:25:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 3 Oct 2018 11:25:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RSL_Types.ttcn: expect any l3_info for 'tr_RSL_UNITDATA_*' by... Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11209 Change subject: library/RSL_Types.ttcn: expect any l3_info for 'tr_RSL_UNITDATA_*' by default ...................................................................... library/RSL_Types.ttcn: expect any l3_info for 'tr_RSL_UNITDATA_*' by default This is quite useful when one needs to expect an RSL UNITDATA message with any payload. Let's set 'l3_info' to '?' by default, like it's already done for 'ts_RSL_DATA_*'. Change-Id: I45260343b34d8d054e7efa72de11dd4cb510a8cc --- M library/RSL_Types.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/09/11209/1 diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index 5afabe1..cd4ba58 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -1062,7 +1062,7 @@ } template RSL_Message tr_RSL_UNITDATA_REQ(template RslChannelNr chan_nr, template RslLinkId link_id, - template octetstring l3_info) + template octetstring l3_info := ?) modifies tr_RSL_DATA_REQ := { msg_type := RSL_MT_UNIT_DATA_REQ } @@ -1077,7 +1077,7 @@ } template RSL_Message tr_RSL_UNITDATA_IND(template RslChannelNr chan_nr, template RslLinkId link_id, - template octetstring l3_info) + template octetstring l3_info := ?) modifies tr_RSL_DATA_IND := { msg_type := RSL_MT_UNIT_DATA_IND } -- To view, visit https://gerrit.osmocom.org/11209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I45260343b34d8d054e7efa72de11dd4cb510a8cc Gerrit-Change-Number: 11209 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 11:25:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 3 Oct 2018 11:25:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: extend f_unitdata_mo() with tolerance parameters Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11210 Change subject: BTS_Tests.ttcn: extend f_unitdata_mo() with tolerance parameters ...................................................................... BTS_Tests.ttcn: extend f_unitdata_mo() with tolerance parameters The ability to control which kinds of RSL messages are permitted in a given use case (and which are not) makes f_unitdata_mo() function much more flexible. Let's introduce two new parameters, one of which would make its 'alt' statement tolerant to SACCH messages (Measurement Reports), and another to other kinds of RSL messages. Please note that the original behaviour of f_unitdata_mo() went untouched, so it's still tolerant to any other messages. Change-Id: I15782ec93d68a0dc54b2ed7a84cb70d780ba0ce1 --- M bts/BTS_Tests.ttcn 1 file changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/10/11210/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 809a403..b078956 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3731,7 +3731,12 @@ } /* Send UI frame from MS and expect it to arrive as RLL UNITDATA IND on Abis */ -function f_unitdata_mo(RslLinkId link_id, octetstring l3) runs on ConnHdlr { +function f_unitdata_mo( + RslLinkId link_id, + octetstring l3, + boolean exp_sacch := true, /* Should tolerate SACCH messages? */ + boolean exp_any := true /* Should tolerate any other RSL messages? */ +) runs on ConnHdlr { timer T := 3.0; f_tx_lapdm(ts_LAPDm_UI(link_id.sapi, cr_MO_CMD, l3), link_id); T.start; @@ -3740,11 +3745,22 @@ [] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, link_id, l3)) { setverdict(pass); } + /* Expect (or not expect) SACCH messages (Measurement Reports) */ + [exp_sacch] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) { repeat; } + [not exp_sacch] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) { + setverdict(fail, "Unexpected (SACCH) UNIT_DATA_IND message!"); + mtc.stop; + } + /* Expect (or not expect) other kinds of messages */ + [exp_any] RSL.receive { repeat; } + [not exp_any] RSL.receive { + setverdict(fail, "Unexpected RSL message!"); + mtc.stop; + } [] T.timeout { setverdict(fail, "Timeout waiting for UNIT_DATA_IND"); mtc.stop; } - [] RSL.receive { repeat; } } } -- To view, visit https://gerrit.osmocom.org/11210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I15782ec93d68a0dc54b2ed7a84cb70d780ba0ce1 Gerrit-Change-Number: 11210 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 11:30:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 3 Oct 2018 11:30:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: don't tolerate any RSL messages by default Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11211 Change subject: BTS_Tests.ttcn: don't tolerate any RSL messages by default ...................................................................... BTS_Tests.ttcn: don't tolerate any RSL messages by default Change-Id: I70dc8af999eed8f7ed6a0d9dad4d3a9406340017 --- M bts/BTS_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/11/11211/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 5eebff1..41b670e 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3735,7 +3735,7 @@ RslLinkId link_id, octetstring l3, boolean exp_sacch := true, /* Should tolerate SACCH messages? */ - boolean exp_any := true /* Should tolerate any other RSL messages? */ + boolean exp_any := false /* Should tolerate any other RSL messages? */ ) runs on ConnHdlr { timer T := 3.0; f_tx_lapdm(ts_LAPDm_UI(link_id.sapi, cr_MO_CMD, l3), link_id); @@ -3770,7 +3770,7 @@ boolean p, uint3_t nr, uint3_t ns, octetstring l3, boolean exp_sacch := true, /* Should tolerate SACCH messages? */ - boolean exp_any := true /* Should tolerate any other RSL messages? */ + boolean exp_any := false /* Should tolerate any other RSL messages? */ ) runs on ConnHdlr { timer T := 3.0; f_tx_lapdm(ts_LAPDm_I(link_id.sapi, cr_MO_CMD, p, nr, ns, l3), link_id); -- To view, visit https://gerrit.osmocom.org/11211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I70dc8af999eed8f7ed6a0d9dad4d3a9406340017 Gerrit-Change-Number: 11211 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 11:31:51 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 3 Oct 2018 11:31:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11204 ) Change subject: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11204/2/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11204/2/bts/BTS_Tests.ttcn at 3783 PS2, Line 3783: /* Expect (or not expect) SACCH messages (Measurement Reports) */ BTW: I think it would be good to share this altstep, and use it from both functions. -- To view, visit https://gerrit.osmocom.org/11204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I08cb28dd9fa23f3ef8b0c9ede3d4c47f5702a1c1 Gerrit-Change-Number: 11204 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 03 Oct 2018 11:31:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 12:35:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 12:35:50 +0000 Subject: Change in osmo-gsm-tester[master]: templates: Update .cfg files to use logging level set-all Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11212 Change subject: templates: Update .cfg files to use logging level set-all ...................................................................... templates: Update .cfg files to use logging level set-all VTY cmd "logging level all" is deprecated in favour of "logging level set-all", but the required behaviour in this case is "logging level set-all". Change-Id: Ice54fca6be86f05a02ce4ae783e6e42e6958b95d --- M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl M src/osmo_gsm_tester/templates/sysmobts-mgr.cfg.tmpl 12 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/12/11212/1 diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl index 95bf5e3..0d53ccb 100644 --- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl @@ -4,7 +4,7 @@ logging color 1 logging print category 1 logging print extended-timestamp 1 - logging level all debug + logging level set-all debug line vty no login bind ${bsc.ip_address.addr} diff --git a/src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl index 3f2d0e7..782f1e8 100644 --- a/src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl @@ -29,7 +29,7 @@ logging level lsua notice logging level lm3ua notice logging level lmgcp notice - logging level all debug + logging level set-all debug ! stats interval 5 ! diff --git a/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl index 014efd3..b573620 100644 --- a/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl @@ -4,7 +4,7 @@ logging color 1 logging print category 1 logging print extended-timestamp 1 - logging level all debug + logging level set-all debug line vty no login bind ${hlr.ip_address.addr} diff --git a/src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl index 28a3798..970d53c 100644 --- a/src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl @@ -4,7 +4,7 @@ logging color 1 logging print category 1 logging print extended-timestamp 1 - logging level all debug + logging level set-all debug line vty no login bind ${mgcpgw.ip_address.addr} diff --git a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl index 485a88b..b370d5e 100644 --- a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl @@ -4,7 +4,7 @@ logging color 1 logging print category 1 logging print extended-timestamp 1 - logging level all debug + logging level set-all debug line vty no login bind ${msc.ip_address.addr} diff --git a/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl index 2c27273..764ca94 100644 --- a/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl @@ -6,7 +6,7 @@ logging color 1 logging print category 1 logging print extended-timestamp 1 - logging level all debug + logging level set-all debug ! line vty no login diff --git a/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl index 632bc27..5482b09 100644 --- a/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl @@ -2,7 +2,7 @@ logging color 1 logging print extended-timestamp 1 logging print category 1 - logging level all debug + logging level set-all debug pcu pcu-socket ${osmo_pcu_sysmo.pcu_socket_path} flow-control-interval 10 diff --git a/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl index 02382c2..86cb1a4 100644 --- a/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl @@ -2,7 +2,7 @@ logging color 1 logging print extended-timestamp 1 logging print category 1 - logging level all debug + logging level set-all debug pcu pcu-socket ${osmo_pcu.pcu_socket_path} flow-control-interval 10 diff --git a/src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl index 9faf316..a59b7cd 100644 --- a/src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl @@ -7,7 +7,7 @@ logging color 1 logging print category 1 logging print extended-timestamp 1 - logging level all debug + logging level set-all debug line vty no login sgsn diff --git a/src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl index 6504b9e..c180e82 100644 --- a/src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl @@ -4,7 +4,7 @@ logging color 1 logging print category 1 logging print extended-timestamp 1 - logging level all debug + logging level set-all debug line vty no login bind ${stp.ip_address.addr} diff --git a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl index 0003f1b..e7f2fb8 100644 --- a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl @@ -8,7 +8,7 @@ logging timestamp 1 logging print file basename logging print extended-timestamp 1 - logging level all info + logging level set-all info ! line vty bind ${osmo_trx.trx_ip} diff --git a/src/osmo_gsm_tester/templates/sysmobts-mgr.cfg.tmpl b/src/osmo_gsm_tester/templates/sysmobts-mgr.cfg.tmpl index 3b28d78..cbe98a2 100644 --- a/src/osmo_gsm_tester/templates/sysmobts-mgr.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/sysmobts-mgr.cfg.tmpl @@ -6,7 +6,7 @@ logging filter all 1 logging color 1 logging timestamp 0 - logging level all everything + logging level set-all everything logging level temp info logging level fw info logging level find info -- To view, visit https://gerrit.osmocom.org/11212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ice54fca6be86f05a02ce4ae783e6e42e6958b95d Gerrit-Change-Number: 11212 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 12:35:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 12:35:51 +0000 Subject: Change in osmo-gsm-tester[master]: Drop unused sysmobts-mgr.cfg.tmpl Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11213 Change subject: Drop unused sysmobts-mgr.cfg.tmpl ...................................................................... Drop unused sysmobts-mgr.cfg.tmpl Change-Id: I09632a6b4d3a431f1699d00843b9d7ee257a8b4c --- D src/osmo_gsm_tester/templates/sysmobts-mgr.cfg.tmpl 1 file changed, 0 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/13/11213/1 diff --git a/src/osmo_gsm_tester/templates/sysmobts-mgr.cfg.tmpl b/src/osmo_gsm_tester/templates/sysmobts-mgr.cfg.tmpl deleted file mode 100644 index cbe98a2..0000000 --- a/src/osmo_gsm_tester/templates/sysmobts-mgr.cfg.tmpl +++ /dev/null @@ -1,24 +0,0 @@ -! -! SysmoMgr (0.3.0.141-33e5) configuration saved from vty -!! -! -log stderr - logging filter all 1 - logging color 1 - logging timestamp 0 - logging level set-all everything - logging level temp info - logging level fw info - logging level find info - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice -! -line vty - no login -! -sysmobts-mgr -- To view, visit https://gerrit.osmocom.org/11213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I09632a6b4d3a431f1699d00843b9d7ee257a8b4c Gerrit-Change-Number: 11213 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 12:39:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 12:39:47 +0000 Subject: Change in osmo-bts[master]: abis: inp_s_cbfn: Improve logging signal related information Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11214 Change subject: abis: inp_s_cbfn: Improve logging signal related information ...................................................................... abis: inp_s_cbfn: Improve logging signal related information Change-Id: Ia63b69882c74155bcae2e027a21ea7e319647256 --- M src/common/abis.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/14/11214/1 diff --git a/src/common/abis.c b/src/common/abis.c index c0bccdb..84a3a04 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -226,7 +226,9 @@ if (subsys != SS_L_INPUT) return 0; - DEBUGP(DABIS, "Input Signal %u received\n", signal); + struct input_signal_data *isd = signal_data; + DEBUGP(DABIS, "Input Signal %s received for link_type=%s\n", + get_value_string(e1inp_signal_names, signal), e1inp_signtype_name(isd->link_type)); return 0; } -- To view, visit https://gerrit.osmocom.org/11214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia63b69882c74155bcae2e027a21ea7e319647256 Gerrit-Change-Number: 11214 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 12:45:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 12:45:31 +0000 Subject: Change in osmo-gsm-tester[master]: templates: Update .cfg files to use logging level set-all In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11212 to look at the new patch set (#2). Change subject: templates: Update .cfg files to use logging level set-all ...................................................................... templates: Update .cfg files to use logging level set-all VTY cmd "logging level all" is deprecated in favour of "logging level set-all", but the required behaviour in this case is "logging level set-all". Change-Id: Ice54fca6be86f05a02ce4ae783e6e42e6958b95d --- M selftest/template_test.ok M selftest/template_test/osmo-nitb.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl M src/osmo_gsm_tester/templates/sysmobts-mgr.cfg.tmpl 14 files changed, 14 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/12/11212/2 -- To view, visit https://gerrit.osmocom.org/11212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ice54fca6be86f05a02ce4ae783e6e42e6958b95d Gerrit-Change-Number: 11212 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 12:47:24 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 3 Oct 2018 12:47:24 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: keep L1 header, drop L1CTL header Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11215 Change subject: layer23/l1ctl.c: keep L1 header, drop L1CTL header ...................................................................... layer23/l1ctl.c: keep L1 header, drop L1CTL header There is no need to keep the L1CTL header in messages being sent towards the upper layers, but the L1 info header can be used by L2&3 to obtain some information, e.g. TDMA frame number. Change-Id: Id64249f1b7a1c2be578263ba62aa195c452ab7e8 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 5 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/15/11215/1 diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index eedfb93..39b7f3c 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -244,10 +244,6 @@ else le = &ms->lapdm_channel.lapdm_dcch; - /* pull the L1 header from the msgb */ - msgb_pull(msg, msg->l2h - (msg->l1h-sizeof(struct l1ctl_hdr))); - msg->l1h = NULL; - osmo_prim_init(&pp.oph, SAP_GSM_PH, PRIM_PH_DATA, PRIM_OP_INDICATION, msg); pp.u.data.chan_nr = dl->chan_nr; @@ -638,8 +634,8 @@ /* just forward the SIM response to the SIM handler */ static int rx_l1_sim_conf(struct osmocom_ms *ms, struct msgb *msg) { - uint16_t len = msg->len - sizeof(struct l1ctl_hdr); - uint8_t *data = msg->data + sizeof(struct l1ctl_hdr); + uint16_t len = msgb_l2len(msg); + uint8_t *data = msg->data; if (apdu_len > -1 && apdu_len + len <= sizeof(apdu_data)) { memcpy(apdu_data + apdu_len, data, len); @@ -649,10 +645,6 @@ } LOGP(DL1C, LOGL_INFO, "SIM %s\n", osmo_hexdump(data, len)); - - /* pull the L1 header from the msgb */ - msgb_pull(msg, sizeof(struct l1ctl_hdr)); - msg->l1h = NULL; sim_apdu_resp(ms, msg); @@ -784,13 +776,8 @@ DEBUGP(DL1C, "TRAFFIC IND (%s)\n", osmo_hexdump(ti->data, 33)); /* distribute or drop */ - if (ms->l1_entity.l1_traffic_ind) { - /* pull the L1 header from the msgb */ - msgb_pull(msg, msg->l2h - (msg->l1h-sizeof(struct l1ctl_hdr))); - msg->l1h = NULL; - + if (ms->l1_entity.l1_traffic_ind) return ms->l1_entity.l1_traffic_ind(ms, msg); - } msgb_free(msg); return 0; @@ -895,7 +882,9 @@ return -1; } + /* Pull the L1CTL header from the msgb */ l1h = (struct l1ctl_hdr *) msg->l1h; + msgb_pull(msg, sizeof(struct l1ctl_hdr)); /* move the l1 header pointer to point _BEHIND_ l1ctl_hdr, as the l1ctl header is of no interest to subsequent code */ -- To view, visit https://gerrit.osmocom.org/11215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id64249f1b7a1c2be578263ba62aa195c452ab7e8 Gerrit-Change-Number: 11215 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 12:47:25 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 3 Oct 2018 12:47:25 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: fix: verify msg length against l1ctl_hdr Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11216 Change subject: layer23/l1ctl.c: fix: verify msg length against l1ctl_hdr ...................................................................... layer23/l1ctl.c: fix: verify msg length against l1ctl_hdr In l1ctl_recv() we actually expect to 'see' the L1CTL header instead of the DL info header. Let's fix this. Change-Id: Ic7d017bef04f3c186565d5dade36959df1019bd8 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/16/11216/1 diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 39b7f3c..9a3bc0e 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -873,9 +873,8 @@ { int rc = 0; struct l1ctl_hdr *l1h; - struct l1ctl_info_dl *dl; - if (msgb_l2len(msg) < sizeof(*dl)) { + if (msgb_l2len(msg) < sizeof(*l1h)) { LOGP(DL1C, LOGL_ERROR, "Short Layer2 message: %u\n", msgb_l2len(msg)); msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/11216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7d017bef04f3c186565d5dade36959df1019bd8 Gerrit-Change-Number: 11216 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 12:47:25 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 3 Oct 2018 12:47:25 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: fix: verify msg length using l1h, not l2h Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11217 Change subject: layer23/l1ctl.c: fix: verify msg length using l1h, not l2h ...................................................................... layer23/l1ctl.c: fix: verify msg length using l1h, not l2h The actual L1CTL header is pointed by 'msg->l1h', not 'l2h'! Since msg->l2h is NULL (because nobody set it), the result of msgb_l2len() would always be bigger than size of L1CTL header, as it is calculated in the following way: return msgb->tail - (uint8_t *)msgb_l2(msgb); So, in case if 'msg->l2h' is NULL, it turns into: return msgb->tail - 0; Change-Id: I7fe2e00bb45ba07c9bb7438445eededfa09c96f3 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/17/11217/1 diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 9a3bc0e..c8695ca 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -874,9 +874,10 @@ int rc = 0; struct l1ctl_hdr *l1h; - if (msgb_l2len(msg) < sizeof(*l1h)) { - LOGP(DL1C, LOGL_ERROR, "Short Layer2 message: %u\n", - msgb_l2len(msg)); + /* Make sure a message has L1CTL header (pointed by msg->l1h) */ + if (msgb_l1len(msg) < sizeof(*l1h)) { + LOGP(DL1C, LOGL_ERROR, "Short L1CTL message, " + "missing the header (len=%u)\n", msgb_l1len(msg)); msgb_free(msg); return -1; } -- To view, visit https://gerrit.osmocom.org/11217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7fe2e00bb45ba07c9bb7438445eededfa09c96f3 Gerrit-Change-Number: 11217 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 12:47:25 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 3 Oct 2018 12:47:25 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: avoid confusion between L1CTL / L1 headers Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11218 Change subject: layer23/l1ctl.c: avoid confusion between L1CTL / L1 headers ...................................................................... layer23/l1ctl.c: avoid confusion between L1CTL / L1 headers As we assign the payload following L1CTL header to 'msg->l1h', it makes sense to avoid possible naming confusion. Change-Id: I5d21ca8664b3445f472d3ffde90d0e11805dcb16 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/18/11218/1 diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index c8695ca..642cde8 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -872,10 +872,10 @@ int l1ctl_recv(struct osmocom_ms *ms, struct msgb *msg) { int rc = 0; - struct l1ctl_hdr *l1h; + struct l1ctl_hdr *hdr; /* Make sure a message has L1CTL header (pointed by msg->l1h) */ - if (msgb_l1len(msg) < sizeof(*l1h)) { + if (msgb_l1len(msg) < sizeof(*hdr)) { LOGP(DL1C, LOGL_ERROR, "Short L1CTL message, " "missing the header (len=%u)\n", msgb_l1len(msg)); msgb_free(msg); @@ -883,14 +883,14 @@ } /* Pull the L1CTL header from the msgb */ - l1h = (struct l1ctl_hdr *) msg->l1h; + hdr = (struct l1ctl_hdr *) msg->l1h; msgb_pull(msg, sizeof(struct l1ctl_hdr)); /* move the l1 header pointer to point _BEHIND_ l1ctl_hdr, as the l1ctl header is of no interest to subsequent code */ - msg->l1h = l1h->data; + msg->l1h = hdr->data; - switch (l1h->msg_type) { + switch (hdr->msg_type) { case L1CTL_FBSB_CONF: rc = rx_l1_fbsb_conf(ms, msg); msgb_free(msg); @@ -908,7 +908,7 @@ break; case L1CTL_PM_CONF: rc = rx_l1_pm_conf(ms, msg); - if (l1h->flags & L1CTL_F_DONE) + if (hdr->flags & L1CTL_F_DONE) osmo_signal_dispatch(SS_L1CTL, S_L1CTL_PM_DONE, ms); msgb_free(msg); break; @@ -937,7 +937,7 @@ msgb_free(msg); break; default: - LOGP(DL1C, LOGL_ERROR, "Unknown MSG: %u\n", l1h->msg_type); + LOGP(DL1C, LOGL_ERROR, "Unknown MSG: %u\n", hdr->msg_type); msgb_free(msg); break; } -- To view, visit https://gerrit.osmocom.org/11218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5d21ca8664b3445f472d3ffde90d0e11805dcb16 Gerrit-Change-Number: 11218 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 12:47:25 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 3 Oct 2018 12:47:25 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: clean up & fix message length checking Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11219 Change subject: layer23/l1ctl.c: clean up & fix message length checking ...................................................................... layer23/l1ctl.c: clean up & fix message length checking Almost all handlers for received L1CTL messages are also affected by the bug fixed in I7fe2e00bb45ba07c9bb7438445eededfa09c96f3. In short, they do verify the length of 'msg->l2h' or 'msg->l3h', but not the 'msg->l1h'. Let's fix this, and also add missing checks. Change-Id: I866bb5d97a1cc1b6cb887877bb444b9e3dca977a --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 44 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/19/11219/1 diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 642cde8..6f4a6d8 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -83,9 +83,9 @@ struct gsm_time tm; struct osmobb_fbsb_res fr; - if (msgb_l3len(msg) < sizeof(*dl) + sizeof(*sb)) { - LOGP(DL1C, LOGL_ERROR, "FBSB RESP: MSG too short %u\n", - msgb_l3len(msg)); + if (msgb_l1len(msg) < (sizeof(*dl) + sizeof(*sb))) { + LOGP(DL1C, LOGL_ERROR, "FBSB RESP: MSG too short (len=%u), " + "missing UL info header and/or payload\n", msgb_l1len(msg)); return -1; } @@ -121,9 +121,9 @@ struct osmo_phsap_prim pp; struct l1ctl_info_dl *dl; - if (msgb_l2len(msg) < sizeof(*dl)) { - LOGP(DL1C, LOGL_ERROR, "RACH CONF: MSG too short %u\n", - msgb_l3len(msg)); + if (msgb_l1len(msg) < sizeof(*dl)) { + LOGP(DL1C, LOGL_ERROR, "RACH CONF MSG too short " + "(len=%u), missing DL info header\n", msgb_l1len(msg)); msgb_free(msg); return -1; } @@ -150,9 +150,9 @@ uint8_t gsmtap_chan_type; struct gsm_time tm; - if (msgb_l3len(msg) < sizeof(*ccch)) { - LOGP(DL1C, LOGL_ERROR, "MSG too short Data Ind: %u\n", - msgb_l3len(msg)); + if (msgb_l1len(msg) < sizeof(*dl)) { + LOGP(DL1C, LOGL_ERROR, "DATA IND MSG too short (len=%u), " + "missing UL info header\n", msgb_l1len(msg)); msgb_free(msg); return -1; } @@ -260,6 +260,13 @@ struct l1ctl_info_dl *dl = (struct l1ctl_info_dl *) msg->l1h; struct lapdm_entity *le; + if (msgb_l1len(msg) < sizeof(*dl)) { + LOGP(DL1C, LOGL_ERROR, "DATA CONF MSG too short (len=%u), " + "missing UL info header\n", msgb_l1len(msg)); + msgb_free(msg); + return -1; + } + osmo_prim_init(&pp.oph, SAP_GSM_PH, PRIM_PH_RTS, PRIM_OP_INDICATION, msg); @@ -284,14 +291,12 @@ DEBUGP(DL1C, "(%s)\n", osmo_hexdump(msg->l2h, msgb_l2len(msg))); - if (msgb_l2len(msg) > 23) { - LOGP(DL1C, LOGL_ERROR, "L1 cannot handle message length " - "> 23 (%u)\n", msgb_l2len(msg)); + if (msgb_l2len(msg) != 23) { + LOGP(DL1C, LOGL_ERROR, "Wrong message length (len=%u), " + "DATA REQ ignored, please fix!\n", msgb_l2len(msg)); msgb_free(msg); return -EINVAL; - } else if (msgb_l2len(msg) < 23) - LOGP(DL1C, LOGL_ERROR, "L1 message length < 23 (%u) " - "doesn't seem right!\n", msgb_l2len(msg)); + } /* send copy via GSMTAP */ rsl_dec_chan_nr(chan_nr, &chan_type, &chan_ss, &chan_ts); @@ -702,6 +707,12 @@ { struct l1ctl_pm_conf *pmr; + if (msgb_l1len(msg) < sizeof(*pmr)) { + LOGP(DL1C, LOGL_ERROR, "PM CONF MSG too short (len=%u), " + "missing measurement results\n", msgb_l1len(msg)); + return -1; + } + for (pmr = (struct l1ctl_pm_conf *) msg->l1h; (uint8_t *) pmr < msg->tail; pmr++) { struct osmobb_meas_res mr; @@ -721,9 +732,9 @@ struct osmobb_ccch_mode_conf mc; struct l1ctl_ccch_mode_conf *conf; - if (msgb_l3len(msg) < sizeof(*conf)) { - LOGP(DL1C, LOGL_ERROR, "CCCH MODE CONF: MSG too short %u\n", - msgb_l3len(msg)); + if (msgb_l1len(msg) < sizeof(*conf)) { + LOGP(DL1C, LOGL_ERROR, "CCCH MODE CONF: MSG too short " + "(len=%u), missing CCCH mode info\n", msgb_l1len(msg)); return -1; } @@ -744,9 +755,9 @@ struct osmobb_tch_mode_conf mc; struct l1ctl_tch_mode_conf *conf; - if (msgb_l3len(msg) < sizeof(*conf)) { - LOGP(DL1C, LOGL_ERROR, "TCH MODE CONF: MSG too short %u\n", - msgb_l3len(msg)); + if (msgb_l1len(msg) < sizeof(*conf)) { + LOGP(DL1C, LOGL_ERROR, "TCH MODE CONF: MSG too short " + "(len=%u), missing TCH mode info\n", msgb_l1len(msg)); return -1; } @@ -768,6 +779,12 @@ struct l1ctl_info_dl *dl; struct l1ctl_traffic_ind *ti; + if (msgb_l1len(msg) < sizeof(*dl)) { + LOGP(DL1C, LOGL_ERROR, "TRAFFIC IND MSG too short " + "(len=%u), missing DL info header\n", msgb_l1len(msg)); + return -1; + } + /* Header handling */ dl = (struct l1ctl_info_dl *) msg->l1h; msg->l2h = dl->payload; @@ -854,6 +871,12 @@ { struct l1ctl_neigh_pm_ind *pm_ind; + if (msgb_l1len(msg) < sizeof(*pm_ind)) { + LOGP(DL1C, LOGL_ERROR, "NEIGH PH IND MSG too short " + "(len=%u), missing measurement results\n", msgb_l1len(msg)); + return -1; + } + for (pm_ind = (struct l1ctl_neigh_pm_ind *) msg->l1h; (uint8_t *) pm_ind < msg->tail; pm_ind++) { struct osmobb_neigh_pm_ind mi; -- To view, visit https://gerrit.osmocom.org/11219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I866bb5d97a1cc1b6cb887877bb444b9e3dca977a Gerrit-Change-Number: 11219 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 12:56:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 12:56:42 +0000 Subject: Change in osmo-gsm-tester[master]: templates: Update .cfg files to use logging level set-all In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11212 to look at the new patch set (#3). Change subject: templates: Update .cfg files to use logging level set-all ...................................................................... templates: Update .cfg files to use logging level set-all VTY cmd "logging level all" is deprecated in favour of "logging level set-all", but the required behaviour in this case is "logging level set-all". Change-Id: Ice54fca6be86f05a02ce4ae783e6e42e6958b95d --- M selftest/template_test.ok M selftest/template_test/osmo-nitb.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl M src/osmo_gsm_tester/templates/sysmobts-mgr.cfg.tmpl 14 files changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/12/11212/3 -- To view, visit https://gerrit.osmocom.org/11212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ice54fca6be86f05a02ce4ae783e6e42e6958b95d Gerrit-Change-Number: 11212 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 17:47:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 17:47:33 +0000 Subject: Change in osmo-bsc[master]: osmo-bsc: Add default case for switch(enum) Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11220 Change subject: osmo-bsc: Add default case for switch(enum) ...................................................................... osmo-bsc: Add default case for switch(enum) After commit https://gerrit.osmocom.org/#/c/libosmo-abis/+/11207/ (Iaa33b793f89f2d16c9d949503c5ecc195bbcd2a4), input_signal_data->link_type exposes proper enum type, and compiler can warn about missing cases: osmo-bsc/bts_ericsson_rbs2000.c: In function ?inp_sig_cb?: osmo-bsc/bts_ericsson_rbs2000.c:124:3: error: enumeration value ?E1INP_SIGN_NONE? not handled in switch [-Werror=switch] switch (isd->link_type) { ^~~~~~ Change-Id: Ia407a5072896377b68e914e2a05b5e01292ee8ee --- M src/osmo-bsc/bts_ericsson_rbs2000.c M src/osmo-bsc/bts_nokia_site.c M src/osmo-bsc/bts_siemens_bs11.c 3 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/20/11220/1 diff --git a/src/osmo-bsc/bts_ericsson_rbs2000.c b/src/osmo-bsc/bts_ericsson_rbs2000.c index ed3db93..4d1e91b 100644 --- a/src/osmo-bsc/bts_ericsson_rbs2000.c +++ b/src/osmo-bsc/bts_ericsson_rbs2000.c @@ -130,6 +130,8 @@ else bootstrap_om_trx(isd->trx); break; + default: + break; } break; case S_L_INP_TEI_DN: diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c index 052741e..66972c2 100644 --- a/src/osmo-bsc/bts_nokia_site.c +++ b/src/osmo-bsc/bts_nokia_site.c @@ -168,6 +168,8 @@ else bootstrap_om_trx(isd->trx); break; + default: + break; } break; case S_L_INP_TEI_UNKNOWN: diff --git a/src/osmo-bsc/bts_siemens_bs11.c b/src/osmo-bsc/bts_siemens_bs11.c index 78a87e5..2cb676c 100644 --- a/src/osmo-bsc/bts_siemens_bs11.c +++ b/src/osmo-bsc/bts_siemens_bs11.c @@ -579,6 +579,8 @@ if (isd->trx->bts->type == GSM_BTS_TYPE_BS11) bootstrap_om_bs11(isd->trx->bts); break; + default: + break; } } -- To view, visit https://gerrit.osmocom.org/11220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia407a5072896377b68e914e2a05b5e01292ee8ee Gerrit-Change-Number: 11220 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 17:47:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 17:47:34 +0000 Subject: Change in osmo-bsc[master]: abis_nm_get_ts: Return TS of correct TRX, not always TRX0 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11221 Change subject: abis_nm_get_ts: Return TS of correct TRX, not always TRX0 ...................................................................... abis_nm_get_ts: Return TS of correct TRX, not always TRX0 Seen while operating a setup with 2 TRX (2 nanobts): DNM <0004> abis_nm.c:703 OC=CHANNEL(03) INST=(00,01,04): bts=0 trx=0 Opstart ACK DTS <0011> bts_ipaccess_nanobts.c:308 timeslot(0-0-4-TCH_F)[0x612000008aa0]{UNUSED}: Received Event TS_EV_OML_READY DTS <0011> bts_ipaccess_nanobts.c:308 timeslot(0-0-4-TCH_F)[0x612000008aa0]{UNUSED}: Event TS_EV_OML_READY not permitte As it can be seen, OML log header state correctly it comes from TRX1, but later content in line expresses TRX0, and that failure is forwarded up the stack and channels for TRX different than TRX0 are never initialized. Related: OS#3560 Fixes: f0ff9a67117dc22d838769fe6eef67778abd43b9 Change-Id: I27e992e419422051247777b048175b724c05323e --- M src/osmo-bsc/abis_nm.c 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/21/11221/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 7f919a4..25b2c38 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -673,14 +673,15 @@ } /* From a received OML message, determine the matching struct gsm_bts_trx_ts instance. - * Note that the BTS-TRX-TS numbers received in the FOM header do not correspond to the local bts->nr and - * bts->trx->nr. Rather, the trx is identified by the e1inp_sign_link* found in msg->dst, and the TS is - * then obtained by the FOM header's TS number. */ + * Note that the BTS-TRX-TS numbers received in the FOM header do not correspond + * to the local bts->nr. Rather, the BTS is identified by the e1inp_sign_link* + * found in msg->dst which points to OML connection and thus to its 1st TRX, and the + * TRX and TS is then obtained by the FOM header's TS number. */ struct gsm_bts_trx_ts *abis_nm_get_ts(const struct msgb *oml_msg) { struct abis_om_fom_hdr *foh = msgb_l3(oml_msg); struct e1inp_sign_link *sign_link = oml_msg->dst; - struct gsm_bts_trx *trx = sign_link->trx; + struct gsm_bts_trx *trx = gsm_bts_trx_by_nr(sign_link->trx->bts, foh->obj_inst.trx_nr); uint8_t ts_nr = foh->obj_inst.ts_nr; if (!trx) { LOGP(DNM, LOGL_ERROR, "%s Channel OPSTART ACK for sign_link without trx\n", @@ -699,8 +700,7 @@ { struct abis_om_fom_hdr *foh = msgb_l3(mb); struct e1inp_sign_link *sign_link = mb->dst; - struct gsm_bts_trx *trx = sign_link->trx; - DEBUGPFOH(DNM, foh, "bts=%u trx=%u Opstart ACK\n", trx->bts->nr, trx->nr); + DEBUGPFOH(DNM, foh, "bts=%u Opstart ACK\n", sign_link->trx->bts->nr); osmo_signal_dispatch(SS_NM, S_NM_OPSTART_ACK, mb); return 0; } -- To view, visit https://gerrit.osmocom.org/11221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I27e992e419422051247777b048175b724c05323e Gerrit-Change-Number: 11221 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 17:49:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 17:49:52 +0000 Subject: Change in osmo-bsc[master]: abis_nm_get_ts: Return TS of correct TRX, not always TRX0 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11221 ) Change subject: abis_nm_get_ts: Return TS of correct TRX, not always TRX0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I27e992e419422051247777b048175b724c05323e Gerrit-Change-Number: 11221 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 17:49:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 17:50:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 17:50:09 +0000 Subject: Change in osmo-bsc[master]: osmo-bsc: Add default case for switch(enum) In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11220 ) Change subject: osmo-bsc: Add default case for switch(enum) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia407a5072896377b68e914e2a05b5e01292ee8ee Gerrit-Change-Number: 11220 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 17:50:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 17:50:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 17:50:25 +0000 Subject: Change in osmo-gsm-tester[master]: templates: Update .cfg files to use logging level set-all In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11212 ) Change subject: templates: Update .cfg files to use logging level set-all ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice54fca6be86f05a02ce4ae783e6e42e6958b95d Gerrit-Change-Number: 11212 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 17:50:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 17:50:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 17:50:44 +0000 Subject: Change in osmo-gsm-tester[master]: Drop unused sysmobts-mgr.cfg.tmpl In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11213 ) Change subject: Drop unused sysmobts-mgr.cfg.tmpl ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I09632a6b4d3a431f1699d00843b9d7ee257a8b4c Gerrit-Change-Number: 11213 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 17:50:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 18:13:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 18:13:12 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites.conf: Add test to check multiTRX with Ettus B200 In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11206 ) Change subject: default-suites.conf: Add test to check multiTRX with Ettus B200 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ied768938851488c3f502b2d41334afa17f7f5401 Gerrit-Change-Number: 11206 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 03 Oct 2018 18:13:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 18:13:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 18:13:14 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites.conf: Add test to check multiTRX with Ettus B200 In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11206 ) Change subject: default-suites.conf: Add test to check multiTRX with Ettus B200 ...................................................................... default-suites.conf: Add test to check multiTRX with Ettus B200 Change-Id: Ied768938851488c3f502b2d41334afa17f7f5401 --- M example/default-suites.conf 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/example/default-suites.conf b/example/default-suites.conf index 14e30d4..597dc0d 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -26,9 +26,11 @@ - voice:trx-b200+mod-bts0-ts-tchh+cfg-codec-hr3 - voice:trx-b200+mod-bts0-dynts-ipa - voice:trx-b200+mod-bts0-dynts-osmo +- voice:trx-b200+mod-bts0-numtrx2+mod-bts0-chanallocdescend - gprs:trx-b200 - gprs:trx-b200+mod-bts0-dynts-ipa - gprs:trx-b200+mod-bts0-dynts-osmo +- gprs:trx-b200+mod-bts0-numtrx2+mod-bts0-chanallocdescend - dynts:trx-b200+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 - dynts:trx-b200+mod-bts0-dynts67-osmo.conf+cfg-codec-fr1 -- To view, visit https://gerrit.osmocom.org/11206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ied768938851488c3f502b2d41334afa17f7f5401 Gerrit-Change-Number: 11206 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 18:13:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 18:13:14 +0000 Subject: Change in osmo-gsm-tester[master]: templates: Update .cfg files to use logging level set-all In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11212 ) Change subject: templates: Update .cfg files to use logging level set-all ...................................................................... templates: Update .cfg files to use logging level set-all VTY cmd "logging level all" is deprecated in favour of "logging level set-all", but the required behaviour in this case is "logging level set-all". Change-Id: Ice54fca6be86f05a02ce4ae783e6e42e6958b95d --- M selftest/template_test.ok M selftest/template_test/osmo-nitb.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl M src/osmo_gsm_tester/templates/sysmobts-mgr.cfg.tmpl 14 files changed, 14 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/selftest/template_test.ok b/selftest/template_test.ok index c5471d0..f970bf6 100644 --- a/selftest/template_test.ok +++ b/selftest/template_test.ok @@ -8,7 +8,7 @@ logging color 1 logging print category 1 logging print extended-timestamp 1 - logging level all debug + logging level set-all debug ! line vty no login diff --git a/selftest/template_test/osmo-nitb.cfg.tmpl b/selftest/template_test/osmo-nitb.cfg.tmpl index f1508ec..c0a5c46 100644 --- a/selftest/template_test/osmo-nitb.cfg.tmpl +++ b/selftest/template_test/osmo-nitb.cfg.tmpl @@ -8,7 +8,7 @@ logging color 0 logging print category 0 logging print extended-timestamp 1 - logging level all debug + logging level set-all debug ! line vty no login diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl index 95bf5e3..0d53ccb 100644 --- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl @@ -4,7 +4,7 @@ logging color 1 logging print category 1 logging print extended-timestamp 1 - logging level all debug + logging level set-all debug line vty no login bind ${bsc.ip_address.addr} diff --git a/src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl index 3f2d0e7..782f1e8 100644 --- a/src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-ggsn.cfg.tmpl @@ -29,7 +29,7 @@ logging level lsua notice logging level lm3ua notice logging level lmgcp notice - logging level all debug + logging level set-all debug ! stats interval 5 ! diff --git a/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl index 014efd3..b573620 100644 --- a/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl @@ -4,7 +4,7 @@ logging color 1 logging print category 1 logging print extended-timestamp 1 - logging level all debug + logging level set-all debug line vty no login bind ${hlr.ip_address.addr} diff --git a/src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl index 28a3798..970d53c 100644 --- a/src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-mgcpgw.cfg.tmpl @@ -4,7 +4,7 @@ logging color 1 logging print category 1 logging print extended-timestamp 1 - logging level all debug + logging level set-all debug line vty no login bind ${mgcpgw.ip_address.addr} diff --git a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl index 485a88b..b370d5e 100644 --- a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl @@ -4,7 +4,7 @@ logging color 1 logging print category 1 logging print extended-timestamp 1 - logging level all debug + logging level set-all debug line vty no login bind ${msc.ip_address.addr} diff --git a/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl index 2c27273..764ca94 100644 --- a/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl @@ -6,7 +6,7 @@ logging color 1 logging print category 1 logging print extended-timestamp 1 - logging level all debug + logging level set-all debug ! line vty no login diff --git a/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl index 632bc27..5482b09 100644 --- a/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl @@ -2,7 +2,7 @@ logging color 1 logging print extended-timestamp 1 logging print category 1 - logging level all debug + logging level set-all debug pcu pcu-socket ${osmo_pcu_sysmo.pcu_socket_path} flow-control-interval 10 diff --git a/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl index 02382c2..86cb1a4 100644 --- a/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl @@ -2,7 +2,7 @@ logging color 1 logging print extended-timestamp 1 logging print category 1 - logging level all debug + logging level set-all debug pcu pcu-socket ${osmo_pcu.pcu_socket_path} flow-control-interval 10 diff --git a/src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl index 9faf316..a59b7cd 100644 --- a/src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-sgsn.cfg.tmpl @@ -7,7 +7,7 @@ logging color 1 logging print category 1 logging print extended-timestamp 1 - logging level all debug + logging level set-all debug line vty no login sgsn diff --git a/src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl index 6504b9e..c180e82 100644 --- a/src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-stp.cfg.tmpl @@ -4,7 +4,7 @@ logging color 1 logging print category 1 logging print extended-timestamp 1 - logging level all debug + logging level set-all debug line vty no login bind ${stp.ip_address.addr} diff --git a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl index 0003f1b..e7f2fb8 100644 --- a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl @@ -8,7 +8,7 @@ logging timestamp 1 logging print file basename logging print extended-timestamp 1 - logging level all info + logging level set-all info ! line vty bind ${osmo_trx.trx_ip} diff --git a/src/osmo_gsm_tester/templates/sysmobts-mgr.cfg.tmpl b/src/osmo_gsm_tester/templates/sysmobts-mgr.cfg.tmpl index 3b28d78..cbe98a2 100644 --- a/src/osmo_gsm_tester/templates/sysmobts-mgr.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/sysmobts-mgr.cfg.tmpl @@ -6,7 +6,7 @@ logging filter all 1 logging color 1 logging timestamp 0 - logging level all everything + logging level set-all everything logging level temp info logging level fw info logging level find info -- To view, visit https://gerrit.osmocom.org/11212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ice54fca6be86f05a02ce4ae783e6e42e6958b95d Gerrit-Change-Number: 11212 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 18:13:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 18:13:15 +0000 Subject: Change in osmo-gsm-tester[master]: Drop unused sysmobts-mgr.cfg.tmpl In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11213 ) Change subject: Drop unused sysmobts-mgr.cfg.tmpl ...................................................................... Drop unused sysmobts-mgr.cfg.tmpl Change-Id: I09632a6b4d3a431f1699d00843b9d7ee257a8b4c --- D src/osmo_gsm_tester/templates/sysmobts-mgr.cfg.tmpl 1 file changed, 0 insertions(+), 24 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo_gsm_tester/templates/sysmobts-mgr.cfg.tmpl b/src/osmo_gsm_tester/templates/sysmobts-mgr.cfg.tmpl deleted file mode 100644 index cbe98a2..0000000 --- a/src/osmo_gsm_tester/templates/sysmobts-mgr.cfg.tmpl +++ /dev/null @@ -1,24 +0,0 @@ -! -! SysmoMgr (0.3.0.141-33e5) configuration saved from vty -!! -! -log stderr - logging filter all 1 - logging color 1 - logging timestamp 0 - logging level set-all everything - logging level temp info - logging level fw info - logging level find info - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice -! -line vty - no login -! -sysmobts-mgr -- To view, visit https://gerrit.osmocom.org/11213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I09632a6b4d3a431f1699d00843b9d7ee257a8b4c Gerrit-Change-Number: 11213 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 21:27:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 21:27:19 +0000 Subject: Change in osmo-bsc[master]: osmo-bsc: Add default case for switch(enum) In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11220 ) Change subject: osmo-bsc: Add default case for switch(enum) ...................................................................... osmo-bsc: Add default case for switch(enum) After commit https://gerrit.osmocom.org/#/c/libosmo-abis/+/11207/ (Iaa33b793f89f2d16c9d949503c5ecc195bbcd2a4), input_signal_data->link_type exposes proper enum type, and compiler can warn about missing cases: osmo-bsc/bts_ericsson_rbs2000.c: In function ?inp_sig_cb?: osmo-bsc/bts_ericsson_rbs2000.c:124:3: error: enumeration value ?E1INP_SIGN_NONE? not handled in switch [-Werror=switch] switch (isd->link_type) { ^~~~~~ Change-Id: Ia407a5072896377b68e914e2a05b5e01292ee8ee --- M src/osmo-bsc/bts_ericsson_rbs2000.c M src/osmo-bsc/bts_nokia_site.c M src/osmo-bsc/bts_siemens_bs11.c 3 files changed, 6 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bts_ericsson_rbs2000.c b/src/osmo-bsc/bts_ericsson_rbs2000.c index ed3db93..4d1e91b 100644 --- a/src/osmo-bsc/bts_ericsson_rbs2000.c +++ b/src/osmo-bsc/bts_ericsson_rbs2000.c @@ -130,6 +130,8 @@ else bootstrap_om_trx(isd->trx); break; + default: + break; } break; case S_L_INP_TEI_DN: diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c index 052741e..66972c2 100644 --- a/src/osmo-bsc/bts_nokia_site.c +++ b/src/osmo-bsc/bts_nokia_site.c @@ -168,6 +168,8 @@ else bootstrap_om_trx(isd->trx); break; + default: + break; } break; case S_L_INP_TEI_UNKNOWN: diff --git a/src/osmo-bsc/bts_siemens_bs11.c b/src/osmo-bsc/bts_siemens_bs11.c index 78a87e5..2cb676c 100644 --- a/src/osmo-bsc/bts_siemens_bs11.c +++ b/src/osmo-bsc/bts_siemens_bs11.c @@ -579,6 +579,8 @@ if (isd->trx->bts->type == GSM_BTS_TYPE_BS11) bootstrap_om_bs11(isd->trx->bts); break; + default: + break; } } -- To view, visit https://gerrit.osmocom.org/11220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia407a5072896377b68e914e2a05b5e01292ee8ee Gerrit-Change-Number: 11220 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 21:28:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 3 Oct 2018 21:28:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add timing offset tolerance module parameter to support real HW In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11083 ) Change subject: bts: Add timing offset tolerance module parameter to support real HW ...................................................................... bts: Add timing offset tolerance module parameter to support real HW When we don't use trxcon (ie we run real HW) we need to relax template matching when we receive UL measurements in that case. Change-Id: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b --- M bts/BTS_Tests.ttcn 1 file changed, 15 insertions(+), 17 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 809a403..a74b3fe 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -51,11 +51,14 @@ charstring mp_bb_trxc_ip := "127.0.0.1"; integer mp_bb_trxc_port := 6701; charstring mp_pcu_socket := PCU_SOCK_DEFAULT; - integer mp_tolerance_rxqual := 1; - integer mp_tolerance_rxlev := 3; charstring mp_ctrl_ip := "127.0.0.1"; integer mp_ctrl_port := 4238; + integer mp_tolerance_rxqual := 1; + integer mp_tolerance_rxlev := 3; + integer mp_tolerance_timing_offset_256syms := 0; integer mp_rxlev_exp := 57; + integer mp_ms_actual_ta_exp := 0; + integer mp_timing_offset_256syms_exp := 512; } type record of RslChannelNr ChannelNrs; @@ -521,10 +524,10 @@ rxqual := 0 } }, - timing_offset_256syms := 0, + timing_offset_256syms := mp_timing_offset_256syms_exp, bs_power_level := 0, ms_power_level := 0, - ms_actual_ta := 0 + ms_actual_ta := mp_ms_actual_ta_exp }, spec := omit, encr := omit @@ -1258,7 +1261,7 @@ if (l1p.toa256_enabled) { ul_meas.len := (3+8); ul_meas.supp_meas_info := { - toa256_mean := l1p.timing_offset_256syms, + toa256_mean := f_tolerance(l1p.timing_offset_256syms, -63*256, 192*256, mp_tolerance_timing_offset_256syms), toa256_min := ?, toa256_max := ?, toa256_std_dev := ? @@ -1279,10 +1282,10 @@ ms_power_lvl := l1p.ms_power_level, fpc := false, reserved := 0, - actual_ta := l1p.ms_actual_ta + actual_ta := f_tolerance(l1p.ms_actual_ta, 0, 63, mp_tolerance_timing_offset_256syms/256) }; var uint8_t offs := toffs256s_to_rsl(l1p.timing_offset_256syms); - var template uint8_t t_toffs := (offs-1 .. offs+1); /* some tolerance */ + var template uint8_t t_toffs := f_tolerance(offs, 0, 255, mp_tolerance_timing_offset_256syms/256); return tr_RSL_MEAS_RES_OSMO(g_chan_nr, g_next_meas_res_nr, ul_meas, bs_power, l1_info, ?, t_toffs); } @@ -1399,17 +1402,12 @@ f_l1_tune(L1CTL); RSL.clear; - if (mp_bb_trxc_port != -1) { - g_pars.l1_pars.meas_ul.full.rxlev := dbm2rxlev(-100); - f_trxc_fake_rssi(100); - - g_pars.l1_pars.timing_offset_256syms := 512; /* 2 symbols */ - f_trx_fake_toffs256(g_pars.l1_pars.timing_offset_256syms); - } else { - g_pars.l1_pars.timing_offset_256syms := 0; /* FIXME */ - g_pars.l1_pars.meas_ul.full.rxlev := dbm2rxlev(-55); /* FIXME */ - } + g_pars.l1_pars.meas_ul.full.rxlev := dbm2rxlev(-100); g_pars.l1_pars.meas_ul.sub.rxlev := g_pars.l1_pars.meas_ul.full.rxlev; + if (mp_bb_trxc_port != -1) { + f_trxc_fake_rssi(100); + f_trx_fake_toffs256(g_pars.l1_pars.timing_offset_256syms); + } f_est_dchan(); -- To view, visit https://gerrit.osmocom.org/11083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b Gerrit-Change-Number: 11083 Gerrit-PatchSet: 7 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 21:36:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 21:36:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RSL_Types.ttcn: fix inadequate template restriction In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11208 ) Change subject: library/RSL_Types.ttcn: fix inadequate template restriction ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I29ac0a2828b565baa1d2f3ac0a922bc441378f94 Gerrit-Change-Number: 11208 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 21:36:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 21:36:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 21:36:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RSL_Types.ttcn: expect any l3_info for 'tr_RSL_UNITDATA_*' by... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11209 ) Change subject: library/RSL_Types.ttcn: expect any l3_info for 'tr_RSL_UNITDATA_*' by default ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I45260343b34d8d054e7efa72de11dd4cb510a8cc Gerrit-Change-Number: 11209 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 21:36:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 21:37:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 21:37:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: extend f_unitdata_mo() with tolerance parameters In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11210 ) Change subject: BTS_Tests.ttcn: extend f_unitdata_mo() with tolerance parameters ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I15782ec93d68a0dc54b2ed7a84cb70d780ba0ce1 Gerrit-Change-Number: 11210 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 21:37:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 21:37:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 21:37:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RSL_Types.ttcn: fix inadequate template restriction In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11208 ) Change subject: library/RSL_Types.ttcn: fix inadequate template restriction ...................................................................... library/RSL_Types.ttcn: fix inadequate template restriction The 'tr_RSL_UNITDATA_IND' is a 'response' template, so there is no reason to restrict 'link_id' to any obvious value. Change-Id: I29ac0a2828b565baa1d2f3ac0a922bc441378f94 --- M library/RSL_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index 7992132..5afabe1 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -1076,7 +1076,7 @@ msg_type := RSL_MT_UNIT_DATA_IND } template RSL_Message tr_RSL_UNITDATA_IND(template RslChannelNr chan_nr, - template (value) RslLinkId link_id, + template RslLinkId link_id, template octetstring l3_info) modifies tr_RSL_DATA_IND := { msg_type := RSL_MT_UNIT_DATA_IND -- To view, visit https://gerrit.osmocom.org/11208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I29ac0a2828b565baa1d2f3ac0a922bc441378f94 Gerrit-Change-Number: 11208 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 21:37:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 21:37:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RSL_Types.ttcn: expect any l3_info for 'tr_RSL_UNITDATA_*' by... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11209 ) Change subject: library/RSL_Types.ttcn: expect any l3_info for 'tr_RSL_UNITDATA_*' by default ...................................................................... library/RSL_Types.ttcn: expect any l3_info for 'tr_RSL_UNITDATA_*' by default This is quite useful when one needs to expect an RSL UNITDATA message with any payload. Let's set 'l3_info' to '?' by default, like it's already done for 'ts_RSL_DATA_*'. Change-Id: I45260343b34d8d054e7efa72de11dd4cb510a8cc --- M library/RSL_Types.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index 5afabe1..cd4ba58 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -1062,7 +1062,7 @@ } template RSL_Message tr_RSL_UNITDATA_REQ(template RslChannelNr chan_nr, template RslLinkId link_id, - template octetstring l3_info) + template octetstring l3_info := ?) modifies tr_RSL_DATA_REQ := { msg_type := RSL_MT_UNIT_DATA_REQ } @@ -1077,7 +1077,7 @@ } template RSL_Message tr_RSL_UNITDATA_IND(template RslChannelNr chan_nr, template RslLinkId link_id, - template octetstring l3_info) + template octetstring l3_info := ?) modifies tr_RSL_DATA_IND := { msg_type := RSL_MT_UNIT_DATA_IND } -- To view, visit https://gerrit.osmocom.org/11209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I45260343b34d8d054e7efa72de11dd4cb510a8cc Gerrit-Change-Number: 11209 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 21:37:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 21:37:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: extend f_unitdata_mo() with tolerance parameters In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11210 ) Change subject: BTS_Tests.ttcn: extend f_unitdata_mo() with tolerance parameters ...................................................................... BTS_Tests.ttcn: extend f_unitdata_mo() with tolerance parameters The ability to control which kinds of RSL messages are permitted in a given use case (and which are not) makes f_unitdata_mo() function much more flexible. Let's introduce two new parameters, one of which would make its 'alt' statement tolerant to SACCH messages (Measurement Reports), and another to other kinds of RSL messages. Please note that the original behaviour of f_unitdata_mo() went untouched, so it's still tolerant to any other messages. Change-Id: I15782ec93d68a0dc54b2ed7a84cb70d780ba0ce1 --- M bts/BTS_Tests.ttcn 1 file changed, 18 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index a74b3fe..162bfe6 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3729,7 +3729,12 @@ } /* Send UI frame from MS and expect it to arrive as RLL UNITDATA IND on Abis */ -function f_unitdata_mo(RslLinkId link_id, octetstring l3) runs on ConnHdlr { +function f_unitdata_mo( + RslLinkId link_id, + octetstring l3, + boolean exp_sacch := true, /* Should tolerate SACCH messages? */ + boolean exp_any := true /* Should tolerate any other RSL messages? */ +) runs on ConnHdlr { timer T := 3.0; f_tx_lapdm(ts_LAPDm_UI(link_id.sapi, cr_MO_CMD, l3), link_id); T.start; @@ -3738,11 +3743,22 @@ [] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, link_id, l3)) { setverdict(pass); } + /* Expect (or not expect) SACCH messages (Measurement Reports) */ + [exp_sacch] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) { repeat; } + [not exp_sacch] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) { + setverdict(fail, "Unexpected (SACCH) UNIT_DATA_IND message!"); + mtc.stop; + } + /* Expect (or not expect) other kinds of messages */ + [exp_any] RSL.receive { repeat; } + [not exp_any] RSL.receive { + setverdict(fail, "Unexpected RSL message!"); + mtc.stop; + } [] T.timeout { setverdict(fail, "Timeout waiting for UNIT_DATA_IND"); mtc.stop; } - [] RSL.receive { repeat; } } } -- To view, visit https://gerrit.osmocom.org/11210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I15782ec93d68a0dc54b2ed7a84cb70d780ba0ce1 Gerrit-Change-Number: 11210 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 21:38:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 21:38:01 +0000 Subject: Change in osmo-bts[master]: abis: inp_s_cbfn: Improve logging signal related information In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11214 ) Change subject: abis: inp_s_cbfn: Improve logging signal related information ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia63b69882c74155bcae2e027a21ea7e319647256 Gerrit-Change-Number: 11214 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 21:38:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 21:38:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 21:38:01 +0000 Subject: Change in osmo-bts[master]: abis: inp_s_cbfn: Improve logging signal related information In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11214 ) Change subject: abis: inp_s_cbfn: Improve logging signal related information ...................................................................... abis: inp_s_cbfn: Improve logging signal related information Change-Id: Ia63b69882c74155bcae2e027a21ea7e319647256 --- M src/common/abis.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/common/abis.c b/src/common/abis.c index c0bccdb..84a3a04 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -226,7 +226,9 @@ if (subsys != SS_L_INPUT) return 0; - DEBUGP(DABIS, "Input Signal %u received\n", signal); + struct input_signal_data *isd = signal_data; + DEBUGP(DABIS, "Input Signal %s received for link_type=%s\n", + get_value_string(e1inp_signal_names, signal), e1inp_signtype_name(isd->link_type)); return 0; } -- To view, visit https://gerrit.osmocom.org/11214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia63b69882c74155bcae2e027a21ea7e319647256 Gerrit-Change-Number: 11214 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 21:39:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 21:39:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L1CTL_Types: Add support to set L1 Header params during SACCH tx In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11147 ) Change subject: L1CTL_Types: Add support to set L1 Header params during SACCH tx ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id014f790ee2ede8ae796c37b1c6b25c4af9034d2 Gerrit-Change-Number: 11147 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 21:39:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 21:39:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 21:39:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L1CTL_Types: Add support to set L1 Header params during SACCH tx In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11147 ) Change subject: L1CTL_Types: Add support to set L1 Header params during SACCH tx ...................................................................... L1CTL_Types: Add support to set L1 Header params during SACCH tx Change-Id: Id014f790ee2ede8ae796c37b1c6b25c4af9034d2 --- M library/GSM_RR_Types.ttcn M library/L1CTL_Types.ttcn 2 files changed, 38 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index ef209e4..675271f 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -158,6 +158,21 @@ message_type := msg_type } + /* TS 44.004 7.2.1 */ + type record SacchL1Header { + uint2_t reserved, + boolean fpc, + uint5_t ms_power_lvl, + uint8_t actual_ta + } with { variant "FIELDORDER(msb)" }; + + template (value) SacchL1Header ts_SacchL1Header(uint5_t ms_power_lvl, boolean fpc, uint8_t actual_ta) := { + reserved := 0, + fpc := fpc, + ms_power_lvl := ms_power_lvl, + actual_ta := actual_ta + }; + type record MaioHsn { } with { variant "" }; diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn index 656f292..39732be 100644 --- a/library/L1CTL_Types.ttcn +++ b/library/L1CTL_Types.ttcn @@ -263,6 +263,11 @@ OCT2 padding } with { variant "" }; + type record L1ctlDataReq { + SacchL1Header l1header optional, + octetstring l2_payload + } with { variant "" }; + type record L1ctlH1 { uint8_t hsn, uint8_t maio, @@ -320,6 +325,7 @@ L1CtlCryptoReq crypto_req, L1ctlTrafficReq traffic_req, L1ctlTbfCfgReq tbf_cfg_req, + L1ctlDataReq data_req, octetstring other } with { variant (other) "BYTEORDER(first)" @@ -351,6 +357,7 @@ crypto_req, header.msg_type = L1CTL_CRYPTO_REQ; traffic_req, header.msg_type = L1CTL_TRAFFIC_REQ; tbf_cfg_req, header.msg_type = L1CTL_TBF_CFG_REQ; + data_req, header.msg_type = L1CTL_DATA_REQ; other, OTHERWISE; )" }; @@ -542,6 +549,22 @@ } } + template (value) L1ctlUlMessage ts_L1CTL_DATA_REQ_SACCH(template (value) RslChannelNr chan_nr, + template (value) RslLinkId link_id, + L1ctlDataReq data_req) := { + header := ts_L1ctlHeader(L1CTL_DATA_REQ), + ul_info := { + chan_nr := chan_nr, + link_id := link_id, + padding := '0000'O + }, + ul_info_tbf := omit, + ul_info_abs := omit, + payload := { + data_req := data_req + } + } + template (value) L1ctlUlMessage ts_L1CTL_TBF_CFG_REQ(boolean is_uplink, TfiUsfArr tfi_usf) := { header := ts_L1ctlHeader(L1CTL_TBF_CFG_REQ), ul_info := omit, -- To view, visit https://gerrit.osmocom.org/11147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id014f790ee2ede8ae796c37b1c6b25c4af9034d2 Gerrit-Change-Number: 11147 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 21:39:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 21:39:41 +0000 Subject: Change in osmo-bsc[master]: abis_nm_get_ts: Return TS of correct TRX, not always TRX0 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11221 ) Change subject: abis_nm_get_ts: Return TS of correct TRX, not always TRX0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I27e992e419422051247777b048175b724c05323e Gerrit-Change-Number: 11221 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 03 Oct 2018 21:39:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 21:39:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 3 Oct 2018 21:39:42 +0000 Subject: Change in osmo-bsc[master]: abis_nm_get_ts: Return TS of correct TRX, not always TRX0 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11221 ) Change subject: abis_nm_get_ts: Return TS of correct TRX, not always TRX0 ...................................................................... abis_nm_get_ts: Return TS of correct TRX, not always TRX0 Seen while operating a setup with 2 TRX (2 nanobts): DNM <0004> abis_nm.c:703 OC=CHANNEL(03) INST=(00,01,04): bts=0 trx=0 Opstart ACK DTS <0011> bts_ipaccess_nanobts.c:308 timeslot(0-0-4-TCH_F)[0x612000008aa0]{UNUSED}: Received Event TS_EV_OML_READY DTS <0011> bts_ipaccess_nanobts.c:308 timeslot(0-0-4-TCH_F)[0x612000008aa0]{UNUSED}: Event TS_EV_OML_READY not permitte As it can be seen, OML log header state correctly it comes from TRX1, but later content in line expresses TRX0, and that failure is forwarded up the stack and channels for TRX different than TRX0 are never initialized. Related: OS#3560 Fixes: f0ff9a67117dc22d838769fe6eef67778abd43b9 Change-Id: I27e992e419422051247777b048175b724c05323e --- M src/osmo-bsc/abis_nm.c 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 7f919a4..25b2c38 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -673,14 +673,15 @@ } /* From a received OML message, determine the matching struct gsm_bts_trx_ts instance. - * Note that the BTS-TRX-TS numbers received in the FOM header do not correspond to the local bts->nr and - * bts->trx->nr. Rather, the trx is identified by the e1inp_sign_link* found in msg->dst, and the TS is - * then obtained by the FOM header's TS number. */ + * Note that the BTS-TRX-TS numbers received in the FOM header do not correspond + * to the local bts->nr. Rather, the BTS is identified by the e1inp_sign_link* + * found in msg->dst which points to OML connection and thus to its 1st TRX, and the + * TRX and TS is then obtained by the FOM header's TS number. */ struct gsm_bts_trx_ts *abis_nm_get_ts(const struct msgb *oml_msg) { struct abis_om_fom_hdr *foh = msgb_l3(oml_msg); struct e1inp_sign_link *sign_link = oml_msg->dst; - struct gsm_bts_trx *trx = sign_link->trx; + struct gsm_bts_trx *trx = gsm_bts_trx_by_nr(sign_link->trx->bts, foh->obj_inst.trx_nr); uint8_t ts_nr = foh->obj_inst.ts_nr; if (!trx) { LOGP(DNM, LOGL_ERROR, "%s Channel OPSTART ACK for sign_link without trx\n", @@ -699,8 +700,7 @@ { struct abis_om_fom_hdr *foh = msgb_l3(mb); struct e1inp_sign_link *sign_link = mb->dst; - struct gsm_bts_trx *trx = sign_link->trx; - DEBUGPFOH(DNM, foh, "bts=%u trx=%u Opstart ACK\n", trx->bts->nr, trx->nr); + DEBUGPFOH(DNM, foh, "bts=%u Opstart ACK\n", sign_link->trx->bts->nr); osmo_signal_dispatch(SS_NM, S_NM_OPSTART_ACK, mb); return 0; } -- To view, visit https://gerrit.osmocom.org/11221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I27e992e419422051247777b048175b724c05323e Gerrit-Change-Number: 11221 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 23:21:28 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 3 Oct 2018 23:21:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11204 to look at the new patch set (#3). Change subject: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() ...................................................................... BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() For some reason, in f_TC_encr_cmd() it was expected / assumed that when a ciphered I-frame is sent from MS on L1CTL, nothing else than this frame would arrive. But since we have fixed Measurement Reporting in trxcon (see OS#2988), the MR related messages do appear on A-bis interface now! This change introduces a new function f_data_mo(), which should be used to send I-frames from MS and expect them on A-bis. So, the following test cases: - TC_encr_cmd_a51; - TC_encr_cmd_a52; - TC_encr_cmd_a53; should pass with both trxcon and Calypso PHY now :) Change-Id: I08cb28dd9fa23f3ef8b0c9ede3d4c47f5702a1c1 --- M bts/BTS_Tests.ttcn 1 file changed, 27 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/11204/3 -- To view, visit https://gerrit.osmocom.org/11204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I08cb28dd9fa23f3ef8b0c9ede3d4c47f5702a1c1 Gerrit-Change-Number: 11204 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 23:21:29 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 3 Oct 2018 23:21:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: share as_rsl_sacch_ind() and as_rsl_any_ind() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11222 Change subject: BTS_Tests.ttcn: share as_rsl_sacch_ind() and as_rsl_any_ind() ...................................................................... BTS_Tests.ttcn: share as_rsl_sacch_ind() and as_rsl_any_ind() Change-Id: I7ace54643c10df38a3ea941242f8b65264ef1322 --- M bts/BTS_Tests.ttcn 1 file changed, 19 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/22/11222/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 162bfe6..c95f48a 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3728,6 +3728,23 @@ } } +/* Expect (or not expect) SACCH messages (Measurement Reports) */ +private altstep as_rsl_sacch_ind(boolean exp_sacch) runs on ConnHdlr { + [exp_sacch] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) { repeat; } + [not exp_sacch] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) { + setverdict(fail, "Unexpected (SACCH) UNIT_DATA_IND message!"); + mtc.stop; + } +} +/* Expect (or not expect) other kinds of messages */ +private altstep as_rsl_any_ind(boolean exp_any) runs on ConnHdlr { + [exp_any] RSL.receive { repeat; } + [not exp_any] RSL.receive { + setverdict(fail, "Unexpected RSL message!"); + mtc.stop; + } +} + /* Send UI frame from MS and expect it to arrive as RLL UNITDATA IND on Abis */ function f_unitdata_mo( RslLinkId link_id, @@ -3743,18 +3760,8 @@ [] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, link_id, l3)) { setverdict(pass); } - /* Expect (or not expect) SACCH messages (Measurement Reports) */ - [exp_sacch] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) { repeat; } - [not exp_sacch] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) { - setverdict(fail, "Unexpected (SACCH) UNIT_DATA_IND message!"); - mtc.stop; - } - /* Expect (or not expect) other kinds of messages */ - [exp_any] RSL.receive { repeat; } - [not exp_any] RSL.receive { - setverdict(fail, "Unexpected RSL message!"); - mtc.stop; - } + [] as_rsl_sacch_ind(exp_sacch); + [] as_rsl_any_ind(exp_any); [] T.timeout { setverdict(fail, "Timeout waiting for UNIT_DATA_IND"); mtc.stop; -- To view, visit https://gerrit.osmocom.org/11222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7ace54643c10df38a3ea941242f8b65264ef1322 Gerrit-Change-Number: 11222 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 3 23:21:30 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 3 Oct 2018 23:21:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: mark f_unitdata_mo() as private Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11223 Change subject: BTS_Tests.ttcn: mark f_unitdata_mo() as private ...................................................................... BTS_Tests.ttcn: mark f_unitdata_mo() as private Change-Id: Idd31608cd91631a92ea9d73e1db508605d7314d4 --- M bts/BTS_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/23/11223/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index c95f48a..ea75937 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3746,7 +3746,7 @@ } /* Send UI frame from MS and expect it to arrive as RLL UNITDATA IND on Abis */ -function f_unitdata_mo( +private function f_unitdata_mo( RslLinkId link_id, octetstring l3, boolean exp_sacch := true, /* Should tolerate SACCH messages? */ -- To view, visit https://gerrit.osmocom.org/11223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idd31608cd91631a92ea9d73e1db508605d7314d4 Gerrit-Change-Number: 11223 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 06:37:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 4 Oct 2018 06:37:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: share as_rsl_sacch_ind() and as_rsl_any_ind() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11222 ) Change subject: BTS_Tests.ttcn: share as_rsl_sacch_ind() and as_rsl_any_ind() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7ace54643c10df38a3ea941242f8b65264ef1322 Gerrit-Change-Number: 11222 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 04 Oct 2018 06:37:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 06:37:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 4 Oct 2018 06:37:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: mark f_unitdata_mo() as private In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11223 ) Change subject: BTS_Tests.ttcn: mark f_unitdata_mo() as private ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idd31608cd91631a92ea9d73e1db508605d7314d4 Gerrit-Change-Number: 11223 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 04 Oct 2018 06:37:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 06:37:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 4 Oct 2018 06:37:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11204 ) Change subject: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I08cb28dd9fa23f3ef8b0c9ede3d4c47f5702a1c1 Gerrit-Change-Number: 11204 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 04 Oct 2018 06:37:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 06:37:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 4 Oct 2018 06:37:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: don't tolerate any RSL messages by default In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11211 ) Change subject: BTS_Tests.ttcn: don't tolerate any RSL messages by default ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I70dc8af999eed8f7ed6a0d9dad4d3a9406340017 Gerrit-Change-Number: 11211 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 04 Oct 2018 06:37:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 06:37:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 4 Oct 2018 06:37:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: share as_rsl_sacch_ind() and as_rsl_any_ind() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11222 ) Change subject: BTS_Tests.ttcn: share as_rsl_sacch_ind() and as_rsl_any_ind() ...................................................................... BTS_Tests.ttcn: share as_rsl_sacch_ind() and as_rsl_any_ind() Change-Id: I7ace54643c10df38a3ea941242f8b65264ef1322 --- M bts/BTS_Tests.ttcn 1 file changed, 19 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 162bfe6..c95f48a 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3728,6 +3728,23 @@ } } +/* Expect (or not expect) SACCH messages (Measurement Reports) */ +private altstep as_rsl_sacch_ind(boolean exp_sacch) runs on ConnHdlr { + [exp_sacch] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) { repeat; } + [not exp_sacch] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) { + setverdict(fail, "Unexpected (SACCH) UNIT_DATA_IND message!"); + mtc.stop; + } +} +/* Expect (or not expect) other kinds of messages */ +private altstep as_rsl_any_ind(boolean exp_any) runs on ConnHdlr { + [exp_any] RSL.receive { repeat; } + [not exp_any] RSL.receive { + setverdict(fail, "Unexpected RSL message!"); + mtc.stop; + } +} + /* Send UI frame from MS and expect it to arrive as RLL UNITDATA IND on Abis */ function f_unitdata_mo( RslLinkId link_id, @@ -3743,18 +3760,8 @@ [] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, link_id, l3)) { setverdict(pass); } - /* Expect (or not expect) SACCH messages (Measurement Reports) */ - [exp_sacch] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) { repeat; } - [not exp_sacch] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) { - setverdict(fail, "Unexpected (SACCH) UNIT_DATA_IND message!"); - mtc.stop; - } - /* Expect (or not expect) other kinds of messages */ - [exp_any] RSL.receive { repeat; } - [not exp_any] RSL.receive { - setverdict(fail, "Unexpected RSL message!"); - mtc.stop; - } + [] as_rsl_sacch_ind(exp_sacch); + [] as_rsl_any_ind(exp_any); [] T.timeout { setverdict(fail, "Timeout waiting for UNIT_DATA_IND"); mtc.stop; -- To view, visit https://gerrit.osmocom.org/11222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7ace54643c10df38a3ea941242f8b65264ef1322 Gerrit-Change-Number: 11222 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 06:37:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 4 Oct 2018 06:37:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: mark f_unitdata_mo() as private In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11223 ) Change subject: BTS_Tests.ttcn: mark f_unitdata_mo() as private ...................................................................... BTS_Tests.ttcn: mark f_unitdata_mo() as private Change-Id: Idd31608cd91631a92ea9d73e1db508605d7314d4 --- M bts/BTS_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index c95f48a..ea75937 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3746,7 +3746,7 @@ } /* Send UI frame from MS and expect it to arrive as RLL UNITDATA IND on Abis */ -function f_unitdata_mo( +private function f_unitdata_mo( RslLinkId link_id, octetstring l3, boolean exp_sacch := true, /* Should tolerate SACCH messages? */ -- To view, visit https://gerrit.osmocom.org/11223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idd31608cd91631a92ea9d73e1db508605d7314d4 Gerrit-Change-Number: 11223 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 06:37:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 4 Oct 2018 06:37:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11204 ) Change subject: BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() ...................................................................... BTS_Tests.ttcn: fix: properly expect I-frames in f_TC_encr_cmd() For some reason, in f_TC_encr_cmd() it was expected / assumed that when a ciphered I-frame is sent from MS on L1CTL, nothing else than this frame would arrive. But since we have fixed Measurement Reporting in trxcon (see OS#2988), the MR related messages do appear on A-bis interface now! This change introduces a new function f_data_mo(), which should be used to send I-frames from MS and expect them on A-bis. So, the following test cases: - TC_encr_cmd_a51; - TC_encr_cmd_a52; - TC_encr_cmd_a53; should pass with both trxcon and Calypso PHY now :) Change-Id: I08cb28dd9fa23f3ef8b0c9ede3d4c47f5702a1c1 --- M bts/BTS_Tests.ttcn 1 file changed, 27 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index ea75937..0b8decd 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3769,6 +3769,31 @@ } } +/* Send I-frame from MS and expect it to arrive as RLL DATA IND on Abis */ +private function f_data_mo( + RslLinkId link_id, + boolean p, uint3_t nr, uint3_t ns, + octetstring l3, + boolean exp_sacch := true, /* Should tolerate SACCH messages? */ + boolean exp_any := true /* Should tolerate any other RSL messages? */ +) runs on ConnHdlr { + timer T := 3.0; + f_tx_lapdm(ts_LAPDm_I(link_id.sapi, cr_MO_CMD, p, nr, ns, l3), link_id); + T.start; + /* Expect RLL DATA IND on RSL side */ + alt { + [] RSL.receive(tr_RSL_DATA_IND(g_chan_nr, link_id, l3)) { + setverdict(pass); + } + [] as_rsl_sacch_ind(exp_sacch); + [] as_rsl_any_ind(exp_any); + [] T.timeout { + setverdict(fail, "Timeout waiting for DATA_IND"); + mtc.stop; + } + } +} + /* Test channel activation with A5/n right from the beginning (like in assignment + hand-over) */ function f_TC_chan_act_encr(charstring id) runs on ConnHdlr { f_l1_tune(L1CTL); @@ -3832,10 +3857,8 @@ var uint8_t alg_id := f_alg_id_to_l1ctl(g_pars.encr.alg_id); f_L1CTL_CRYPTO_REQ(L1CTL, g_pars.chan_nr, alg_id, g_pars.encr.key); - /* send first ciphered I-frame in response */ - l3 := '0a0b0c0d'O; - f_tx_lapdm(ts_LAPDm_I(link_id.sapi, cr_MO_CMD, true, 1, 0, l3), link_id); - RSL.receive(tr_RSL_DATA_IND(g_chan_nr, link_id, l3)); + /* send first ciphered I-frame in response and expect it on RSL */ + f_data_mo(link_id, true, 1, 0, '0a0b0c0d'O, exp_sacch := true); /* now the BTS code should have detected the first properly encrypted uplink I-frame, * and hence enable encryption also on the downlink */ -- To view, visit https://gerrit.osmocom.org/11204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I08cb28dd9fa23f3ef8b0c9ede3d4c47f5702a1c1 Gerrit-Change-Number: 11204 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 06:37:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 4 Oct 2018 06:37:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: don't tolerate any RSL messages by default In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11211 ) Change subject: BTS_Tests.ttcn: don't tolerate any RSL messages by default ...................................................................... BTS_Tests.ttcn: don't tolerate any RSL messages by default Change-Id: I70dc8af999eed8f7ed6a0d9dad4d3a9406340017 --- M bts/BTS_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 0b8decd..bb4c3da 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3750,7 +3750,7 @@ RslLinkId link_id, octetstring l3, boolean exp_sacch := true, /* Should tolerate SACCH messages? */ - boolean exp_any := true /* Should tolerate any other RSL messages? */ + boolean exp_any := false /* Should tolerate any other RSL messages? */ ) runs on ConnHdlr { timer T := 3.0; f_tx_lapdm(ts_LAPDm_UI(link_id.sapi, cr_MO_CMD, l3), link_id); @@ -3775,7 +3775,7 @@ boolean p, uint3_t nr, uint3_t ns, octetstring l3, boolean exp_sacch := true, /* Should tolerate SACCH messages? */ - boolean exp_any := true /* Should tolerate any other RSL messages? */ + boolean exp_any := false /* Should tolerate any other RSL messages? */ ) runs on ConnHdlr { timer T := 3.0; f_tx_lapdm(ts_LAPDm_I(link_id.sapi, cr_MO_CMD, p, nr, ns, l3), link_id); -- To view, visit https://gerrit.osmocom.org/11211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I70dc8af999eed8f7ed6a0d9dad4d3a9406340017 Gerrit-Change-Number: 11211 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 06:38:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 4 Oct 2018 06:38:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add parameter to set and expect a specific MS power level In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11148 ) Change subject: bts: Add parameter to set and expect a specific MS power level ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iedab8681a0ba4652a6bb1c001418599a4ff746b6 Gerrit-Change-Number: 11148 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 04 Oct 2018 06:38:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 06:38:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 4 Oct 2018 06:38:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Add parameter to set and expect a specific MS power level In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11148 ) Change subject: bts: Add parameter to set and expect a specific MS power level ...................................................................... bts: Add parameter to set and expect a specific MS power level This change uses recently added ts_L1CTL_DATA_REQ_SACCH to be able to set the L1 Header parameters to match the expected MS power level announced by the BTS. Change-Id: Iedab8681a0ba4652a6bb1c001418599a4ff746b6 --- M bts/BTS_Tests.ttcn 1 file changed, 10 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index bb4c3da..b5bcc5b 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -57,6 +57,7 @@ integer mp_tolerance_rxlev := 3; integer mp_tolerance_timing_offset_256syms := 0; integer mp_rxlev_exp := 57; + integer mp_ms_power_level_exp := 7; integer mp_ms_actual_ta_exp := 0; integer mp_timing_offset_256syms_exp := 512; } @@ -167,7 +168,7 @@ template (value) CellSelectionParameters ts_CellSelPar_default := { cell_resel_hyst_2dB := 2, - ms_txpwr_max_cch := 7, + ms_txpwr_max_cch := mp_ms_power_level_exp, acs := '0'B, neci := true, rxlev_access_min := 0 @@ -526,7 +527,7 @@ }, timing_offset_256syms := mp_timing_offset_256syms_exp, bs_power_level := 0, - ms_power_level := 0, + ms_power_level := mp_ms_power_level_exp, ms_actual_ta := mp_ms_actual_ta_exp }, spec := omit, @@ -1163,9 +1164,13 @@ var GsmRrL3Message meas_rep := valueof(ts_MEAS_REP(true, 23, 23, 0, 0, omit)); var LapdmFrameAB lb := valueof(ts_LAPDm_AB(0, false, false, enc_GsmRrL3Message(meas_rep))); log("LAPDm: ", lb); - var octetstring pl := '0000'O & enc_LapdmFrameAB(lb); - L1CTL.send(ts_L1CTL_DATA_REQ(g_chan_nr, ts_RslLinkID_SACCH(0), - f_pad_oct(pl, 23, '2B'O))); + + var L1ctlDataReq data_req := { + l1header := valueof(ts_SacchL1Header(g_pars.l1_pars.ms_power_level, false, g_pars.l1_pars.ms_actual_ta)), + l2_payload := f_pad_oct(enc_LapdmFrameAB(lb), 21, '2B'O) + } + log("Sending Measurement Report: ", data_req); + L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), data_req)); repeat; } } -- To view, visit https://gerrit.osmocom.org/11148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iedab8681a0ba4652a6bb1c001418599a4ff746b6 Gerrit-Change-Number: 11148 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 06:38:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 4 Oct 2018 06:38:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Use f_L1CTL_PARAM to set expected ms power level for dummy MeasRep In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11149 ) Change subject: bts: Use f_L1CTL_PARAM to set expected ms power level for dummy MeasRep ...................................................................... bts: Use f_L1CTL_PARAM to set expected ms power level for dummy MeasRep If for whatever reason (eg. CPU scheduling saturation) the L1CTL cli (TTCN3) doesn't send Measurement Reports on time and no previous one is cached or has been erased by L1CTL_DM_REL_REQ, lower osmocombb layers will generate their own dummy Measurement Reports since SACCH must always be filled. Those dummy Measurement Reports are filled from parameters previosuly set using L1CTL_PARAM_REQ (implemented by f_L1CTL_PARAM() in TTCN3). Since that function is never called, we need to call it to set the expected MS power level values in case the cache is empty and we don't send expected values in case we don't send the Measurement Report through L1CTL on time. Change-Id: Ie1fd9cee3472c7aa6580f846d277f485d3401641 --- M bts/BTS_Tests.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index b5bcc5b..fe59fd3 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1366,6 +1366,7 @@ var ImmediateAssignment imm_ass; var integer ra := 23; + f_L1CTL_PARAM(L1CTL, g_pars.l1_pars.ms_actual_ta, g_pars.l1_pars.ms_power_level); fn := f_L1CTL_RACH(L1CTL, ra); /* This arrives on CCHAN, so we cannot test for receiving CHAN RQDhere */ //RSL.receive(tr_RSL_CHAN_RQD(int2oct(23,1))); -- To view, visit https://gerrit.osmocom.org/11149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie1fd9cee3472c7aa6580f846d277f485d3401641 Gerrit-Change-Number: 11149 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 08:28:03 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 4 Oct 2018 08:28:03 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: Fix missing Security Command for 3G when attaching In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( https://gerrit.osmocom.org/11150 ) Change subject: gprs_gmm: Fix missing Security Command for 3G when attaching ...................................................................... gprs_gmm: Fix missing Security Command for 3G when attaching Introduce a new FSM step in GMM Attach to send the Security Command to the RNC after completing the Authentication. Fixes: f7198d7dbb84 ("gprs_gmm: introduce a GMM Attach Request FSM") Change-Id: I1e12b0a32e58c6f78dba7b548f7d7016567229db --- M include/osmocom/sgsn/gprs_gmm_attach.h M src/gprs/gprs_gmm.c M src/gprs/gprs_gmm_attach.c 3 files changed, 44 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/sgsn/gprs_gmm_attach.h b/include/osmocom/sgsn/gprs_gmm_attach.h index 22fbd6f..0aa2123 100644 --- a/include/osmocom/sgsn/gprs_gmm_attach.h +++ b/include/osmocom/sgsn/gprs_gmm_attach.h @@ -11,6 +11,7 @@ ST_RETRIEVE_AUTH, ST_AUTH, ST_ASK_VLR, + ST_IU_SECURITY_CMD, ST_ACCEPT, ST_REJECT }; @@ -20,6 +21,7 @@ E_IDEN_RESP_RECV, E_AUTH_RESP_RECV_SUCCESS, E_AUTH_RESP_RECV_RESYNC, + E_IU_SECURITY_CMD_COMPLETE, E_ATTACH_ACCEPTED, E_ATTACH_ACCEPT_SENT, E_ATTACH_COMPLETE_RECV, diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index a86fe2b..a0221ea 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -205,7 +205,7 @@ REQUIRE_MM /* Continue authentication here */ mm->iu.ue_ctx->integrity_active = 1; - rc = gsm48_gmm_authorize(mm); + osmo_fsm_inst_dispatch(mm->gmm_att_req.fsm, E_IU_SECURITY_CMD_COMPLETE, NULL); break; default: LOGP(DRANAP, LOGL_NOTICE, "Unknown event received: %i\n", type); diff --git a/src/gprs/gprs_gmm_attach.c b/src/gprs/gprs_gmm_attach.c index 272fec7..60c4398 100644 --- a/src/gprs/gprs_gmm_attach.c +++ b/src/gprs/gprs_gmm_attach.c @@ -157,7 +157,12 @@ switch (event) { case E_AUTH_RESP_RECV_SUCCESS: sgsn_auth_request(ctx); - osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); +#ifdef BUILD_IU + if (ctx->ran_type == MM_CTX_T_UTRAN_Iu && !ctx->iu.ue_ctx->integrity_active) + osmo_fsm_inst_state_chg(fi, ST_IU_SECURITY_CMD, sgsn->cfg.timers.T3350, 3350); + else +#endif /* BUILD_IU */ + osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); break; case E_AUTH_RESP_RECV_RESYNC: if (ctx->gmm_att_req.auth_reattempt <= 1) @@ -228,6 +233,32 @@ } } +static void st_iu_security_cmd_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ +#ifdef BUILD_IU + struct sgsn_mm_ctx *ctx = fi->priv; + int rc = 0; + + /* TODO: shouldn't this set always? not only when the integrity_active? */ + if (ctx->iu.ue_ctx->integrity_active) { + osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + return; + } + + ranap_iu_tx_sec_mode_cmd(ctx->iu.ue_ctx, &ctx->auth_triplet.vec, 0, ctx->iu.new_key); + ctx->iu.new_key = 0; +#endif +} + +static void st_iu_security_cmd(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch(event) { + case E_IU_SECURITY_CMD_COMPLETE: + osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + break; + } +} + static struct osmo_fsm_state gmm_attach_req_fsm_states[] = { /* default state for non-DTX and DTX when SPEECH is in progress */ [ST_INIT] = { @@ -252,11 +283,18 @@ }, [ST_AUTH] = { .in_event_mask = X(E_AUTH_RESP_RECV_SUCCESS) | X(E_AUTH_RESP_RECV_RESYNC), - .out_state_mask = X(ST_INIT) | X(ST_AUTH) | X(ST_ACCEPT) | X(ST_ASK_VLR) | X(ST_REJECT), + .out_state_mask = X(ST_INIT) | X(ST_AUTH) | X(ST_IU_SECURITY_CMD) | X(ST_ACCEPT) | X(ST_ASK_VLR) | X(ST_REJECT), .name = "Authenticate", .onenter = st_auth_on_enter, .action = st_auth, }, + [ST_IU_SECURITY_CMD] = { + .in_event_mask = X(E_IU_SECURITY_CMD_COMPLETE), + .out_state_mask = X(ST_INIT) | X(ST_AUTH) | X(ST_ACCEPT) | X(ST_REJECT), + .name = "IuSecurityCommand", + .onenter = st_iu_security_cmd_on_enter, + .action = st_iu_security_cmd, + }, [ST_ACCEPT] = { .in_event_mask = X(E_ATTACH_COMPLETE_RECV), .out_state_mask = X(ST_INIT) | X(ST_REJECT), @@ -280,6 +318,7 @@ { E_ATTACH_ACCEPTED, "Attach accepted" }, { E_ATTACH_ACCEPT_SENT, "Attach accept sent" }, { E_ATTACH_COMPLETE_RECV, "Attach complete received." }, + { E_IU_SECURITY_CMD_COMPLETE, "IU Security Command Complete received." }, { E_REJECT, "Reject the MS"}, { E_VLR_ANSWERED, "VLR answered"}, { 0, NULL } -- To view, visit https://gerrit.osmocom.org/11150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1e12b0a32e58c6f78dba7b548f7d7016567229db Gerrit-Change-Number: 11150 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 08:28:15 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 4 Oct 2018 08:28:15 +0000 Subject: Change in osmo-sgsn[master]: gprs_llc: remove the FCS from the msgb by trim'ing the msgb In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/11022 ) Change subject: gprs_llc: remove the FCS from the msgb by trim'ing the msgb ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I27e061ead86395a336b67c7aead93d305a0f2ae8 Gerrit-Change-Number: 11022 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 04 Oct 2018 08:28:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 08:28:55 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 4 Oct 2018 08:28:55 +0000 Subject: Change in osmo-sgsn[master]: sgsn_libgtp: fix a potential memleak when the GGSN is not reachable In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/11019 ) Change subject: sgsn_libgtp: fix a potential memleak when the GGSN is not reachable ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4575f7f80f785a62ae3b7f165d236a9dd818aabf Gerrit-Change-Number: 11019 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 04 Oct 2018 08:28:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 08:29:04 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 4 Oct 2018 08:29:04 +0000 Subject: Change in osmo-sgsn[master]: sgsn_libgtp: fix a potential memleak when the GGSN is not reachable In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( https://gerrit.osmocom.org/11019 ) Change subject: sgsn_libgtp: fix a potential memleak when the GGSN is not reachable ...................................................................... sgsn_libgtp: fix a potential memleak when the GGSN is not reachable When a MS does the following - MS: GMM Attach - MS: Activate PDP CTX - SGSN: send PDP CTX Request to GGSN which GGSN does not answer - GMM Detach (MM ctx get freed) - libgtp retrans timeout of the first answer - sgsn_libgtp.c: create_pdp_conf() which ignores this ctx because of emtpy MM ctx Change-Id: I4575f7f80f785a62ae3b7f165d236a9dd818aabf --- M src/gprs/sgsn_libgtp.c 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c index 7829796..478d402 100644 --- a/src/gprs/sgsn_libgtp.c +++ b/src/gprs/sgsn_libgtp.c @@ -390,15 +390,13 @@ static int create_pdp_conf(struct pdp_t *pdp, void *cbp, int cause) { struct sgsn_pdp_ctx *pctx = cbp; - uint8_t reject_cause; + uint8_t reject_cause = 0; LOGPDPCTXP(LOGL_INFO, pctx, "Received CREATE PDP CTX CONF, cause=%d(%s)\n", cause, get_value_string(gtp_cause_strs, cause)); if (!pctx->mm) { - LOGP(DGPRS, LOGL_INFO, - "No MM context, aborting CREATE PDP CTX CONF\n"); - return -EIO; + goto reject; } /* Check for cause value if it was really successful */ @@ -452,9 +450,11 @@ if (pdp) pdp_freepdp(pdp); + /* Send PDP CTX ACT REJ to MS */ - gsm48_tx_gsm_act_pdp_rej(pctx->mm, pctx->ti, reject_cause, - 0, NULL); + if (pctx->mm) + gsm48_tx_gsm_act_pdp_rej(pctx->mm, pctx->ti, reject_cause, + 0, NULL); sgsn_pdp_ctx_free(pctx); return EOF; -- To view, visit https://gerrit.osmocom.org/11019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4575f7f80f785a62ae3b7f165d236a9dd818aabf Gerrit-Change-Number: 11019 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 08:29:27 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 4 Oct 2018 08:29:27 +0000 Subject: Change in osmo-sgsn[master]: gprs_llc: remove the FCS from the msgb by trim'ing the msgb In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( https://gerrit.osmocom.org/11022 ) Change subject: gprs_llc: remove the FCS from the msgb by trim'ing the msgb ...................................................................... gprs_llc: remove the FCS from the msgb by trim'ing the msgb After checking the FCS, it's no use. The FCS should also not appear on `hexdump(msgb_l3(MSG), msgb_l3len(MSG))`. Change-Id: I27e061ead86395a336b67c7aead93d305a0f2ae8 --- M src/gprs/gprs_llc.c M src/gprs/gprs_sndcp.c 2 files changed, 4 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/gprs_llc.c b/src/gprs/gprs_llc.c index 6c92f83..abbb742 100644 --- a/src/gprs/gprs_llc.c +++ b/src/gprs/gprs_llc.c @@ -945,6 +945,9 @@ LOGP(DLLC, LOGL_INFO, "Dropping frame with invalid FCS\n"); return -EIO; } + /* set l3 layer & remove the fcs */ + msg->l3h = llhp.data; + msgb_l3trim(msg, llhp.data_len); /* Update LLE's (BVCI, NSEI) tuple */ lle->llme->bvci = msgb_bvci(msg); @@ -960,7 +963,6 @@ /* llhp.data is only set when we need to send LL_[UNIT]DATA_IND up */ if (llhp.cmd == GPRS_LLC_UI && llhp.data && llhp.data_len) { - msgb_gmmh(msg) = llhp.data; switch (llhp.sapi) { case GPRS_SAPI_GMM: /* send LL_UNITDATA_IND to GMM */ diff --git a/src/gprs/gprs_sndcp.c b/src/gprs/gprs_sndcp.c index 77f8ca6..52eeb75 100644 --- a/src/gprs/gprs_sndcp.c +++ b/src/gprs/gprs_sndcp.c @@ -792,7 +792,7 @@ npdu_num = (suh->npdu_high << 8) | suh->npdu_low; npdu = (uint8_t *)suh + sizeof(*suh); - npdu_len = (msg->data + msg->len) - npdu - 3; /* -3 'removes' the FCS */ + npdu_len = (msg->data + msg->len) - npdu; if (npdu_len <= 0) { LOGP(DSNDCP, LOGL_ERROR, "Short SNDCP N-PDU: %d\n", npdu_len); -- To view, visit https://gerrit.osmocom.org/11022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I27e061ead86395a336b67c7aead93d305a0f2ae8 Gerrit-Change-Number: 11022 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 08:46:15 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 4 Oct 2018 08:46:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly detect RSL_MEAS_RES messages Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11224 Change subject: BTS_Tests.ttcn: fix: properly detect RSL_MEAS_RES messages ...................................................................... BTS_Tests.ttcn: fix: properly detect RSL_MEAS_RES messages Change-Id: Iea5ee868ede8bfe1e2b1cbf5abcbf2844d3fe9a4 --- M bts/BTS_Tests.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/11224/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index fe59fd3..4c1c193 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3734,11 +3734,11 @@ } } -/* Expect (or not expect) SACCH messages (Measurement Reports) */ +/* Expect (or not expect) RSL_MEAS_RES messages (Measurement Reports) */ private altstep as_rsl_sacch_ind(boolean exp_sacch) runs on ConnHdlr { - [exp_sacch] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) { repeat; } - [not exp_sacch] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) { - setverdict(fail, "Unexpected (SACCH) UNIT_DATA_IND message!"); + [exp_sacch] RSL.receive(tr_RSL_MEAS_RES(g_chan_nr)) { repeat; } + [not exp_sacch] RSL.receive(tr_RSL_MEAS_RES(g_chan_nr)) { + setverdict(fail, "Unexpected RSL_MEAS_RES message!"); mtc.stop; } } -- To view, visit https://gerrit.osmocom.org/11224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iea5ee868ede8bfe1e2b1cbf5abcbf2844d3fe9a4 Gerrit-Change-Number: 11224 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 08:49:20 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 4 Oct 2018 08:49:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly detect RSL_MEAS_RES messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11224 ) Change subject: BTS_Tests.ttcn: fix: properly detect RSL_MEAS_RES messages ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11224/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11224/1/bts/BTS_Tests.ttcn at a3739 PS1, Line 3739: My assumption that the DL Measurement Reports are being sent as regular RSL_INITDATA_IND messages was wrong. Actually, they are combined with the UL measurements and then being sent as RSL_MEAS_RES. -- To view, visit https://gerrit.osmocom.org/11224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iea5ee868ede8bfe1e2b1cbf5abcbf2844d3fe9a4 Gerrit-Change-Number: 11224 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 04 Oct 2018 08:49:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 09:38:43 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 4 Oct 2018 09:38:43 +0000 Subject: Change in osmo-sip-connector[master]: cosmetic: call.h: spaces -> tabs for consistency In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11198 to look at the new patch set (#2). Change subject: cosmetic: call.h: spaces -> tabs for consistency ...................................................................... cosmetic: call.h: spaces -> tabs for consistency Change-Id: I1ae638af50fa3741e84e421687270d2177e1be2d --- M src/call.h 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/98/11198/2 -- To view, visit https://gerrit.osmocom.org/11198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1ae638af50fa3741e84e421687270d2177e1be2d Gerrit-Change-Number: 11198 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 09:50:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 4 Oct 2018 09:50:04 +0000 Subject: Change in osmo-gsm-tester[master]: defaults.conf: Add SDCCH8 ts in TRX1 cfg Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11225 Change subject: defaults.conf: Add SDCCH8 ts in TRX1 cfg ...................................................................... defaults.conf: Add SDCCH8 ts in TRX1 cfg This way we can test too if SDCH8 channels are allocated and used correctly in TRX1 in multiTRX setups. Change-Id: I9d08f3d019a28cf775d70d941c5a60a7e7ca20a9 --- M example/defaults.conf 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/25/11225/1 diff --git a/example/defaults.conf b/example/defaults.conf index 42258a6..9894b1b 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -50,7 +50,7 @@ max_power_red: 0 arfcn: 872 timeslot_list: - - phys_chan_config: TCH/F + - phys_chan_config: SDCCH8 - phys_chan_config: TCH/F - phys_chan_config: TCH/F - phys_chan_config: TCH/F -- To view, visit https://gerrit.osmocom.org/11225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9d08f3d019a28cf775d70d941c5a60a7e7ca20a9 Gerrit-Change-Number: 11225 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 10:58:48 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 4 Oct 2018 10:58:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: add 'lazy' mode for as_meas_res() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11226 Change subject: BTS_Tests.ttcn: add 'lazy' mode for as_meas_res() ...................................................................... BTS_Tests.ttcn: add 'lazy' mode for as_meas_res() This mode would be useful for test cases, which expect to receive the RSL_MEAS_RES messages, but don't care about their correctness. Change-Id: I39118d6e64c767fad2c9618ec0ef4532dc60e715 --- M bts/BTS_Tests.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/11226/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index fe59fd3..9c749b4 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1296,8 +1296,9 @@ } /* verify we regularly receive measurement reports with incrementing numbers */ -altstep as_meas_res() runs on ConnHdlr { +altstep as_meas_res(boolean verify_meas := true) runs on ConnHdlr { var RSL_Message rsl; + [not verify_meas] RSL.receive(tr_RSL_MEAS_RES(?)) { repeat; } [] RSL.receive(f_build_meas_res_tmpl()) -> value rsl { /* increment counter of next to-be-expected meas rep */ g_next_meas_res_nr := (g_next_meas_res_nr + 1) mod 256; -- To view, visit https://gerrit.osmocom.org/11226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I39118d6e64c767fad2c9618ec0ef4532dc60e715 Gerrit-Change-Number: 11226 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 10:58:48 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 4 Oct 2018 10:58:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: expect RSL_MEAS_RES messages Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11227 Change subject: BTS_Tests.ttcn: fix: expect RSL_MEAS_RES messages ...................................................................... BTS_Tests.ttcn: fix: expect RSL_MEAS_RES messages Since both Calypso PHY and trxcon (since OS#2988 is fixed) are always sending the Measurement Reports in dedicated mode, the test cases should expect to 'see' the RSL_MEAS_RES messages, and ignore them if they are out of the testing scope. This change makes the following test cases pass: - TC_rll_est_ind, - TC_rll_rel_ind_DCCH_0, - TC_rll_rel_ind_DCCH_3, - TC_rll_rel_ind_ACCH_0, - TC_rll_rel_ind_ACCH_3, by adding the 'lazy' version of as_meas_res() alt-step. Change-Id: I34227b981f76377c338fad4ff9560ba2042abce4 --- M bts/BTS_Tests.ttcn 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/11227/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index f89025f..61fe1a7 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3396,6 +3396,8 @@ mtc.stop; } } + /* We also expect to receive the measurements */ + [] as_meas_res(verify_meas := false); [tc.exp] T.timeout { setverdict(fail, "Timeout waiting for EST IND"); mtc.stop; @@ -3560,6 +3562,8 @@ [] RSL.receive(tr_RSL_REL_IND(g_chan_nr, tc.link_id)) { setverdict(pass); } + /* We also expect to receive the measurements */ + [] as_meas_res(verify_meas := false); } /* release the channel */ -- To view, visit https://gerrit.osmocom.org/11227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I34227b981f76377c338fad4ff9560ba2042abce4 Gerrit-Change-Number: 11227 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 11:10:32 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 4 Oct 2018 11:10:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: don't overwrite the expected meas results Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11228 Change subject: BTS_Tests.ttcn: fix: don't overwrite the expected meas results ...................................................................... BTS_Tests.ttcn: fix: don't overwrite the expected meas results Since OS#2988 was fixed, we should not overwrite nor ignore the measurement results in f_build_meas_res_tmpl(). Change-Id: Ie902bfc7619181b528eafbce367c87e0b062243a --- M bts/BTS_Tests.ttcn 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/11228/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 61fe1a7..cdf2722 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1272,11 +1272,6 @@ toa256_std_dev := ? } } - /* HACK HACK HACK FIXME HACK HACK HACK see https://osmocom.org/issues/2988 */ - ul_meas.rxlev_f_u := ?; - ul_meas.rxlev_s_u := ?; - ul_meas.rxq_f_u := ?; - ul_meas.rxq_s_u := ?; var template RSL_IE_BS_Power bs_power := { reserved := 0, epc := false, -- To view, visit https://gerrit.osmocom.org/11228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie902bfc7619181b528eafbce367c87e0b062243a Gerrit-Change-Number: 11228 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 12:07:33 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 4 Oct 2018 12:07:33 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_main.c: initialize rate counters Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11229 Change subject: osmo_bsc_main.c: initialize rate counters ...................................................................... osmo_bsc_main.c: initialize rate counters main() was missing a call to rate_ctr_init(). Without it, the counters increased properly, but the times per second / minute / hour etc. values would always stay at zero. Change-Id: I4466a7aec51673c79b67614c9dde987633e379e0 Related: OS#3579 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/29/11229/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 60175e1..468b58e 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -805,6 +805,7 @@ osmo_init_logging2(tall_bsc_ctx, &log_info); osmo_stats_init(tall_bsc_ctx); + rate_ctr_init(tall_bsc_ctx); /* Allocate global gsm_network struct */ rc = bsc_network_alloc(); -- To view, visit https://gerrit.osmocom.org/11229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4466a7aec51673c79b67614c9dde987633e379e0 Gerrit-Change-Number: 11229 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 12:36:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 4 Oct 2018 12:36:03 +0000 Subject: Change in osmo-hlr[master]: fix is_ps logic in rx_upd_loc_req(), store CS as is_ps = false Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11230 Change subject: fix is_ps logic in rx_upd_loc_req(), store CS as is_ps = false ...................................................................... fix is_ps logic in rx_upd_loc_req(), store CS as is_ps = false A missing 'else' in rx_upd_loc_req() causes *all* clients to be indicated as is_ps=true regardless of the GSUP CN Domain IE that was received. Replace that odd if cascade with a switch() that fixes the flawed logic. Hence osmo-hlr now correctly indicates each client's is_ps, iff the client sends CN Domain IEs in GSUP LU Request messages. Related: OS#2796, OS#3601 Change-Id: I2c5fa9f5cae25cfd66afbf088303edff7d045a00 --- M src/hlr.c 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/30/11230/1 diff --git a/src/hlr.c b/src/hlr.c index df48a99..f631d52 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -250,18 +250,19 @@ lu_op_statechg(luop, LU_S_LU_RECEIVED); - if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_CS) + switch (gsup->cn_domain) { + case OSMO_GSUP_CN_DOMAIN_CS: conn->supports_cs = true; - if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_PS) { - conn->supports_ps = true; - luop->is_ps = true; - } else { + break; + default: /* The client didn't send a CN_DOMAIN IE; assume packet-switched in * accordance with the GSUP spec in osmo-hlr's user manual (section * 11.6.15 "CN Domain" says "if no CN Domain IE is present within * a request, the PS Domain is assumed." */ + case OSMO_GSUP_CN_DOMAIN_PS: conn->supports_ps = true; luop->is_ps = true; + break; } llist_add(&luop->list, &g_lu_ops); -- To view, visit https://gerrit.osmocom.org/11230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2c5fa9f5cae25cfd66afbf088303edff7d045a00 Gerrit-Change-Number: 11230 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 12:36:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 4 Oct 2018 12:36:04 +0000 Subject: Change in osmo-hlr[master]: more space for vlr_number and sgsn_number Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11231 Change subject: more space for vlr_number and sgsn_number ...................................................................... more space for vlr_number and sgsn_number To be able to handle our 20 chars long IPA tags, enlarge the vlr_number and sgsn_number storage in struct hlr_subscriber. Technically, osmo-hlr should be able to store any type of Global Title, blob of arbitrary size. For our purposes, 32 is enough for now. Related: OS#2796 Change-Id: I0121f1c4dbda3a076d780a3834281b21dab85493 --- M src/db.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/31/11231/1 diff --git a/src/db.h b/src/db.h index 92fdac4..956b5ed 100644 --- a/src/db.h +++ b/src/db.h @@ -69,8 +69,8 @@ char imsi[GSM23003_IMSI_MAX_DIGITS+1]; char msisdn[GT_MAX_DIGITS+1]; /* imeisv? */ - char vlr_number[GT_MAX_DIGITS+1]; - char sgsn_number[GT_MAX_DIGITS+1]; + char vlr_number[32]; + char sgsn_number[32]; char sgsn_address[GT_MAX_DIGITS+1]; /* ggsn number + address */ /* gmlc number */ -- To view, visit https://gerrit.osmocom.org/11231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0121f1c4dbda3a076d780a3834281b21dab85493 Gerrit-Change-Number: 11231 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 12:36:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 4 Oct 2018 12:36:04 +0000 Subject: Change in osmo-hlr[master]: store gsup peer upon accepting LU Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11232 Change subject: store gsup peer upon accepting LU ...................................................................... store gsup peer upon accepting LU Store the GSUP client's IPA_IDTAG_SERNR in vlr_number or sgsn_number (depending on is_ps), just before sending the Insert Subscriber Data message after a successful LU Req. Log about it. Original patch: Ib2611421f3638eadc361787af801fffe9a34bd8a by laforge Related: OS#2796 Change-Id: If438664faa5d68404f465f8b2002c6d03bbf3ceb --- M src/hlr.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/32/11232/1 diff --git a/src/hlr.c b/src/hlr.c index f631d52..cf4871e 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -242,12 +242,16 @@ static int rx_upd_loc_req(struct osmo_gsup_conn *conn, const struct osmo_gsup_message *gsup) { + struct hlr_subscriber *subscr; struct lu_operation *luop = lu_op_alloc_conn(conn); + if (!luop) { LOGP(DMAIN, LOGL_ERROR, "LU REQ from conn without addr?\n"); return -EINVAL; } + subscr = &luop->subscr; + lu_op_statechg(luop, LU_S_LU_RECEIVED); switch (gsup->cn_domain) { @@ -298,6 +302,14 @@ lu_op_tx_cancel_old(luop); } else #endif + + /* Store the VLR / SGSN number with the subscriber, so we know where it was last seen. */ + LOGP(DAUC, LOGL_DEBUG, "IMSI='%s': storing %s = %s\n", + subscr->imsi, luop->is_ps ? "SGSN number" : "VLR number", (const char*)luop->peer); + if (db_subscr_lu(g_hlr->dbc, subscr->id, (const char *)luop->peer, luop->is_ps)) + LOGP(DAUC, LOGL_ERROR, "IMSI='%s': Cannot update %s in the database\n", + subscr->imsi, luop->is_ps ? "SGSN number" : "VLR number"); + { /* TODO: Subscriber allowed to roam in PLMN? */ /* TODO: Update RoutingInfo */ -- To view, visit https://gerrit.osmocom.org/11232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If438664faa5d68404f465f8b2002c6d03bbf3ceb Gerrit-Change-Number: 11232 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 12:36:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 4 Oct 2018 12:36:05 +0000 Subject: Change in osmo-hlr[master]: fix and re-enable osmo_hlr_subscriber_update_notify() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11233 Change subject: fix and re-enable osmo_hlr_subscriber_update_notify() ...................................................................... fix and re-enable osmo_hlr_subscriber_update_notify() Send updated subscriber data out to exactly those GSUP clients that match the last LU operations (depending on each client sending distinct identification). As this adds logging on DLGSUP, also change adjacent GSUP related logging from DMAIN to DLGSUP. Related: OS#2785 Change-Id: I7c317de8329d9a115d072fc61ddb9abc21b7e8d8 --- M src/hlr.c 1 file changed, 45 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/33/11233/1 diff --git a/src/hlr.c b/src/hlr.c index cf4871e..4ed8a7c 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -54,16 +54,20 @@ void osmo_hlr_subscriber_update_notify(struct hlr_subscriber *subscr) { - /* FIXME: the below code can only be re-enabled after we make sure that an ISD - * is only sent tot the currently serving VLR and/or SGSN (if there are any). - * We cannot blindly flood the entire PLMN with this, as it would create subscriber - * state in every VLR/SGSN out there, even those that have never seen the subscriber. - * See https://osmocom.org/issues/3154 for details. */ -#if 0 struct osmo_gsup_conn *co; - if (g_hlr->gs == NULL) + if (g_hlr->gs == NULL) { + LOGP(DLGSUP, LOGL_DEBUG, + "IMSI %s: NOT Notifying peers of subscriber data change," + " there is no GSUP server\n", + subscr->imsi); return; + } + + LOGP(DLGSUP, LOGL_DEBUG, + "IMSI %s: Notifying peers of subscriber data change" + " (VLR number: '%s', SGSN number: '%s')\n", + subscr->imsi, subscr->vlr_number, subscr->sgsn_number); llist_for_each_entry(co, &g_hlr->gs->clients, list) { struct osmo_gsup_message gsup = { }; @@ -72,20 +76,48 @@ struct msgb *msg_out; uint8_t *peer; int peer_len; + size_t peer_strlen; + const char *peer_compare; enum osmo_gsup_cn_domain cn_domain; - if (co->supports_ps) + if (co->supports_ps) { cn_domain = OSMO_GSUP_CN_DOMAIN_PS; - else if (co->supports_cs) + peer_compare = subscr->sgsn_number; + } else if (co->supports_cs) { cn_domain = OSMO_GSUP_CN_DOMAIN_CS; - else { - /* We have not yet received a location update from this subscriber .*/ + peer_compare = subscr->vlr_number; + } else { + /* We have not yet received a location update from this GSUP client.*/ continue; } + peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR); + if (peer_len < 0) { + LOGP(DLGSUP, LOGL_ERROR, + "IMSI='%s': cannot get peer name for connection %s:%u\n", subscr->imsi, + co && co->conn && co->conn->server? co->conn->server->addr : "unset", + co && co->conn && co->conn->server? co->conn->server->port : 0); + continue; + } + + peer_strlen = strnlen((const char*)peer, peer_len); + if (strlen(peer_compare) != peer_strlen || strncmp(peer_compare, (const char *)peer, peer_len)) { + /* Mismatch. The subscriber is not subscribed with this GSUP client. */ + /* I hope peer is always nul terminated... */ + if (peer_strlen < peer_len) + LOGP(DLGSUP, LOGL_DEBUG, + "IMSI %s: subscriber change: skipping %s peer %s\n", + subscr->imsi, cn_domain == OSMO_GSUP_CN_DOMAIN_PS ? "PS" : "CS", peer); + continue; + } + + LOGP(DLGSUP, LOGL_DEBUG, + "IMSI %s: subscriber change: notifying %s peer %s\n", + subscr->imsi, cn_domain == OSMO_GSUP_CN_DOMAIN_PS ? "PS" : "CS", peer_compare); + if (osmo_gsup_create_insert_subscriber_data_msg(&gsup, subscr->imsi, subscr->msisdn, msisdn_enc, sizeof(msisdn_enc), apn, sizeof(apn), cn_domain) != 0) { - LOGP(DMAIN, LOGL_ERROR, + LOGP(DLGSUP, LOGL_ERROR, "IMSI='%s': Cannot notify GSUP client; could not create gsup message " "for %s:%u\n", subscr->imsi, co && co->conn && co->conn->server? co->conn->server->addr : "unset", @@ -96,7 +128,7 @@ /* Send ISD to MSC/SGSN */ msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP ISD UPDATE"); if (msg_out == NULL) { - LOGP(DMAIN, LOGL_ERROR, + LOGP(DLGSUP, LOGL_ERROR, "IMSI='%s': Cannot notify GSUP client; could not allocate msg buffer " "for %s:%u\n", subscr->imsi, co && co->conn && co->conn->server? co->conn->server->addr : "unset", @@ -105,15 +137,6 @@ } osmo_gsup_encode(msg_out, &gsup); - peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR); - if (peer_len < 0) { - LOGP(DMAIN, LOGL_ERROR, - "IMSI='%s': cannot get peer name for connection %s:%u\n", subscr->imsi, - co && co->conn && co->conn->server? co->conn->server->addr : "unset", - co && co->conn && co->conn->server? co->conn->server->port : 0); - continue; - } - if (osmo_gsup_addr_send(g_hlr->gs, peer, peer_len, msg_out) < 0) { LOGP(DMAIN, LOGL_ERROR, "IMSI='%s': Cannot notify GSUP client; send operation failed " @@ -123,7 +146,6 @@ continue; } } -#endif } /*********************************************************************** -- To view, visit https://gerrit.osmocom.org/11233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7c317de8329d9a115d072fc61ddb9abc21b7e8d8 Gerrit-Change-Number: 11233 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 12:38:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 4 Oct 2018 12:38:30 +0000 Subject: Change in osmo-hlr[master]: store gsup peer upon accepting LU In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11232 ) Change subject: store gsup peer upon accepting LU ...................................................................... store gsup peer upon accepting LU Store the GSUP client's IPA_IDTAG_SERNR in vlr_number or sgsn_number (depending on is_ps), just before sending the Insert Subscriber Data message after a successful LU Req. Log about it. Original patch: Ib2611421f3638eadc361787af801fffe9a34bd8a by laforge Related: OS#2796 Change-Id: If438664faa5d68404f465f8b2002c6d03bbf3ceb --- M src/hlr.c 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/32/11232/2 -- To view, visit https://gerrit.osmocom.org/11232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If438664faa5d68404f465f8b2002c6d03bbf3ceb Gerrit-Change-Number: 11232 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 14:31:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 4 Oct 2018 14:31:09 +0000 Subject: Change in osmo-gsm-tester[master]: defaults.conf: Add SDCCH8 ts in TRX1 cfg In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11225 to look at the new patch set (#2). Change subject: defaults.conf: Add SDCCH8 ts in TRX1 cfg ...................................................................... defaults.conf: Add SDCCH8 ts in TRX1 cfg This way we can test too if SDCH8 channels are allocated and used correctly in TRX1 in multiTRX setups. Change-Id: I9d08f3d019a28cf775d70d941c5a60a7e7ca20a9 --- M example/defaults.conf 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/25/11225/2 -- To view, visit https://gerrit.osmocom.org/11225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9d08f3d019a28cf775d70d941c5a60a7e7ca20a9 Gerrit-Change-Number: 11225 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 14:37:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 4 Oct 2018 14:37:46 +0000 Subject: Change in openbsc[master]: examples: nanobts: openbsc-multitrx.cfg: Set SDCCH in correct TS of TRX1 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11234 Change subject: examples: nanobts: openbsc-multitrx.cfg: Set SDCCH in correct TS of TRX1 ...................................................................... examples: nanobts: openbsc-multitrx.cfg: Set SDCCH in correct TS of TRX1 According to verify_chan_comb(), nanoBTS supports SDCCH8 only in TS1. Change-Id: I37b91745ddf7000add3c24f6bb782ae0c61d2978 --- M openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/34/11234/1 diff --git a/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg b/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg index 7c03ed5..99f2653 100644 --- a/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg +++ b/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg @@ -71,9 +71,9 @@ max_power_red 0 rsl e1 tei 0 timeslot 0 - phys_chan_config SDCCH8 - timeslot 1 phys_chan_config TCH/F + timeslot 1 + phys_chan_config SDCCH8 timeslot 2 phys_chan_config TCH/F timeslot 3 -- To view, visit https://gerrit.osmocom.org/11234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I37b91745ddf7000add3c24f6bb782ae0c61d2978 Gerrit-Change-Number: 11234 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 15:40:34 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 4 Oct 2018 15:40:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly detect Measurement Reports In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11224 ) Change subject: BTS_Tests.ttcn: fix: properly detect Measurement Reports ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iea5ee868ede8bfe1e2b1cbf5abcbf2844d3fe9a4 Gerrit-Change-Number: 11224 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 04 Oct 2018 15:40:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 15:59:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 4 Oct 2018 15:59:47 +0000 Subject: Change in osmo-ci[master]: osmocom-nightly-packages.sh: Build against newest limesuite release v... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11235 Change subject: osmocom-nightly-packages.sh: Build against newest limesuite release v18.10.0 ...................................................................... osmocom-nightly-packages.sh: Build against newest limesuite release v18.10.0 Change-Id: I4e3a3d3ac4422cbf9c4e8c8bda3d3f7b27be1a14 --- M scripts/osmocom-nightly-packages.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/35/11235/1 diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index ba324cb..1c98029 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -126,7 +126,7 @@ } checkout_limesuite() { - TAG="01e2d00c5005b85d1f94cca02881756a72e35e2a" + TAG="v18.10.0" cd "$REPO" git clone https://github.com/myriadrf/LimeSuite limesuite @@ -186,7 +186,7 @@ create_osmo_trx_debian8_jessie - build limesuite no_commit --git-upstream-tree=01e2d00c5005b85d1f94cca02881756a72e35e2a + build limesuite no_commit --git-upstream-tree=v18.10.0 build libosmocore build libosmo-sccp build libosmo-abis -- To view, visit https://gerrit.osmocom.org/11235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4e3a3d3ac4422cbf9c4e8c8bda3d3f7b27be1a14 Gerrit-Change-Number: 11235 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 16:10:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 4 Oct 2018 16:10:22 +0000 Subject: Change in osmo-ci[master]: osmocom-nightly-packages.sh: Build against newest limesuite release v... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11235 ) Change subject: osmocom-nightly-packages.sh: Build against newest limesuite release v18.10.0 ...................................................................... Patch Set 1: Tested locally it works fine (I can register phones and place a call with this limesuite version and master osmo-trx). Also tested it builds fine in my OBS. -- To view, visit https://gerrit.osmocom.org/11235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4e3a3d3ac4422cbf9c4e8c8bda3d3f7b27be1a14 Gerrit-Change-Number: 11235 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 04 Oct 2018 16:10:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 16:10:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 4 Oct 2018 16:10:26 +0000 Subject: Change in osmo-ci[master]: osmocom-nightly-packages.sh: Build against newest limesuite release v... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11235 ) Change subject: osmocom-nightly-packages.sh: Build against newest limesuite release v18.10.0 ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4e3a3d3ac4422cbf9c4e8c8bda3d3f7b27be1a14 Gerrit-Change-Number: 11235 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 04 Oct 2018 16:10:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 16:13:53 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 4 Oct 2018 16:13:53 +0000 Subject: Change in osmo-bsc[master]: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11060 to look at the new patch set (#9). Change subject: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST ...................................................................... codec_pref: handle S0-S15 in ASSIGNMENT REQUEST Opposed to all other codecs that are common in GSM, AMR requires a codec configuration that is expressed by a bitmask (S0 to S15) in the speech codec list in the ASSIGNMENT REQUEST. Also the BSC acknowledges those configuration in the ASSIGNMENT COMPLETE message. At the moment osmo-bsc ignores all incoming configuration bits. The bits in the ASSIGNMENT COMPLETE speech codec (choosen) field are hardcoded. - Store the configuration bits while parsing the ASSIGNMENT COMPLETE - Create an intersection with the configuration that is actually supported by the BSS - Return the resulting (chosen) configuration bits with the assignment complete message. - Use the (highest of the) agreed codec rates in RSL channel activation. Change-Id: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Related: OS#3529 --- M include/osmocom/bsc/codec_pref.h M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/codec_pref.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c M tests/codec_pref/codec_pref_test.c M tests/codec_pref/codec_pref_test.ok 10 files changed, 190 insertions(+), 101 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/11060/9 -- To view, visit https://gerrit.osmocom.org/11060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Gerrit-Change-Number: 11060 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 16:18:44 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 4 Oct 2018 16:18:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: use consistant AMR S0-S15 bits In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11131 ) Change subject: BSC_Tests: use consistant AMR S0-S15 bits ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia98f18ba2c17c85ed01488734dc6df67f5b60d41 Gerrit-Change-Number: 11131 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 04 Oct 2018 16:18:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 16:24:16 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 4 Oct 2018 16:24:16 +0000 Subject: Change in osmo-hlr[master]: fix is_ps logic in rx_upd_loc_req(), store CS as is_ps = false In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11230 ) Change subject: fix is_ps logic in rx_upd_loc_req(), store CS as is_ps = false ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2c5fa9f5cae25cfd66afbf088303edff7d045a00 Gerrit-Change-Number: 11230 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 04 Oct 2018 16:24:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 16:34:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 4 Oct 2018 16:34:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly detect Measurement Reports In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11224 ) Change subject: BTS_Tests.ttcn: fix: properly detect Measurement Reports ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11224/2/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11224/2/bts/BTS_Tests.ttcn at 3762 PS2, Line 3762: [exp_sacch] as_meas_res(verify_meas := false); I think you are changing logic here too, because if exp_sacch=false you want to fail if you receive something there, but you don't do that after your change. BTW: Does TTCN3 supports passing params by name instead of order? -- To view, visit https://gerrit.osmocom.org/11224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iea5ee868ede8bfe1e2b1cbf5abcbf2844d3fe9a4 Gerrit-Change-Number: 11224 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 04 Oct 2018 16:34:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 16:35:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 4 Oct 2018 16:35:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: expect RSL_MEAS_RES messages In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11227 ) Change subject: BTS_Tests.ttcn: fix: expect RSL_MEAS_RES messages ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I34227b981f76377c338fad4ff9560ba2042abce4 Gerrit-Change-Number: 11227 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 04 Oct 2018 16:35:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 16:35:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 4 Oct 2018 16:35:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: add 'lazy' mode for as_meas_res() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11226 ) Change subject: BTS_Tests.ttcn: add 'lazy' mode for as_meas_res() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I39118d6e64c767fad2c9618ec0ef4532dc60e715 Gerrit-Change-Number: 11226 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 04 Oct 2018 16:35:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 4 17:20:39 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 4 Oct 2018 17:20:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly detect Measurement Reports In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11224 ) Change subject: BTS_Tests.ttcn: fix: properly detect Measurement Reports ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11224/2/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11224/2/bts/BTS_Tests.ttcn at 3762 PS2, Line 3762: [exp_sacch] as_meas_res(verify_meas := false); Good point. I don't even know, how can we print something here without changing the as_meas_res(). > BTW: Does TTCN3 supports passing params by name > instead of order? Sure :) -- To view, visit https://gerrit.osmocom.org/11224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iea5ee868ede8bfe1e2b1cbf5abcbf2844d3fe9a4 Gerrit-Change-Number: 11224 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 04 Oct 2018 17:20:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 07:51:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 07:51:19 +0000 Subject: Change in osmo-hlr[master]: fix is_ps logic in rx_upd_loc_req(), store CS as is_ps = false In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11230 ) Change subject: fix is_ps logic in rx_upd_loc_req(), store CS as is_ps = false ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2c5fa9f5cae25cfd66afbf088303edff7d045a00 Gerrit-Change-Number: 11230 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 05 Oct 2018 07:51:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 07:51:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 07:51:24 +0000 Subject: Change in osmo-hlr[master]: fix is_ps logic in rx_upd_loc_req(), store CS as is_ps = false In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11230 ) Change subject: fix is_ps logic in rx_upd_loc_req(), store CS as is_ps = false ...................................................................... fix is_ps logic in rx_upd_loc_req(), store CS as is_ps = false A missing 'else' in rx_upd_loc_req() causes *all* clients to be indicated as is_ps=true regardless of the GSUP CN Domain IE that was received. Replace that odd if cascade with a switch() that fixes the flawed logic. Hence osmo-hlr now correctly indicates each client's is_ps, iff the client sends CN Domain IEs in GSUP LU Request messages. Related: OS#2796, OS#3601 Change-Id: I2c5fa9f5cae25cfd66afbf088303edff7d045a00 --- M src/hlr.c 1 file changed, 6 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/hlr.c b/src/hlr.c index df48a99..f631d52 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -250,18 +250,19 @@ lu_op_statechg(luop, LU_S_LU_RECEIVED); - if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_CS) + switch (gsup->cn_domain) { + case OSMO_GSUP_CN_DOMAIN_CS: conn->supports_cs = true; - if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_PS) { - conn->supports_ps = true; - luop->is_ps = true; - } else { + break; + default: /* The client didn't send a CN_DOMAIN IE; assume packet-switched in * accordance with the GSUP spec in osmo-hlr's user manual (section * 11.6.15 "CN Domain" says "if no CN Domain IE is present within * a request, the PS Domain is assumed." */ + case OSMO_GSUP_CN_DOMAIN_PS: conn->supports_ps = true; luop->is_ps = true; + break; } llist_add(&luop->list, &g_lu_ops); -- To view, visit https://gerrit.osmocom.org/11230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2c5fa9f5cae25cfd66afbf088303edff7d045a00 Gerrit-Change-Number: 11230 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 07:51:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 07:51:45 +0000 Subject: Change in osmo-hlr[master]: more space for vlr_number and sgsn_number In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11231 ) Change subject: more space for vlr_number and sgsn_number ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0121f1c4dbda3a076d780a3834281b21dab85493 Gerrit-Change-Number: 11231 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 05 Oct 2018 07:51:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 07:54:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 07:54:18 +0000 Subject: Change in osmo-hlr[master]: store gsup peer upon accepting LU In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11232 ) Change subject: store gsup peer upon accepting LU ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11232/2/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/#/c/11232/2/src/hlr.c at 307 PS2, Line 307: luop->peer here you are assuming that it will always be printable ASCII. That's true for the moment but not really future compatible, when arbitrary binary blobs could be used e.g. to represent [encoded] global titles. I would at least add a FIXME around that. A more "proper" solution would probably check for non-printable characters and do a hexdump if such are found. -- To view, visit https://gerrit.osmocom.org/11232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If438664faa5d68404f465f8b2002c6d03bbf3ceb Gerrit-Change-Number: 11232 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 05 Oct 2018 07:54:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 07:54:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 07:54:59 +0000 Subject: Change in osmo-hlr[master]: more space for vlr_number and sgsn_number In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11231 ) Change subject: more space for vlr_number and sgsn_number ...................................................................... more space for vlr_number and sgsn_number To be able to handle our 20 chars long IPA tags, enlarge the vlr_number and sgsn_number storage in struct hlr_subscriber. Technically, osmo-hlr should be able to store any type of Global Title, blob of arbitrary size. For our purposes, 32 is enough for now. Related: OS#2796 Change-Id: I0121f1c4dbda3a076d780a3834281b21dab85493 --- M src/db.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/db.h b/src/db.h index 92fdac4..956b5ed 100644 --- a/src/db.h +++ b/src/db.h @@ -69,8 +69,8 @@ char imsi[GSM23003_IMSI_MAX_DIGITS+1]; char msisdn[GT_MAX_DIGITS+1]; /* imeisv? */ - char vlr_number[GT_MAX_DIGITS+1]; - char sgsn_number[GT_MAX_DIGITS+1]; + char vlr_number[32]; + char sgsn_number[32]; char sgsn_address[GT_MAX_DIGITS+1]; /* ggsn number + address */ /* gmlc number */ -- To view, visit https://gerrit.osmocom.org/11231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0121f1c4dbda3a076d780a3834281b21dab85493 Gerrit-Change-Number: 11231 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 07:55:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 07:55:36 +0000 Subject: Change in osmo-ci[master]: osmocom-nightly-packages.sh: Build against newest limesuite release v... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11235 ) Change subject: osmocom-nightly-packages.sh: Build against newest limesuite release v18.10.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4e3a3d3ac4422cbf9c4e8c8bda3d3f7b27be1a14 Gerrit-Change-Number: 11235 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 05 Oct 2018 07:55:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 07:55:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 07:55:38 +0000 Subject: Change in osmo-ci[master]: osmocom-nightly-packages.sh: Build against newest limesuite release v... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11235 ) Change subject: osmocom-nightly-packages.sh: Build against newest limesuite release v18.10.0 ...................................................................... osmocom-nightly-packages.sh: Build against newest limesuite release v18.10.0 Change-Id: I4e3a3d3ac4422cbf9c4e8c8bda3d3f7b27be1a14 --- M scripts/osmocom-nightly-packages.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index ba324cb..1c98029 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -126,7 +126,7 @@ } checkout_limesuite() { - TAG="01e2d00c5005b85d1f94cca02881756a72e35e2a" + TAG="v18.10.0" cd "$REPO" git clone https://github.com/myriadrf/LimeSuite limesuite @@ -186,7 +186,7 @@ create_osmo_trx_debian8_jessie - build limesuite no_commit --git-upstream-tree=01e2d00c5005b85d1f94cca02881756a72e35e2a + build limesuite no_commit --git-upstream-tree=v18.10.0 build libosmocore build libosmo-sccp build libosmo-abis -- To view, visit https://gerrit.osmocom.org/11235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4e3a3d3ac4422cbf9c4e8c8bda3d3f7b27be1a14 Gerrit-Change-Number: 11235 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 07:55:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 07:55:56 +0000 Subject: Change in osmo-gsm-tester[master]: defaults.conf: Add SDCCH8 ts in TRX1 cfg In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11225 ) Change subject: defaults.conf: Add SDCCH8 ts in TRX1 cfg ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9d08f3d019a28cf775d70d941c5a60a7e7ca20a9 Gerrit-Change-Number: 11225 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 05 Oct 2018 07:55:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 07:55:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 07:55:57 +0000 Subject: Change in osmo-gsm-tester[master]: defaults.conf: Add SDCCH8 ts in TRX1 cfg In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11225 ) Change subject: defaults.conf: Add SDCCH8 ts in TRX1 cfg ...................................................................... defaults.conf: Add SDCCH8 ts in TRX1 cfg This way we can test too if SDCH8 channels are allocated and used correctly in TRX1 in multiTRX setups. Change-Id: I9d08f3d019a28cf775d70d941c5a60a7e7ca20a9 --- M example/defaults.conf 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/example/defaults.conf b/example/defaults.conf index 42258a6..dc38030 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -51,7 +51,7 @@ arfcn: 872 timeslot_list: - phys_chan_config: TCH/F - - phys_chan_config: TCH/F + - phys_chan_config: SDCCH8 - phys_chan_config: TCH/F - phys_chan_config: TCH/F - phys_chan_config: TCH/F -- To view, visit https://gerrit.osmocom.org/11225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9d08f3d019a28cf775d70d941c5a60a7e7ca20a9 Gerrit-Change-Number: 11225 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 07:56:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 07:56:16 +0000 Subject: Change in openbsc[master]: examples: nanobts: openbsc-multitrx.cfg: Set SDCCH in correct TS of TRX1 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11234 ) Change subject: examples: nanobts: openbsc-multitrx.cfg: Set SDCCH in correct TS of TRX1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37b91745ddf7000add3c24f6bb782ae0c61d2978 Gerrit-Change-Number: 11234 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 05 Oct 2018 07:56:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 07:56:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 07:56:17 +0000 Subject: Change in openbsc[master]: examples: nanobts: openbsc-multitrx.cfg: Set SDCCH in correct TS of TRX1 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11234 ) Change subject: examples: nanobts: openbsc-multitrx.cfg: Set SDCCH in correct TS of TRX1 ...................................................................... examples: nanobts: openbsc-multitrx.cfg: Set SDCCH in correct TS of TRX1 According to verify_chan_comb(), nanoBTS supports SDCCH8 only in TS1. Change-Id: I37b91745ddf7000add3c24f6bb782ae0c61d2978 --- M openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg b/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg index 7c03ed5..99f2653 100644 --- a/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg +++ b/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg @@ -71,9 +71,9 @@ max_power_red 0 rsl e1 tei 0 timeslot 0 - phys_chan_config SDCCH8 - timeslot 1 phys_chan_config TCH/F + timeslot 1 + phys_chan_config SDCCH8 timeslot 2 phys_chan_config TCH/F timeslot 3 -- To view, visit https://gerrit.osmocom.org/11234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I37b91745ddf7000add3c24f6bb782ae0c61d2978 Gerrit-Change-Number: 11234 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 07:56:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 07:56:39 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_main.c: initialize rate counters In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11229 ) Change subject: osmo_bsc_main.c: initialize rate counters ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4466a7aec51673c79b67614c9dde987633e379e0 Gerrit-Change-Number: 11229 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 05 Oct 2018 07:56:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 07:56:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 07:56:41 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_main.c: initialize rate counters In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11229 ) Change subject: osmo_bsc_main.c: initialize rate counters ...................................................................... osmo_bsc_main.c: initialize rate counters main() was missing a call to rate_ctr_init(). Without it, the counters increased properly, but the times per second / minute / hour etc. values would always stay at zero. Change-Id: I4466a7aec51673c79b67614c9dde987633e379e0 Related: OS#3579 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 60175e1..468b58e 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -805,6 +805,7 @@ osmo_init_logging2(tall_bsc_ctx, &log_info); osmo_stats_init(tall_bsc_ctx); + rate_ctr_init(tall_bsc_ctx); /* Allocate global gsm_network struct */ rc = bsc_network_alloc(); -- To view, visit https://gerrit.osmocom.org/11229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4466a7aec51673c79b67614c9dde987633e379e0 Gerrit-Change-Number: 11229 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 07:57:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 07:57:11 +0000 Subject: Change in osmo-sip-connector[master]: cosmetic: call.h: spaces -> tabs for consistency In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11198 ) Change subject: cosmetic: call.h: spaces -> tabs for consistency ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1ae638af50fa3741e84e421687270d2177e1be2d Gerrit-Change-Number: 11198 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 05 Oct 2018 07:57:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 07:57:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 07:57:12 +0000 Subject: Change in osmo-sip-connector[master]: cosmetic: call.h: spaces -> tabs for consistency In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11198 ) Change subject: cosmetic: call.h: spaces -> tabs for consistency ...................................................................... cosmetic: call.h: spaces -> tabs for consistency Change-Id: I1ae638af50fa3741e84e421687270d2177e1be2d --- M src/call.h 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/call.h b/src/call.h index de92a24..65d1111 100644 --- a/src/call.h +++ b/src/call.h @@ -54,15 +54,15 @@ uint32_t payload_type; uint32_t payload_msg_type; - /** - * Remote started to ring/alert - */ - void (*ring_call)(struct call_leg *); + /** + * Remote started to ring/alert + */ + void (*ring_call)(struct call_leg *); - /** - * Remote picked up - */ - void (*connect_call)(struct call_leg *); + /** + * Remote picked up + */ + void (*connect_call)(struct call_leg *); /** * Set by the call_leg implementation and will be called -- To view, visit https://gerrit.osmocom.org/11198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1ae638af50fa3741e84e421687270d2177e1be2d Gerrit-Change-Number: 11198 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 07:58:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 07:58:18 +0000 Subject: Change in osmo-bsc[master]: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11060 ) Change subject: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Gerrit-Change-Number: 11060 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Fri, 05 Oct 2018 07:58:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 07:58:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 07:58:22 +0000 Subject: Change in osmo-bsc[master]: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11060 ) Change subject: codec_pref: handle S0-S15 in ASSIGNMENT REQUEST ...................................................................... codec_pref: handle S0-S15 in ASSIGNMENT REQUEST Opposed to all other codecs that are common in GSM, AMR requires a codec configuration that is expressed by a bitmask (S0 to S15) in the speech codec list in the ASSIGNMENT REQUEST. Also the BSC acknowledges those configuration in the ASSIGNMENT COMPLETE message. At the moment osmo-bsc ignores all incoming configuration bits. The bits in the ASSIGNMENT COMPLETE speech codec (choosen) field are hardcoded. - Store the configuration bits while parsing the ASSIGNMENT COMPLETE - Create an intersection with the configuration that is actually supported by the BSS - Return the resulting (chosen) configuration bits with the assignment complete message. - Use the (highest of the) agreed codec rates in RSL channel activation. Change-Id: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Related: OS#3529 --- M include/osmocom/bsc/codec_pref.h M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/codec_pref.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c M tests/codec_pref/codec_pref_test.c M tests/codec_pref/codec_pref_test.ok 10 files changed, 190 insertions(+), 101 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/codec_pref.h b/include/osmocom/bsc/codec_pref.h index 09aaa60..3085ad4 100644 --- a/include/osmocom/bsc/codec_pref.h +++ b/include/osmocom/bsc/codec_pref.h @@ -12,11 +12,11 @@ int match_codec_pref(enum gsm48_chan_mode *chan_mode, bool *full_rate, + uint16_t *s15_s0, const struct gsm0808_channel_type *ct, const struct gsm0808_speech_codec_list *scl, - struct gsm_audio_support * const *audio_support, - int audio_length, - const struct bts_codec_conf *bts_codec); + const struct bsc_msc_data *msc, + const struct gsm_bts *bts); void gen_bss_supported_codec_list(struct gsm0808_speech_codec_list *scl, const struct bsc_msc_data *msc, diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 33a5a8d..7c91e59 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -109,6 +109,7 @@ enum gsm48_chan_mode chan_mode; bool full_rate; + uint16_t s15_s0; }; struct assignment_fsm_data { diff --git a/include/osmocom/bsc/lchan_fsm.h b/include/osmocom/bsc/lchan_fsm.h index 9fbf9b3..d2e8724 100644 --- a/include/osmocom/bsc/lchan_fsm.h +++ b/include/osmocom/bsc/lchan_fsm.h @@ -58,6 +58,7 @@ /* This always is for a specific lchan, so its lchan->type indicates full or half rate. * When a dyn TS was selected, the lchan->type has been set to the desired rate. */ enum gsm48_chan_mode chan_mode; + uint16_t s15_s0; bool requires_voice_stream; bool wait_before_switching_rtp; uint16_t msc_assigned_cic; diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 2410adb..3f553ff 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -169,8 +169,8 @@ * assignment complete message. */ if (gscon_is_aoip(conn)) { /* Extrapolate speech codec from speech mode */ - /* FIXME: AMR codec configuration must be derived from lchan1! */ gsm0808_speech_codec_from_chan_type(&sc, perm_spch); + sc.cfg = conn->assignment.req.s15_s0; sc_ptr = ≻ } } @@ -382,6 +382,7 @@ .activ_for = FOR_ASSIGNMENT, .for_conn = conn, .chan_mode = req->chan_mode, + .s15_s0 = req->s15_s0, .requires_voice_stream = conn->assignment.requires_voice_stream, .msc_assigned_cic = req->msc_assigned_cic, .old_lchan = conn->lchan, diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index c998e60..afecaa3 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -94,14 +94,18 @@ * matches one of the permitted speech settings of the channel type element. * The matched permitted speech value is then also compared against the * speech codec list. (optional, only relevant for AoIP) */ -static bool test_codec_pref(const struct gsm0808_channel_type *ct, - const struct gsm0808_speech_codec_list *scl, uint8_t perm_spch) +static bool test_codec_pref(const struct gsm0808_speech_codec **sc_match, + const struct gsm0808_speech_codec_list *scl, + const struct gsm0808_channel_type *ct, + uint8_t perm_spch) { unsigned int i; bool match = false; struct gsm0808_speech_codec sc; int rc; + *sc_match = NULL; + /* Try to find the given permitted speech value in the * codec list of the channel type element */ for (i = 0; i < ct->perm_spch_len; i++) { @@ -129,8 +133,10 @@ /* Try to find extrapolated speech codec data in * the speech codec list */ for (i = 0; i < scl->len; i++) { - if (sc.type == scl->codec[i].type) + if (sc.type == scl->codec[i].type) { + *sc_match = &scl->codec[i]; return true; + } } return false; @@ -168,40 +174,74 @@ return false; } +/* Generate the bss supported amr configuration bits (S0-S15) */ +static uint16_t gen_bss_supported_amr_s15_s0(const struct bsc_msc_data *msc, const struct gsm_bts *bts, bool hr) +{ + const struct gsm48_multi_rate_conf *amr_cfg_bts; + const struct gsm48_multi_rate_conf *amr_cfg_msc; + uint16_t amr_s15_s0_bts; + uint16_t amr_s15_s0_msc; + + /* Lookup the BTS specific AMR rate configuration. This config is set + * via the VTY for each BTS individually. In cases where no configuration + * is set we will assume a safe default */ + if (hr) { + amr_cfg_bts = (struct gsm48_multi_rate_conf *)&bts->mr_half.gsm48_ie; + amr_s15_s0_bts = gsm0808_sc_cfg_from_gsm48_mr_cfg(amr_cfg_bts, false); + } else { + amr_cfg_bts = (struct gsm48_multi_rate_conf *)&bts->mr_full.gsm48_ie; + amr_s15_s0_bts = gsm0808_sc_cfg_from_gsm48_mr_cfg(amr_cfg_bts, true); + } + + /* Lookup the AMR rate configuration that is set for the MSC */ + amr_cfg_msc = &msc->amr_conf; + amr_s15_s0_msc = gsm0808_sc_cfg_from_gsm48_mr_cfg(amr_cfg_msc, true); + + /* Calculate the intersection of the two configurations and update S0-S15 + * in the codec list. */ + return amr_s15_s0_bts & amr_s15_s0_msc; +} + /*! Match the codec preferences from local config with a received codec preferences IEs received from the * MSC and the BTS' codec configuration. * \param[out] chan_mode GSM 04.08 channel mode. * \param[out] full_rate true if full-rate. + * \param[out] s15_s0 codec configuration bits S15-S0 (AMR) * \param[in] ct GSM 08.08 channel type received from MSC. * \param[in] scl GSM 08.08 speech codec list received from MSC (optional). - * \param[in] audio_support List of allowed codecs as from local config. - * \param[in] audio_length Number of items in audio_support. - * \param[in] bts_codec BTS codec configuration. + * \param[in] msc associated msc (current codec settings). + * \param[in] bts associated bts (current codec settings). * \returns 0 on success, -1 in case no match was found */ int match_codec_pref(enum gsm48_chan_mode *chan_mode, bool *full_rate, + uint16_t *s15_s0, const struct gsm0808_channel_type *ct, const struct gsm0808_speech_codec_list *scl, - struct gsm_audio_support * const *audio_support, - int audio_length, - const struct bts_codec_conf *bts_codec) + const struct bsc_msc_data *msc, + const struct gsm_bts *bts) { unsigned int i; uint8_t perm_spch; bool match = false; + const struct gsm0808_speech_codec *sc_match = NULL; + uint16_t amr_s15_s0_supported; - for (i = 0; i < audio_length; i++) { + /* Note: Normally the MSC should never try to advertise a codec that + * we did not advertise as supported before. In order to ensure that + * no unsupported codec is accepted, we make sure that the codec is + * indeed available with the current BTS and MSC configuration */ + for (i = 0; i < msc->audio_length; i++) { /* Pick a permitted speech value from the global codec configuration list */ - perm_spch = audio_support_to_gsm88(audio_support[i]); + perm_spch = audio_support_to_gsm88(msc->audio_support[i]); /* Check this permitted speech value against the BTS specific parameters. * if the BTS does not support the codec, try the next one */ - if (!test_codec_support_bts(bts_codec, perm_spch)) + if (!test_codec_support_bts(&bts->codec, perm_spch)) continue; /* Match the permitted speech value against the codec lists that were * advertised by the MS and the MSC */ - if (test_codec_pref(ct, scl, perm_spch)) { + if (test_codec_pref(&sc_match, scl, ct, perm_spch)) { match = true; break; } @@ -211,6 +251,7 @@ if (!match) { *full_rate = false; *chan_mode = GSM48_CMODE_SIGN; + *s15_s0 = 0; return -1; } @@ -240,6 +281,31 @@ /* Lookup a channel mode for the selected codec */ *chan_mode = gsm88_to_chan_mode(perm_spch); + /* Special handling for AMR */ + if (perm_spch == GSM0808_PERM_HR3 || perm_spch == GSM0808_PERM_FR3) { + /* Normally the MSC should never try to advertise an AMR codec + * configuration that we did not previously advertise as + * supported. However, to ensure that no unsupported AMR codec + * configuration enters the further processing steps we again + * lookup what we support and generate an intersection. All + * further processing is then done with this intersection + * result */ + amr_s15_s0_supported = gen_bss_supported_amr_s15_s0(msc, bts, (perm_spch == GSM0808_PERM_HR3)); + if (sc_match) + *s15_s0 = sc_match->cfg & amr_s15_s0_supported; + else + *s15_s0 = amr_s15_s0_supported; + + /* NOTE: The function test_codec_pref() will populate the + * sc_match pointer from the searched speech codec list. For + * AoIP based networks, no speech codec list will be present + * and therefore no sc_match will be populated. For those + * cases only the local configuration will influence s15_s0. + * However s15_s0 is always populated with a meaningful value, + * regardless if AoIP is in use or not. */ + } else + *s15_s0 = 0; + return 0; } @@ -254,11 +320,6 @@ uint8_t perm_spch; unsigned int i; int rc; - uint16_t amr_s15_s0_bts; - uint16_t amr_s15_s0_msc; - uint16_t amr_s15_s0; - const struct gsm48_multi_rate_conf *amr_cfg_bts; - const struct gsm48_multi_rate_conf *amr_cfg_msc; memset(scl, 0, sizeof(*scl)); @@ -280,28 +341,8 @@ /* AMR (HR/FR version 3) is the only codec that requires a codec * configuration (S0-S15). Determine the current configuration and update * the cfg flag. */ - if (msc->audio_support[i]->ver == 3) { - - /* First lookup the BTS specific AMR rate configuration. Thsi config - * is set via the VTY for each BTS individually. In cases where no - * configuration is set we will assume a safe default */ - if (msc->audio_support[i]->hr) { - amr_cfg_bts = (struct gsm48_multi_rate_conf *)&bts->mr_half.gsm48_ie; - amr_s15_s0_bts = gsm0808_sc_cfg_from_gsm48_mr_cfg(amr_cfg_bts, false); - } else { - amr_cfg_bts = (struct gsm48_multi_rate_conf *)&bts->mr_full.gsm48_ie; - amr_s15_s0_bts = gsm0808_sc_cfg_from_gsm48_mr_cfg(amr_cfg_bts, true); - } - - /* At next, lookup the AMR rate configuration that is set for the MSC */ - amr_cfg_msc = &msc->amr_conf; - amr_s15_s0_msc = gsm0808_sc_cfg_from_gsm48_mr_cfg(amr_cfg_msc, true); - - /* Calculate the intersection of the two configurations and update S0-S15 - * in the codec list. */ - amr_s15_s0 = amr_s15_s0_bts & amr_s15_s0_msc; - scl->codec[scl->len].cfg = amr_s15_s0; - } + if (msc->audio_support[i]->ver == 3) + scl->codec[scl->len].cfg = gen_bss_supported_amr_s15_s0(msc, bts, msc->audio_support[i]->hr); scl->len++; } diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 9d558bc..0ba5061 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -522,6 +522,7 @@ int match_idx; enum gsm48_chan_mode mode; bool full_rate; + uint16_t s15_s0; struct osmo_fsm_inst *fi; handover_fsm_alloc(conn); @@ -560,8 +561,7 @@ bts->nr, req->cell_id_target_name); /* Figure out channel type */ - if (match_codec_pref(&mode, &full_rate, &req->ct, &req->scl, msc->audio_support, - msc->audio_length, &bts->codec)) { + if (match_codec_pref(&mode, &full_rate, &s15_s0, &req->ct, &req->scl, msc, bts)) { LOG_HO(conn, LOGL_DEBUG, "BTS %u has no matching channel codec (%s, speech codec list len = %u)", bts->nr, gsm0808_channel_type_name(&req->ct), req->scl.len); @@ -606,6 +606,7 @@ .activ_for = FOR_HANDOVER, .for_conn = conn, .chan_mode = mode, + .s15_s0 = s15_s0, .requires_voice_stream = chan_mode_is_tch(mode), .msc_assigned_cic = req->msc_assigned_cic, }; diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index c80d8a1..4aaedde 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -425,11 +425,48 @@ }; } +/* Mask all rates instead of the highest possible */ +static void lchan_mr_config_mask(struct gsm48_multi_rate_conf *mr_conf) +{ + unsigned int i; + bool highest_seen = false; + uint8_t *_mr_conf = (uint8_t *) mr_conf; + + /* FIXME: At the moment we can not support multiple codec rates in one + * struct gsm48_multi_rate_conf, because the struct lacks the fields + * for Threshold and Hysteresis. Those fields are not needed when only + * a single codec rate is in place, but as soon as multiple codec + * rates are used the parameters are mandatory. The layout for the + * struct would then also be different because each rate needs its + * own Threshold and Hysteresis value. (See also 3GPP TS 04.08, + * chapter 10.5.2.21aa MultiRate configuration). + * + * Since we are unable to signal multiple codec rates properly, we just + * remove all codec rates from the active set, except the highest + * possible. Doing so we lack the functionality to switch towards the + * other, lower codec rates that were offered by the MSC, but it is + * still guaranteed that a rate is selected that is supported by all + * entities. + * + * To fix this problem, we should implement a proper encoder for + * struct gsm48_multi_rate_conf, in libosmocore and use it here. + * struct amr_mode already seems to have members for threshold and + * hysteresis we can use. */ + + for (i = 7; i > 0; i--) { + if (_mr_conf[1] & (1 << i) && highest_seen == false) { + highest_seen = true; + } else if (highest_seen) + _mr_conf[1] &= ~(1 << i); + } +} + static void lchan_fsm_unused(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct lchan_activate_info *info = data; struct gsm_lchan *lchan = lchan_fi_lchan(fi); struct gsm_bts *bts = lchan->ts->trx->bts; + struct gsm48_multi_rate_conf mr_conf; switch (event) { @@ -469,8 +506,12 @@ * - TA is still zero, to be determined by RACH. */ } - if (info->chan_mode == GSM48_CMODE_SPEECH_AMR) - lchan_mr_config(lchan, &info->for_conn->sccp.msc->amr_conf); + if (info->chan_mode == GSM48_CMODE_SPEECH_AMR) { + gsm48_mr_cfg_from_gsm0808_sc_cfg(&mr_conf, info->s15_s0); + /* FIXME: See above. */ + lchan_mr_config_mask(&mr_conf); + lchan_mr_config(lchan, &mr_conf); + } switch (info->chan_mode) { diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 97daa5c..537b851 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -603,6 +603,7 @@ uint16_t cic = 0; enum gsm48_chan_mode chan_mode = GSM48_CMODE_SIGN; bool full_rate = false; + uint16_t s15_s0 = 0; bool aoip = false; struct sockaddr_storage rtp_addr; struct gsm0808_channel_type ct; @@ -706,9 +707,8 @@ /* Match codec information from the assignment command against the * local preferences of the BSC and BTS */ - rc = match_codec_pref(&chan_mode, &full_rate, &ct, &conn->codec_list, - msc->audio_support, msc->audio_length, - &conn_get_bts(conn)->codec); + rc = match_codec_pref(&chan_mode, &full_rate, &s15_s0, &ct, &conn->codec_list, + msc, conn_get_bts(conn)); if (rc < 0) { LOGP(DMSC, LOGL_ERROR, "No supported audio type found for channel_type =" " { ch_indctr=0x%x, ch_rate_type=0x%x, perm_spch=[ %s] }\n", @@ -730,6 +730,7 @@ .msc_assigned_cic = cic, .chan_mode = chan_mode, .full_rate = full_rate, + .s15_s0 = s15_s0 }; if (aoip) { unsigned int rc = osmo_sockaddr_to_str_and_uint(req.msc_rtp_addr, diff --git a/tests/codec_pref/codec_pref_test.c b/tests/codec_pref/codec_pref_test.c index 20e3525..e2876e2 100644 --- a/tests/codec_pref/codec_pref_test.c +++ b/tests/codec_pref/codec_pref_test.c @@ -374,6 +374,7 @@ unsigned int i; bool full_rate; enum gsm48_chan_mode chan_mode; + uint16_t s15_s0; printf("Determining channel mode and rate:\n"); @@ -398,8 +399,9 @@ printf(" codec->efr=%u\n", bts->codec.efr); printf(" codec->amr=%u\n", bts->codec.amr); - rc = match_codec_pref(&chan_mode, &full_rate, ct, scl, msc->audio_support, msc->audio_length, &bts->codec); - printf(" * result: rc=%i, full_rate=%i, chan_mode=%s\n", rc, full_rate, gsm48_chan_mode_name(chan_mode)); + rc = match_codec_pref(&chan_mode, &full_rate, &s15_s0, ct, scl, msc, bts); + printf(" * result: rc=%i, full_rate=%i, s15_s0=%04x, chan_mode=%s\n", + rc, full_rate, s15_s0, gsm48_chan_mode_name(chan_mode)); printf("\n"); diff --git a/tests/codec_pref/codec_pref_test.ok b/tests/codec_pref/codec_pref_test.ok index befc497..16d86ba 100644 --- a/tests/codec_pref/codec_pref_test.ok +++ b/tests/codec_pref/codec_pref_test.ok @@ -12,7 +12,7 @@ codec->hr=0 codec->efr=0 codec->amr=0 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (1 items): @@ -26,7 +26,7 @@ codec->hr=1 codec->efr=0 codec->amr=0 - * result: rc=0, full_rate=0, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=0, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (1 items): @@ -40,7 +40,7 @@ codec->hr=0 codec->efr=1 codec->amr=0 - * result: rc=0, full_rate=1, chan_mode=SPEECH_EFR + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_EFR Determining channel mode and rate: * MS: speech codec list (1 items): @@ -54,7 +54,7 @@ codec->hr=0 codec->efr=0 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_AMR + * result: rc=0, full_rate=1, s15_s0=57ff, chan_mode=SPEECH_AMR Determining channel mode and rate: * MS: speech codec list (1 items): @@ -68,7 +68,7 @@ codec->hr=0 codec->efr=0 codec->amr=1 - * result: rc=0, full_rate=0, chan_mode=SPEECH_AMR + * result: rc=0, full_rate=0, s15_s0=073f, chan_mode=SPEECH_AMR Determining channel mode and rate: * MS: speech codec list (2 items): @@ -85,7 +85,7 @@ codec->hr=1 codec->efr=0 codec->amr=0 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (3 items): @@ -105,7 +105,7 @@ codec->hr=1 codec->efr=1 codec->amr=0 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (3 items): @@ -125,7 +125,7 @@ codec->hr=0 codec->efr=0 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (5 items): @@ -151,7 +151,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 ============== test_ms ============== @@ -175,7 +175,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (1 items): @@ -197,7 +197,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=0, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=0, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (1 items): @@ -219,7 +219,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_EFR + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_EFR Determining channel mode and rate: * MS: speech codec list (1 items): @@ -241,7 +241,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_AMR + * result: rc=0, full_rate=1, s15_s0=57ff, chan_mode=SPEECH_AMR Determining channel mode and rate: * MS: speech codec list (1 items): @@ -263,7 +263,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=0, chan_mode=SPEECH_AMR + * result: rc=0, full_rate=0, s15_s0=073f, chan_mode=SPEECH_AMR Determining channel mode and rate: * MS: speech codec list (2 items): @@ -286,7 +286,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (3 items): @@ -310,7 +310,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (3 items): @@ -334,7 +334,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (5 items): @@ -360,7 +360,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 ============== test_ct ============== @@ -384,7 +384,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (5 items): @@ -406,7 +406,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=0, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=0, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (5 items): @@ -428,7 +428,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_EFR + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_EFR Determining channel mode and rate: * MS: speech codec list (5 items): @@ -450,7 +450,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_AMR + * result: rc=0, full_rate=1, s15_s0=57ff, chan_mode=SPEECH_AMR Determining channel mode and rate: * MS: speech codec list (5 items): @@ -472,7 +472,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=0, chan_mode=SPEECH_AMR + * result: rc=0, full_rate=0, s15_s0=073f, chan_mode=SPEECH_AMR Determining channel mode and rate: * MS: speech codec list (5 items): @@ -495,7 +495,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (5 items): @@ -519,7 +519,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (5 items): @@ -543,7 +543,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (5 items): @@ -569,7 +569,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 ============== test_msc ============== @@ -597,7 +597,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (5 items): @@ -623,7 +623,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (5 items): @@ -649,7 +649,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (5 items): @@ -675,7 +675,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (5 items): @@ -701,7 +701,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (5 items): @@ -727,7 +727,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (5 items): @@ -753,7 +753,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (5 items): @@ -779,7 +779,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (5 items): @@ -805,7 +805,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 ============== test_selected_working ============== @@ -826,7 +826,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (1 items): @@ -843,7 +843,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (1 items): @@ -860,7 +860,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=0, full_rate=0, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=0, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (3 items): @@ -879,7 +879,7 @@ codec->hr=0 codec->efr=0 codec->amr=1 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (1 items): @@ -896,7 +896,7 @@ codec->hr=0 codec->efr=1 codec->amr=0 - * result: rc=0, full_rate=1, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=1, s15_s0=0000, chan_mode=SPEECH_V1 Determining channel mode and rate: * MS: speech codec list (1 items): @@ -913,7 +913,7 @@ codec->hr=1 codec->efr=0 codec->amr=0 - * result: rc=0, full_rate=0, chan_mode=SPEECH_V1 + * result: rc=0, full_rate=0, s15_s0=0000, chan_mode=SPEECH_V1 ============== test_selected_non_working ============== @@ -932,7 +932,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=-1, full_rate=0, chan_mode=SIGNALLING + * result: rc=-1, full_rate=0, s15_s0=0000, chan_mode=SIGNALLING Determining channel mode and rate: * MS: speech codec list (1 items): @@ -949,7 +949,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=-1, full_rate=0, chan_mode=SIGNALLING + * result: rc=-1, full_rate=0, s15_s0=0000, chan_mode=SIGNALLING Determining channel mode and rate: * MS: speech codec list (1 items): @@ -965,7 +965,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=-1, full_rate=0, chan_mode=SIGNALLING + * result: rc=-1, full_rate=0, s15_s0=0000, chan_mode=SIGNALLING Determining channel mode and rate: * MS: speech codec list (1 items): @@ -981,7 +981,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=-1, full_rate=0, chan_mode=SIGNALLING + * result: rc=-1, full_rate=0, s15_s0=0000, chan_mode=SIGNALLING Determining channel mode and rate: * MS: speech codec list (1 items): @@ -996,7 +996,7 @@ codec->hr=1 codec->efr=1 codec->amr=1 - * result: rc=-1, full_rate=0, chan_mode=SIGNALLING + * result: rc=-1, full_rate=0, s15_s0=0000, chan_mode=SIGNALLING Determining channel mode and rate: * MS: speech codec list (5 items): @@ -1016,7 +1016,7 @@ codec->hr=0 codec->efr=0 codec->amr=1 - * result: rc=-1, full_rate=0, chan_mode=SIGNALLING + * result: rc=-1, full_rate=0, s15_s0=0000, chan_mode=SIGNALLING ============== test_gen_bss_supp_codec_list_cfgs ============== -- To view, visit https://gerrit.osmocom.org/11060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Gerrit-Change-Number: 11060 Gerrit-PatchSet: 10 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 08:41:28 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 5 Oct 2018 08:41:28 +0000 Subject: Change in osmo-bsc[master]: gsm_08_08: abort complete L3 3 msg gen when no codecs are set Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11236 Change subject: gsm_08_08: abort complete L3 3 msg gen when no codecs are set ...................................................................... gsm_08_08: abort complete L3 3 msg gen when no codecs are set The COMPLETE LAYER 3 INFORMATION message should contain a Codec List (BSS Supported) IE. The contents of this list depend on the BTS capabilities and of the MSC configuration (allowed codecs). There may be cases where (due to miss-configuration) the list is empty. In those cases the BSC hits an assertion because the encoding of the overall message fails when the codec list is empty. A check is needed. - Check codec list before message generation, abort if the coded list is empty. Change-Id: I119607047a132b75b3077bbe56c97936d8ae6c96 Related: OS#3625 --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/36/11236/1 diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 807eb8c..15edb0c 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -495,7 +495,12 @@ if (gscon_is_aoip(conn)) { gen_bss_supported_codec_list(&scl, msc, conn_get_bts(conn)); - resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), &scl); + if (scl.len > 0) + resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), &scl); + else { + LOGP(DMSC, LOGL_DEBUG, "Failed to create layer3 message due to empty speech codec list.\n"); + return false; + } } else resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), NULL); -- To view, visit https://gerrit.osmocom.org/11236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I119607047a132b75b3077bbe56c97936d8ae6c96 Gerrit-Change-Number: 11236 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 08:41:28 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 5 Oct 2018 08:41:28 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_msc: Set reasonable codec list defaults Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11237 Change subject: osmo_bsc_msc: Set reasonable codec list defaults ...................................................................... osmo_bsc_msc: Set reasonable codec list defaults When the user sets no codec-list in the msc node, the configuration will end up with an empty codec list. This is a useless configuration. There should be a sane default setting. - Set fr1 as default for codec-list as it is the smallest possible denominator. Change-Id: I3749a65828c788f38c22f0a5314533f4516da3ed Related: OS#3625 --- M src/osmo-bsc/osmo_bsc_msc.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/37/11237/1 diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index e00c9ef..03951d2 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -94,6 +94,12 @@ /* Defaults for the audio setup */ msc_data->amr_conf.m5_90 = 1; + /* Set GSM-FR as default for the codec list */ + msc_data->audio_support = talloc_zero_array(msc_data, struct gsm_audio_support*, 1); + msc_data->audio_length = 1; + msc_data->audio_support[0] = talloc_zero(msc_data->audio_support, struct gsm_audio_support); + msc_data->audio_support[0]->ver = 1; + return msc_data; } -- To view, visit https://gerrit.osmocom.org/11237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3749a65828c788f38c22f0a5314533f4516da3ed Gerrit-Change-Number: 11237 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 09:36:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 09:36:37 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_msc: Set reasonable codec list defaults In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11237 ) Change subject: osmo_bsc_msc: Set reasonable codec list defaults ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/11237/1/src/osmo-bsc/osmo_bsc_msc.c File src/osmo-bsc/osmo_bsc_msc.c: https://gerrit.osmocom.org/#/c/11237/1/src/osmo-bsc/osmo_bsc_msc.c at 97 PS1, Line 97: Set GSM-FR as default for the codec list Why not enable all codecs by default? I think that's the "most compatible", isn't it? The MSC can request any subset of that in the ASSIGNMENT CMD. What advantage does restricting it to FR1 have? https://gerrit.osmocom.org/#/c/11237/1/src/osmo-bsc/osmo_bsc_msc.c at 100 PS1, Line 100: msc_data->audio_support[0] = talloc_zero(msc_data->audio_support, struct gsm_audio_support); whitespace problems -- To view, visit https://gerrit.osmocom.org/11237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3749a65828c788f38c22f0a5314533f4516da3ed Gerrit-Change-Number: 11237 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 05 Oct 2018 09:36:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 09:40:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 09:40:05 +0000 Subject: Change in osmo-bsc[master]: gsm_08_08: abort complete L3 3 msg gen when no codecs are set In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11236 ) Change subject: gsm_08_08: abort complete L3 3 msg gen when no codecs are set ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11236/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11236/1//COMMIT_MSG at 12 PS1, Line 12: due to miss-configuration I think there's something seriously wrong with osmo-bsc, if such "mis-configuration" can happen https://gerrit.osmocom.org/#/c/11236/1/src/osmo-bsc/gsm_08_08.c File src/osmo-bsc/gsm_08_08.c: https://gerrit.osmocom.org/#/c/11236/1/src/osmo-bsc/gsm_08_08.c at 501 PS1, Line 501: LOGL_DEBUG debug for something that will effectively make any voice call fail? I think we should definitely have this at NOTICE if not ERROR level. Also, the best is if we don't even allow the user to shoot himself into the foot, i.e. do whatever is needed to avoid being able to create such invalid configurations in the first place. So for sure, we should not permit an empty codec supprt list to be created from the VTY in the MSC section. I guess the only remainig case here is that the BTS supported list (like hard-coded for nanoBTS with no HRv1) doesn't have any intersection with the list specified for the "msc" node in the VTY? Maybe in that case also already print an error message after reading the config file? Or while reading it? Intersect the "msc" codecs with those of each BTS, and print a big fat warning/error message if for any BTS there's no intersection? -- To view, visit https://gerrit.osmocom.org/11236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I119607047a132b75b3077bbe56c97936d8ae6c96 Gerrit-Change-Number: 11236 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 05 Oct 2018 09:40:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 09:59:38 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 5 Oct 2018 09:59:38 +0000 Subject: Change in osmo-sip-connector[master]: vty: make 'show calls summary' more userfriendly Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11238 Change subject: vty: make 'show calls summary' more userfriendly ...................................................................... vty: make 'show calls summary' more userfriendly Display a table with one row per call (instead of two lines per call), and display the phone numbers of the people making the calls instead of internal IDs. This should make the VTY command friendlier for end users, especially if they have bigger networks. There is still the 'show calls' command with all the verbose output. Example output: OsmoSIPcon> show calls summary No active calls. OsmoSIPcon> show calls summary ID | From | To | State 5003 | 101 | 100 | PROCEEDING OsmoSIPcon> show calls summary ID | From | To | State 5003 | 101 | 100 | CONNECTED Change-Id: I2092d58d80a34e6083f618593b92bb9e838aa906 --- M src/vty.c 1 file changed, 26 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/38/11238/1 diff --git a/src/vty.c b/src/vty.c index 540e2de..eb236b4 100644 --- a/src/vty.c +++ b/src/vty.c @@ -256,39 +256,34 @@ "show calls summary", SHOW_STR "Current calls\nBrief overview\n") { - struct call *call; - - llist_for_each_entry(call, &g_call_list, entry) { - char *initial_type, *initial_state; - char *remote_type, *remote_state; - - initial_type = initial_state = NULL; - remote_type = remote_state = NULL; - - if (call->initial) { - initial_type = talloc_strdup(tall_mncc_ctx, - call_leg_type(call->initial)); - initial_state = talloc_strdup(tall_mncc_ctx, - call_leg_state(call->initial)); - } - - if (call->remote) { - remote_type = talloc_strdup(tall_mncc_ctx, - call_leg_type(call->remote)); - remote_state = talloc_strdup(tall_mncc_ctx, - call_leg_state(call->remote)); - } - - vty_out(vty, "Call(%u) initial(type=%s,state=%s) remote(type=%s,state=%s)%s", - call->id, initial_type, initial_state, remote_type, remote_state, - VTY_NEWLINE); - - talloc_free(initial_type); - talloc_free(initial_state); - talloc_free(remote_type); - talloc_free(remote_state); + /* don't print a table for zero active calls */ + if(llist_empty(&g_call_list)) { + vty_out(vty, "No active calls.%s", VTY_NEWLINE); + return CMD_SUCCESS; } + /* table head */ + vty_out(vty, "ID | From | To | State%s", VTY_NEWLINE); + + /* iterate over calls */ + struct call *call; + llist_for_each_entry(call, &g_call_list, entry) { + /* only look at the initial=MNCC call */ + if(call->initial->type == CALL_TYPE_MNCC) { + struct mncc_call_leg *leg = (struct mncc_call_leg *) call->initial; + + /* table row */ + char *called = talloc_strdup(tall_mncc_ctx, leg->called.number); + char *calling = talloc_strdup(tall_mncc_ctx, leg->calling.number); + char *state = talloc_strdup(tall_mncc_ctx, call_leg_state(call->initial)); + vty_out(vty, "%u | %s | %s | %s%s", call->id, calling, called, state, VTY_NEWLINE); + + /* clean up */ + talloc_free(called); + talloc_free(calling); + talloc_free(state); + } + } return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/11238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2092d58d80a34e6083f618593b92bb9e838aa906 Gerrit-Change-Number: 11238 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 10:03:26 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 5 Oct 2018 10:03:26 +0000 Subject: Change in osmo-sip-connector[master]: vty: make 'show calls summary' more userfriendly In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11238 to look at the new patch set (#2). Change subject: vty: make 'show calls summary' more userfriendly ...................................................................... vty: make 'show calls summary' more userfriendly Display a table with one row per call (instead of two lines per call), and display the phone numbers of the people making the calls instead of internal IDs. This should make the VTY command friendlier for end users, especially if they have bigger networks. There is still the 'show calls' command with all the verbose output. Example output: OsmoSIPcon> show calls summary No active calls. OsmoSIPcon> show calls summary ID | From | To | State 5003 | 101 | 100 | PROCEEDING OsmoSIPcon> show calls summary ID | From | To | State 5003 | 101 | 100 | CONNECTED Relates: OS#1680 Change-Id: I2092d58d80a34e6083f618593b92bb9e838aa906 --- M src/vty.c 1 file changed, 26 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/38/11238/2 -- To view, visit https://gerrit.osmocom.org/11238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2092d58d80a34e6083f618593b92bb9e838aa906 Gerrit-Change-Number: 11238 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 10:05:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 5 Oct 2018 10:05:04 +0000 Subject: Change in osmo-ci[master]: limesuite WIP Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11239 Change subject: limesuite WIP ...................................................................... limesuite WIP Change-Id: I786c6f4ad4b4e43d1692c1588d2ad2194d0b25a4 --- M scripts/osmocom-latest-packages.sh 1 file changed, 109 insertions(+), 54 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/39/11239/1 diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index ac5a2dd..f983d05 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -4,55 +4,87 @@ # apt install git-buildpackage osc git set -e +set -x # OBS project name PROJ=network:osmocom:latest DT=$(date +%Y%m%d) TOP=$(pwd) +DEBSRCDIR="$TOP/debsrc" if ! which osc >/dev/null 2>/dev/null ; then echo "osc binary not found" exit 1 fi -# start with a checkout of the project -if [ -d $PROJ ]; then - (cd $PROJ && osc up) -else - osc co $PROJ -fi +prepare() { + # start with a checkout of the project + if [ -d $PROJ ]; then + (cd $PROJ && osc up) + else + osc co $PROJ + fi + [ -d "$DEBSRCDIR" ] && rm -rf "$DEBSRCDIR" + mkdir "$DEBSRCDIR" +} + +get_last_tag() { + project="$1" + if [ "$project" = "limesuite" ]; then + ver_regexp="^v[0-9]*.[0-9]*.[0-9]*$" + else + ver_regexp="^[0-9]*.[0-9]*.[0-9]*$" + fi + VER=$(git -C "${TOP}/${project}" tag -l --sort=v:refname | grep "$ver_regexp" | tail -n 1) + echo "${VER}" +} + +checkout() { + project=$1 + gitbpargs="" + echo + echo "====> Checking out $project" + cd "$TOP" + if [ "$project" = "limesuite" ]; then + [ -d "$project" ] || git clone "https://github.com/myriadrf/LimeSuite" "$project" + else + [ -d "$project" ] || git clone "git://git.osmocom.org/$project" + fi + cd "$project" + git fetch + VER=$(get_last_tag "$project") + git checkout -f -B "$VER" "refs/tags/$VER" +} build() { project=$1 - output=$2 + gitbpargs="$2" + output="$DEBSRCDIR/$project" echo echo "====> Building $project" - cd "$TOP" - [ -d "$1" ] || git clone "git://git.osmocom.org/$1" - cd "$1" - git fetch - VER=$(git tag -l --sort=v:refname | grep "^[0-9]*.[0-9]*.[0-9]*$" | tail -n 1) + cd "$TOP/$project" + VER=$(get_last_tag "$project") git checkout -f -B "$VER" "refs/tags/$VER" if [ -x ./git-version-gen ]; then ./git-version-gen . > .tarball-version 2>/dev/null gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$output" \ - "--git-debian-branch=$VER" --git-ignore-new \ + "--git-debian-branch=$VER" --git-ignore-new $gitbpargs \ --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/' else gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$output" \ - "--git-debian-branch=$VER" --git-ignore-new + "--git-debian-branch=$VER" --git-ignore-new $gitbpargs fi - if [ ! -d "$TOP/$PROJ/$1" ] ; then + if [ ! -d "$TOP/$PROJ/$project" ] ; then # creating a new package is different from using old ones - mkdir "$TOP/$PROJ/$1" - mv "$output/"*.dsc "$TOP/$PROJ/$1/" - mv "$output/"*.tar* "$TOP/$PROJ/$1/" + mkdir "$TOP/$PROJ/$project" + mv "$output/"*.dsc "$TOP/$PROJ/$project/" + mv "$output/"*.tar* "$TOP/$PROJ/$project/" cd "$TOP/$PROJ" - osc add "$1" + osc add "$project" else - cd "$TOP/$PROJ/$1" + cd "$TOP/$PROJ/$project" # update OBS only if the filename doesn't match file=$(cd "$output/" ; ls ./*.dsc) @@ -66,40 +98,63 @@ cd "$TOP" } -PACKAGES=" - libosmocore - libosmo-sccp - libosmo-abis - libosmo-netif - libsmpp34 - libasn1c - libgtpnl - libusrp - osmo-iuh - osmo-ggsn - osmo-sgsn - openbsc - osmo-pcap - osmo-trx - osmo-sip-connector - osmo-bts - osmo-pcu - osmo-hlr - osmo-mgw - osmo-msc - osmo-bsc - simtrace2 - " -# add those two once they have tagged any versions that include the 'debian' sub-dir - #rtl-sdr - #osmo-fl2k +# add those two once they have tagged any versions that include the 'debian' sub-dir: +#rtl-sdr +#osmo-fl2k -[ -d "$TOP/debsrc" ] && rm -rf "$TOP/debsrc" -mkdir "$TOP/debsrc" +build_osmocom() { + prepare -for p in $PACKAGES; do - build "$p" "$TOP/debsrc/$p" -done + checkout limesuite + checkout libosmocore + checkout libosmo-sccp + checkout libosmo-abis + checkout libosmo-netif + checkout libsmpp34 + checkout libasn1c + checkout libgtpnl + checkout libusrp + checkout osmo-iuh + checkout osmo-ggsn + checkout osmo-sgsn + checkout openbsc + checkout osmo-pcap + checkout osmo-trx + checkout osmo-sip-connector + checkout osmo-bts + checkout osmo-pcu + checkout osmo-hlr + checkout osmo-mgw + checkout osmo-msc + checkout osmo-bsc + checkout simtrace2 -cd "$TOP/$PROJ" -osc ci -m "Latest Tagged versions of $DT" + build limesuite --git-upstream-tree="$(get_last_tag limesuite)" + build libosmocore + build libosmo-sccp + build libosmo-abis + build libosmo-netif + build libsmpp34 + build libasn1c + build libgtpnl + build libusrp + build osmo-iuh + build osmo-ggsn + build osmo-sgsn + build openbsc + build osmo-pcap + build osmo-trx + build osmo-sip-connector + build osmo-bts + build osmo-pcu + build osmo-hlr + build osmo-mgw + build osmo-msc + build osmo-bsc + build simtrace2 + + cd "$TOP/$PROJ" + osc ci -m "Latest Tagged versions of $DT" +} + +build_osmocom -- To view, visit https://gerrit.osmocom.org/11239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I786c6f4ad4b4e43d1692c1588d2ad2194d0b25a4 Gerrit-Change-Number: 11239 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 10:08:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 5 Oct 2018 10:08:26 +0000 Subject: Change in osmo-ci[master]: osmocom-latest-packages.sh: Refactor to support building limesuite In-Reply-To: References: Message-ID: Pau Espin Pedrol has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11239 ) Change subject: osmocom-latest-packages.sh: Refactor to support building limesuite ...................................................................... osmocom-latest-packages.sh: Refactor to support building limesuite This way the latest script is a lot more similar to the nightly one, and easier to maintain and expand with new features. checkout and build steps are split because once we have a new osmo-trx release, we'll need the create_osmo_trx_debian8_jessie trick to build it. In the future we can do further steps to have a common function lib between latest and nightly scripts. Change-Id: I786c6f4ad4b4e43d1692c1588d2ad2194d0b25a4 --- M scripts/osmocom-latest-packages.sh 1 file changed, 109 insertions(+), 54 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/39/11239/2 -- To view, visit https://gerrit.osmocom.org/11239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I786c6f4ad4b4e43d1692c1588d2ad2194d0b25a4 Gerrit-Change-Number: 11239 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 10:43:37 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 5 Oct 2018 10:43:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: Make sure COMPLETE LAYER 3 INFORMATION contain... In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/10966 ) Change subject: MSC_ConnectionHandler: Make sure COMPLETE LAYER 3 INFORMATION contains a codecList ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia16a454e78421430ec32cc37939d429970cb06ec Gerrit-Change-Number: 10966 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 05 Oct 2018 10:43:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 10:55:08 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 5 Oct 2018 10:55:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: use consistant AMR S0-S15 bits In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/11131 ) Change subject: BSC_Tests: use consistant AMR S0-S15 bits ...................................................................... BSC_Tests: use consistant AMR S0-S15 bits At the moment we use the default S0-S15 bits for the AMR config, regardless what RSL_IE_Body mr_conf or osmo-bsc.cfg sets. - Make sure consistant S0-S15 bits are used for AMR related tests. This is a re-submit of change I794e6d4fe8abc67337428cbe0bcc8802fae37a6e, which had to be reverted because the depending patch in osmo-bsc is not yet merged into master. This caused TC_assignment_codec_amr_f and TC_assignment_codec_amr_h to fail. Change-Id: Ia98f18ba2c17c85ed01488734dc6df67f5b60d41 Depends: osmo-bsc: I2d8ded51b3eb4c003fe2da6f2d6f48d001b73737 Related: OS#3529 --- M bsc/BSC_Tests.ttcn 1 file changed, 16 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 25df52d..4a34310 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1923,6 +1923,10 @@ testcase TC_assignment_codec_amr_f() runs on test_CT { var TestHdlrParams pars := valueof(t_def_TestHdlrPars); var MSC_ConnHdlr vc_conn; + + /* Note: This setups the codec configuration. The parameter payload in + * mr_conf must be consistant with the parameter codecElements in pars + * and also must match the amr-config in osmo-bsc.cfg! */ var RSL_IE_Body mr_conf := { other := { len := 2, @@ -1930,11 +1934,14 @@ } }; + pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_F})); + pars.ass_codec_list.codecElements[0].s0_7 := '00000110'B; + pars.ass_codec_list.codecElements[0].s8_15 := '01010111'B; + pars.expect_mr_conf_ie := mr_conf; + f_init(1, true); f_sleep(1.0); - pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_F})); - pars.expect_mr_conf_ie := mr_conf; vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } @@ -1942,6 +1949,8 @@ testcase TC_assignment_codec_amr_h() runs on test_CT { var TestHdlrParams pars := valueof(t_def_TestHdlrPars); var MSC_ConnHdlr vc_conn; + + /* See note above */ var RSL_IE_Body mr_conf := { other := { len := 2, @@ -1949,11 +1958,14 @@ } }; + pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_H})); + pars.ass_codec_list.codecElements[0].s0_7 := '00000110'B; + pars.ass_codec_list.codecElements[0].s8_15 := '00000111'B; + pars.expect_mr_conf_ie := mr_conf; + f_init(1, true); f_sleep(1.0); - pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_H})); - pars.expect_mr_conf_ie := mr_conf; vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } -- To view, visit https://gerrit.osmocom.org/11131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia98f18ba2c17c85ed01488734dc6df67f5b60d41 Gerrit-Change-Number: 11131 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:13:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 11:13:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: add 'lazy' mode for as_meas_res() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11226 ) Change subject: BTS_Tests.ttcn: add 'lazy' mode for as_meas_res() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I39118d6e64c767fad2c9618ec0ef4532dc60e715 Gerrit-Change-Number: 11226 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 05 Oct 2018 11:13:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:14:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 11:14:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly detect Measurement Reports In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11224 ) Change subject: BTS_Tests.ttcn: fix: properly detect Measurement Reports ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iea5ee868ede8bfe1e2b1cbf5abcbf2844d3fe9a4 Gerrit-Change-Number: 11224 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 05 Oct 2018 11:14:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:14:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 11:14:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: expect RSL_MEAS_RES messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11227 ) Change subject: BTS_Tests.ttcn: fix: expect RSL_MEAS_RES messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I34227b981f76377c338fad4ff9560ba2042abce4 Gerrit-Change-Number: 11227 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 05 Oct 2018 11:14:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:14:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 11:14:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: add 'lazy' mode for as_meas_res() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11226 ) Change subject: BTS_Tests.ttcn: add 'lazy' mode for as_meas_res() ...................................................................... BTS_Tests.ttcn: add 'lazy' mode for as_meas_res() This mode would be useful for test cases, which expect to receive the RSL_MEAS_RES messages, but don't care about their correctness. Change-Id: I39118d6e64c767fad2c9618ec0ef4532dc60e715 --- M bts/BTS_Tests.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index fe59fd3..9c749b4 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1296,8 +1296,9 @@ } /* verify we regularly receive measurement reports with incrementing numbers */ -altstep as_meas_res() runs on ConnHdlr { +altstep as_meas_res(boolean verify_meas := true) runs on ConnHdlr { var RSL_Message rsl; + [not verify_meas] RSL.receive(tr_RSL_MEAS_RES(?)) { repeat; } [] RSL.receive(f_build_meas_res_tmpl()) -> value rsl { /* increment counter of next to-be-expected meas rep */ g_next_meas_res_nr := (g_next_meas_res_nr + 1) mod 256; -- To view, visit https://gerrit.osmocom.org/11226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I39118d6e64c767fad2c9618ec0ef4532dc60e715 Gerrit-Change-Number: 11226 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:14:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 11:14:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: properly detect Measurement Reports In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11224 ) Change subject: BTS_Tests.ttcn: fix: properly detect Measurement Reports ...................................................................... BTS_Tests.ttcn: fix: properly detect Measurement Reports The altstep for detecting Measurement Results, that was introduced in I15782ec93d68a0dc54b2ed7a84cb70d780ba0ce1, was implemented in a wrong way. Basically, the DL Measurement Reports (coming from the MS) are being combined with the UL measurements, and then being send as a RSL_MEAS_RES message, not RSL_INITDATA_IND. Let's use the existing as_meas_res() in 'lazy' mode for that. Change-Id: Iea5ee868ede8bfe1e2b1cbf5abcbf2844d3fe9a4 --- M bts/BTS_Tests.ttcn 1 file changed, 2 insertions(+), 10 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 9c749b4..f89025f 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3735,14 +3735,6 @@ } } -/* Expect (or not expect) SACCH messages (Measurement Reports) */ -private altstep as_rsl_sacch_ind(boolean exp_sacch) runs on ConnHdlr { - [exp_sacch] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) { repeat; } - [not exp_sacch] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) { - setverdict(fail, "Unexpected (SACCH) UNIT_DATA_IND message!"); - mtc.stop; - } -} /* Expect (or not expect) other kinds of messages */ private altstep as_rsl_any_ind(boolean exp_any) runs on ConnHdlr { [exp_any] RSL.receive { repeat; } @@ -3767,7 +3759,7 @@ [] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, link_id, l3)) { setverdict(pass); } - [] as_rsl_sacch_ind(exp_sacch); + [exp_sacch] as_meas_res(verify_meas := false); [] as_rsl_any_ind(exp_any); [] T.timeout { setverdict(fail, "Timeout waiting for UNIT_DATA_IND"); @@ -3792,7 +3784,7 @@ [] RSL.receive(tr_RSL_DATA_IND(g_chan_nr, link_id, l3)) { setverdict(pass); } - [] as_rsl_sacch_ind(exp_sacch); + [exp_sacch] as_meas_res(verify_meas := false); [] as_rsl_any_ind(exp_any); [] T.timeout { setverdict(fail, "Timeout waiting for DATA_IND"); -- To view, visit https://gerrit.osmocom.org/11224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iea5ee868ede8bfe1e2b1cbf5abcbf2844d3fe9a4 Gerrit-Change-Number: 11224 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:14:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 11:14:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: expect RSL_MEAS_RES messages In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11227 ) Change subject: BTS_Tests.ttcn: fix: expect RSL_MEAS_RES messages ...................................................................... BTS_Tests.ttcn: fix: expect RSL_MEAS_RES messages Since both Calypso PHY and trxcon (since OS#2988 is fixed) are always sending the Measurement Reports in dedicated mode, the test cases should expect to 'see' the RSL_MEAS_RES messages, and ignore them if they are out of the testing scope. This change makes the following test cases pass: - TC_rll_est_ind, - TC_rll_rel_ind_DCCH_0, - TC_rll_rel_ind_DCCH_3, - TC_rll_rel_ind_ACCH_0, - TC_rll_rel_ind_ACCH_3, by adding the 'lazy' version of as_meas_res() alt-step. Change-Id: I34227b981f76377c338fad4ff9560ba2042abce4 --- M bts/BTS_Tests.ttcn 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index f89025f..61fe1a7 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3396,6 +3396,8 @@ mtc.stop; } } + /* We also expect to receive the measurements */ + [] as_meas_res(verify_meas := false); [tc.exp] T.timeout { setverdict(fail, "Timeout waiting for EST IND"); mtc.stop; @@ -3560,6 +3562,8 @@ [] RSL.receive(tr_RSL_REL_IND(g_chan_nr, tc.link_id)) { setverdict(pass); } + /* We also expect to receive the measurements */ + [] as_meas_res(verify_meas := false); } /* release the channel */ -- To view, visit https://gerrit.osmocom.org/11227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I34227b981f76377c338fad4ff9560ba2042abce4 Gerrit-Change-Number: 11227 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:15:19 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 5 Oct 2018 11:15:19 +0000 Subject: Change in pysim[master]: pySim-prog: Honor international '+' in SMSC number In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11201 to look at the new patch set (#2). Change subject: pySim-prog: Honor international '+' in SMSC number ...................................................................... pySim-prog: Honor international '+' in SMSC number The smsc no. programmed by pySim-prog would always be a national number in the past. Check whether the first 'digit' is a + and indicate that it is an international number. Change-Id: Ia79913f5b0307e9786a5acea75c0811927be2eef --- M pySim-prog.py 1 file changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/01/11201/2 -- To view, visit https://gerrit.osmocom.org/11201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia79913f5b0307e9786a5acea75c0811927be2eef Gerrit-Change-Number: 11201 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:15:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 11:15:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: Make sure COMPLETE LAYER 3 INFORMATION contain... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10966 ) Change subject: MSC_ConnectionHandler: Make sure COMPLETE LAYER 3 INFORMATION contains a codecList ...................................................................... MSC_ConnectionHandler: Make sure COMPLETE LAYER 3 INFORMATION contains a codecList Since our BSC implementation supports AoIP, the COMPLETE LAYER 3 INFORMATION message must contan a Codec List (BSS Supported) information element. The test currently just receive a L3 compl Template and then continue. This is implemented without an altstep. So lets have an altstep with timeout here and make sure that the codecList information element is always included. However, since AoIP was specified after sccp-lite, we need to make sure that for sccp-lite configurations, the Codec List is not included. - Check L3 compl message using an alt-step - Make sure codecList is always included (for AoIP) Change-Id: Ia16a454e78421430ec32cc37939d429970cb06ec Related: OS#3548 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 24 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 0b11786..079cc74 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -829,6 +829,7 @@ var BSSMAP_FIELD_CodecType codecType; var boolean sccplite := false; + timer T := 10.0; /* Check if we run on SCCPLITE instead of SCCP by looking if a CIC is * present or not. */ @@ -851,7 +852,28 @@ f_create_chan_and_exp(); /* we should now have a COMPL_L3 at the MSC */ - BSSAP.receive(tr_BSSMAP_ComplL3); + + var template PDU_BSSAP exp_l3_compl; + exp_l3_compl := tr_BSSMAP_ComplL3() + if (sccplite) { + exp_l3_compl.pdu.bssmap.completeLayer3Information.codecList := omit; + } else { + exp_l3_compl.pdu.bssmap.completeLayer3Information.codecList := ?; + } + T.start; + alt { + [] BSSAP.receive(exp_l3_compl); + [] BSSAP.receive(tr_BSSMAP_ComplL3) { + setverdict(fail, "Received non-matching COMPLETE LAYER 3 INFORMATION"); + all component.stop; + mtc.stop; + } + [] T.timeout { + setverdict(fail, "Timeout waiting for COMPLETE LAYER 3 INFORMATION"); + all component.stop; + mtc.stop; + } + } /* start ciphering, if requested */ if (ispresent(g_pars.encr)) { @@ -865,10 +887,10 @@ var PDU_BSSAP ass_cmd := valueof(ass_tpl); var PDU_BSSAP bssap; - timer T := 10.0; var boolean exp_compl := ischosen(exp_ass_cpl.pdu.bssmap.assignmentComplete); var boolean exp_fail := ischosen(exp_ass_cpl.pdu.bssmap.assignmentFailure); var boolean exp_modify; + var ExpectCriteria mgcpcrit := { connid := omit, endpoint := omit, -- To view, visit https://gerrit.osmocom.org/10966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia16a454e78421430ec32cc37939d429970cb06ec Gerrit-Change-Number: 10966 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:16:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 11:16:34 +0000 Subject: Change in osmo-ci[master]: osmocom-latest-packages.sh: Refactor to support building limesuite In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11239 ) Change subject: osmocom-latest-packages.sh: Refactor to support building limesuite ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I786c6f4ad4b4e43d1692c1588d2ad2194d0b25a4 Gerrit-Change-Number: 11239 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 05 Oct 2018 11:16:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:19:21 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 5 Oct 2018 11:19:21 +0000 Subject: Change in pysim[master]: pySim-prog: Honor international '+' in SMSC number In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11201 to look at the new patch set (#3). Change subject: pySim-prog: Honor international '+' in SMSC number ...................................................................... pySim-prog: Honor international '+' in SMSC number The smsc no. programmed by pySim-prog would always be a national number in the past. Check whether the first 'digit' is a + and indicate that it is an international number. Change-Id: Ia79913f5b0307e9786a5acea75c0811927be2eef --- M pySim-prog.py 1 file changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/01/11201/3 -- To view, visit https://gerrit.osmocom.org/11201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia79913f5b0307e9786a5acea75c0811927be2eef Gerrit-Change-Number: 11201 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:20:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 11:20:14 +0000 Subject: Change in osmo-sip-connector[master]: vty: make 'show calls summary' more userfriendly In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11238 ) Change subject: vty: make 'show calls summary' more userfriendly ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11238/2/src/vty.c File src/vty.c: https://gerrit.osmocom.org/#/c/11238/2/src/vty.c at 279 PS2, Line 279: vty_out(vty, "%u | %s | %s | %s%s", call->id, calling, called, state, VTY_NEWLINE); I think you should use the "%5u" or similar notation to ensure thaat the columsn are always aligned. See other examples e.g. in show_cs7_asp_cmd of osmo_ss7_vty.c in libosmo-sccp. Same applies to the state names, and called/calling identity. Other examples are 'show connection' or 'show transaction' in osmo-msc. -- To view, visit https://gerrit.osmocom.org/11238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2092d58d80a34e6083f618593b92bb9e838aa906 Gerrit-Change-Number: 11238 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 05 Oct 2018 11:20:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:22:12 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 5 Oct 2018 11:22:12 +0000 Subject: Change in pysim[master]: pySim-prog: Honor international '+' in SMSC number In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11201 ) Change subject: pySim-prog: Honor international '+' in SMSC number ...................................................................... Patch Set 3: (3 comments) I left the default value for SMSC as is because I don't know why we chose it and I don't think there is some sane default that we could default to. It would be nice for pySim-prog to not program everything, but only the values that are specified, but that is a patch/discussion for another time. https://gerrit.osmocom.org/#/c/11201/1/pySim-prog.py File pySim-prog.py: https://gerrit.osmocom.org/#/c/11201/1/pySim-prog.py at 100 PS1, Line 100: help="SMSC number (Start with + for international no.) [default: '00 + country code + 5555']", > "If it starts with a '+', Type-of-Number is programmed as 'international'" ? [?] Done https://gerrit.osmocom.org/#/c/11201/1/pySim-prog.py at 325 PS1, Line 325: if smsc[0] == '+': > cosmetic: the rest of the file is indented by tabs, the new lines by spaces Done https://gerrit.osmocom.org/#/c/11201/1/pySim-prog.py at 329 PS1, Line 329: raise ValueError('SMSC must be digits only!\n \ > "and optionally start with a '+'" ? Done -- To view, visit https://gerrit.osmocom.org/11201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia79913f5b0307e9786a5acea75c0811927be2eef Gerrit-Change-Number: 11201 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 05 Oct 2018 11:22:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:28:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 11:28:32 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: keep L1 header, drop L1CTL header In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11215 ) Change subject: layer23/l1ctl.c: keep L1 header, drop L1CTL header ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id64249f1b7a1c2be578263ba62aa195c452ab7e8 Gerrit-Change-Number: 11215 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 05 Oct 2018 11:28:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:28:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 11:28:47 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: fix: verify msg length against l1ctl_hdr In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11216 ) Change subject: layer23/l1ctl.c: fix: verify msg length against l1ctl_hdr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic7d017bef04f3c186565d5dade36959df1019bd8 Gerrit-Change-Number: 11216 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 05 Oct 2018 11:28:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:28:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 11:28:56 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: fix: verify msg length using l1h, not l2h In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11217 ) Change subject: layer23/l1ctl.c: fix: verify msg length using l1h, not l2h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7fe2e00bb45ba07c9bb7438445eededfa09c96f3 Gerrit-Change-Number: 11217 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 05 Oct 2018 11:28:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:29:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 11:29:28 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: avoid confusion between L1CTL / L1 headers In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11218 ) Change subject: layer23/l1ctl.c: avoid confusion between L1CTL / L1 headers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d21ca8664b3445f472d3ffde90d0e11805dcb16 Gerrit-Change-Number: 11218 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 05 Oct 2018 11:29:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:38:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 5 Oct 2018 11:38:54 +0000 Subject: Change in osmo-ci[master]: osmocom-latest-packages.sh: Refactor to support building limesuite In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11239 ) Change subject: osmocom-latest-packages.sh: Refactor to support building limesuite ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/11239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I786c6f4ad4b4e43d1692c1588d2ad2194d0b25a4 Gerrit-Change-Number: 11239 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 05 Oct 2018 11:38:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:46:20 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 5 Oct 2018 11:46:20 +0000 Subject: Change in osmo-sip-connector[master]: vty: make 'show calls summary' more userfriendly In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11238 to look at the new patch set (#3). Change subject: vty: make 'show calls summary' more userfriendly ...................................................................... vty: make 'show calls summary' more userfriendly Display a table with one row per call (instead of two lines per call), and display the phone numbers of the people making the calls instead of internal IDs. This should make the VTY command friendlier for end users, especially if they have bigger networks. There is still the 'show calls' command with all the verbose output. Example output: OsmoSIPcon> show calls summary No active calls. OsmoSIPcon> show calls summary ID From To State ----- -------------------------------- -------------------------------- ---------- 5001 101 100 PROCEEDING OsmoSIPcon> show calls summary ID From To State ----- -------------------------------- -------------------------------- ---------- 5001 101 100 CONNECTED Relates: OS#1680 Change-Id: I2092d58d80a34e6083f618593b92bb9e838aa906 --- M src/vty.c 1 file changed, 28 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/38/11238/3 -- To view, visit https://gerrit.osmocom.org/11238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2092d58d80a34e6083f618593b92bb9e838aa906 Gerrit-Change-Number: 11238 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:49:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 11:49:20 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: clean up & fix message length checking In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11219 ) Change subject: layer23/l1ctl.c: clean up & fix message length checking ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I866bb5d97a1cc1b6cb887877bb444b9e3dca977a Gerrit-Change-Number: 11219 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 05 Oct 2018 11:49:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:49:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 11:49:21 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: keep L1 header, drop L1CTL header In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11215 ) Change subject: layer23/l1ctl.c: keep L1 header, drop L1CTL header ...................................................................... layer23/l1ctl.c: keep L1 header, drop L1CTL header There is no need to keep the L1CTL header in messages being sent towards the upper layers, but the L1 info header can be used by L2&3 to obtain some information, e.g. TDMA frame number. Change-Id: Id64249f1b7a1c2be578263ba62aa195c452ab7e8 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 5 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index eedfb93..39b7f3c 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -244,10 +244,6 @@ else le = &ms->lapdm_channel.lapdm_dcch; - /* pull the L1 header from the msgb */ - msgb_pull(msg, msg->l2h - (msg->l1h-sizeof(struct l1ctl_hdr))); - msg->l1h = NULL; - osmo_prim_init(&pp.oph, SAP_GSM_PH, PRIM_PH_DATA, PRIM_OP_INDICATION, msg); pp.u.data.chan_nr = dl->chan_nr; @@ -638,8 +634,8 @@ /* just forward the SIM response to the SIM handler */ static int rx_l1_sim_conf(struct osmocom_ms *ms, struct msgb *msg) { - uint16_t len = msg->len - sizeof(struct l1ctl_hdr); - uint8_t *data = msg->data + sizeof(struct l1ctl_hdr); + uint16_t len = msgb_l2len(msg); + uint8_t *data = msg->data; if (apdu_len > -1 && apdu_len + len <= sizeof(apdu_data)) { memcpy(apdu_data + apdu_len, data, len); @@ -649,10 +645,6 @@ } LOGP(DL1C, LOGL_INFO, "SIM %s\n", osmo_hexdump(data, len)); - - /* pull the L1 header from the msgb */ - msgb_pull(msg, sizeof(struct l1ctl_hdr)); - msg->l1h = NULL; sim_apdu_resp(ms, msg); @@ -784,13 +776,8 @@ DEBUGP(DL1C, "TRAFFIC IND (%s)\n", osmo_hexdump(ti->data, 33)); /* distribute or drop */ - if (ms->l1_entity.l1_traffic_ind) { - /* pull the L1 header from the msgb */ - msgb_pull(msg, msg->l2h - (msg->l1h-sizeof(struct l1ctl_hdr))); - msg->l1h = NULL; - + if (ms->l1_entity.l1_traffic_ind) return ms->l1_entity.l1_traffic_ind(ms, msg); - } msgb_free(msg); return 0; @@ -895,7 +882,9 @@ return -1; } + /* Pull the L1CTL header from the msgb */ l1h = (struct l1ctl_hdr *) msg->l1h; + msgb_pull(msg, sizeof(struct l1ctl_hdr)); /* move the l1 header pointer to point _BEHIND_ l1ctl_hdr, as the l1ctl header is of no interest to subsequent code */ -- To view, visit https://gerrit.osmocom.org/11215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id64249f1b7a1c2be578263ba62aa195c452ab7e8 Gerrit-Change-Number: 11215 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:49:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 11:49:21 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: fix: verify msg length against l1ctl_hdr In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11216 ) Change subject: layer23/l1ctl.c: fix: verify msg length against l1ctl_hdr ...................................................................... layer23/l1ctl.c: fix: verify msg length against l1ctl_hdr In l1ctl_recv() we actually expect to 'see' the L1CTL header instead of the DL info header. Let's fix this. Change-Id: Ic7d017bef04f3c186565d5dade36959df1019bd8 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 39b7f3c..9a3bc0e 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -873,9 +873,8 @@ { int rc = 0; struct l1ctl_hdr *l1h; - struct l1ctl_info_dl *dl; - if (msgb_l2len(msg) < sizeof(*dl)) { + if (msgb_l2len(msg) < sizeof(*l1h)) { LOGP(DL1C, LOGL_ERROR, "Short Layer2 message: %u\n", msgb_l2len(msg)); msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/11216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic7d017bef04f3c186565d5dade36959df1019bd8 Gerrit-Change-Number: 11216 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:49:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 11:49:21 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: fix: verify msg length using l1h, not l2h In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11217 ) Change subject: layer23/l1ctl.c: fix: verify msg length using l1h, not l2h ...................................................................... layer23/l1ctl.c: fix: verify msg length using l1h, not l2h The actual L1CTL header is pointed by 'msg->l1h', not 'l2h'! Since msg->l2h is NULL (because nobody set it), the result of msgb_l2len() would always be bigger than size of L1CTL header, as it is calculated in the following way: return msgb->tail - (uint8_t *)msgb_l2(msgb); So, in case if 'msg->l2h' is NULL, it turns into: return msgb->tail - 0; Change-Id: I7fe2e00bb45ba07c9bb7438445eededfa09c96f3 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 9a3bc0e..c8695ca 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -874,9 +874,10 @@ int rc = 0; struct l1ctl_hdr *l1h; - if (msgb_l2len(msg) < sizeof(*l1h)) { - LOGP(DL1C, LOGL_ERROR, "Short Layer2 message: %u\n", - msgb_l2len(msg)); + /* Make sure a message has L1CTL header (pointed by msg->l1h) */ + if (msgb_l1len(msg) < sizeof(*l1h)) { + LOGP(DL1C, LOGL_ERROR, "Short L1CTL message, " + "missing the header (len=%u)\n", msgb_l1len(msg)); msgb_free(msg); return -1; } -- To view, visit https://gerrit.osmocom.org/11217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7fe2e00bb45ba07c9bb7438445eededfa09c96f3 Gerrit-Change-Number: 11217 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:49:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 11:49:22 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: avoid confusion between L1CTL / L1 headers In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11218 ) Change subject: layer23/l1ctl.c: avoid confusion between L1CTL / L1 headers ...................................................................... layer23/l1ctl.c: avoid confusion between L1CTL / L1 headers As we assign the payload following L1CTL header to 'msg->l1h', it makes sense to avoid possible naming confusion. Change-Id: I5d21ca8664b3445f472d3ffde90d0e11805dcb16 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index c8695ca..642cde8 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -872,10 +872,10 @@ int l1ctl_recv(struct osmocom_ms *ms, struct msgb *msg) { int rc = 0; - struct l1ctl_hdr *l1h; + struct l1ctl_hdr *hdr; /* Make sure a message has L1CTL header (pointed by msg->l1h) */ - if (msgb_l1len(msg) < sizeof(*l1h)) { + if (msgb_l1len(msg) < sizeof(*hdr)) { LOGP(DL1C, LOGL_ERROR, "Short L1CTL message, " "missing the header (len=%u)\n", msgb_l1len(msg)); msgb_free(msg); @@ -883,14 +883,14 @@ } /* Pull the L1CTL header from the msgb */ - l1h = (struct l1ctl_hdr *) msg->l1h; + hdr = (struct l1ctl_hdr *) msg->l1h; msgb_pull(msg, sizeof(struct l1ctl_hdr)); /* move the l1 header pointer to point _BEHIND_ l1ctl_hdr, as the l1ctl header is of no interest to subsequent code */ - msg->l1h = l1h->data; + msg->l1h = hdr->data; - switch (l1h->msg_type) { + switch (hdr->msg_type) { case L1CTL_FBSB_CONF: rc = rx_l1_fbsb_conf(ms, msg); msgb_free(msg); @@ -908,7 +908,7 @@ break; case L1CTL_PM_CONF: rc = rx_l1_pm_conf(ms, msg); - if (l1h->flags & L1CTL_F_DONE) + if (hdr->flags & L1CTL_F_DONE) osmo_signal_dispatch(SS_L1CTL, S_L1CTL_PM_DONE, ms); msgb_free(msg); break; @@ -937,7 +937,7 @@ msgb_free(msg); break; default: - LOGP(DL1C, LOGL_ERROR, "Unknown MSG: %u\n", l1h->msg_type); + LOGP(DL1C, LOGL_ERROR, "Unknown MSG: %u\n", hdr->msg_type); msgb_free(msg); break; } -- To view, visit https://gerrit.osmocom.org/11218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5d21ca8664b3445f472d3ffde90d0e11805dcb16 Gerrit-Change-Number: 11218 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:49:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 11:49:22 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: clean up & fix message length checking In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11219 ) Change subject: layer23/l1ctl.c: clean up & fix message length checking ...................................................................... layer23/l1ctl.c: clean up & fix message length checking Almost all handlers for received L1CTL messages are also affected by the bug fixed in I7fe2e00bb45ba07c9bb7438445eededfa09c96f3. In short, they do verify the length of 'msg->l2h' or 'msg->l3h', but not the 'msg->l1h'. Let's fix this, and also add missing checks. Change-Id: I866bb5d97a1cc1b6cb887877bb444b9e3dca977a --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 44 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 642cde8..6f4a6d8 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -83,9 +83,9 @@ struct gsm_time tm; struct osmobb_fbsb_res fr; - if (msgb_l3len(msg) < sizeof(*dl) + sizeof(*sb)) { - LOGP(DL1C, LOGL_ERROR, "FBSB RESP: MSG too short %u\n", - msgb_l3len(msg)); + if (msgb_l1len(msg) < (sizeof(*dl) + sizeof(*sb))) { + LOGP(DL1C, LOGL_ERROR, "FBSB RESP: MSG too short (len=%u), " + "missing UL info header and/or payload\n", msgb_l1len(msg)); return -1; } @@ -121,9 +121,9 @@ struct osmo_phsap_prim pp; struct l1ctl_info_dl *dl; - if (msgb_l2len(msg) < sizeof(*dl)) { - LOGP(DL1C, LOGL_ERROR, "RACH CONF: MSG too short %u\n", - msgb_l3len(msg)); + if (msgb_l1len(msg) < sizeof(*dl)) { + LOGP(DL1C, LOGL_ERROR, "RACH CONF MSG too short " + "(len=%u), missing DL info header\n", msgb_l1len(msg)); msgb_free(msg); return -1; } @@ -150,9 +150,9 @@ uint8_t gsmtap_chan_type; struct gsm_time tm; - if (msgb_l3len(msg) < sizeof(*ccch)) { - LOGP(DL1C, LOGL_ERROR, "MSG too short Data Ind: %u\n", - msgb_l3len(msg)); + if (msgb_l1len(msg) < sizeof(*dl)) { + LOGP(DL1C, LOGL_ERROR, "DATA IND MSG too short (len=%u), " + "missing UL info header\n", msgb_l1len(msg)); msgb_free(msg); return -1; } @@ -260,6 +260,13 @@ struct l1ctl_info_dl *dl = (struct l1ctl_info_dl *) msg->l1h; struct lapdm_entity *le; + if (msgb_l1len(msg) < sizeof(*dl)) { + LOGP(DL1C, LOGL_ERROR, "DATA CONF MSG too short (len=%u), " + "missing UL info header\n", msgb_l1len(msg)); + msgb_free(msg); + return -1; + } + osmo_prim_init(&pp.oph, SAP_GSM_PH, PRIM_PH_RTS, PRIM_OP_INDICATION, msg); @@ -284,14 +291,12 @@ DEBUGP(DL1C, "(%s)\n", osmo_hexdump(msg->l2h, msgb_l2len(msg))); - if (msgb_l2len(msg) > 23) { - LOGP(DL1C, LOGL_ERROR, "L1 cannot handle message length " - "> 23 (%u)\n", msgb_l2len(msg)); + if (msgb_l2len(msg) != 23) { + LOGP(DL1C, LOGL_ERROR, "Wrong message length (len=%u), " + "DATA REQ ignored, please fix!\n", msgb_l2len(msg)); msgb_free(msg); return -EINVAL; - } else if (msgb_l2len(msg) < 23) - LOGP(DL1C, LOGL_ERROR, "L1 message length < 23 (%u) " - "doesn't seem right!\n", msgb_l2len(msg)); + } /* send copy via GSMTAP */ rsl_dec_chan_nr(chan_nr, &chan_type, &chan_ss, &chan_ts); @@ -702,6 +707,12 @@ { struct l1ctl_pm_conf *pmr; + if (msgb_l1len(msg) < sizeof(*pmr)) { + LOGP(DL1C, LOGL_ERROR, "PM CONF MSG too short (len=%u), " + "missing measurement results\n", msgb_l1len(msg)); + return -1; + } + for (pmr = (struct l1ctl_pm_conf *) msg->l1h; (uint8_t *) pmr < msg->tail; pmr++) { struct osmobb_meas_res mr; @@ -721,9 +732,9 @@ struct osmobb_ccch_mode_conf mc; struct l1ctl_ccch_mode_conf *conf; - if (msgb_l3len(msg) < sizeof(*conf)) { - LOGP(DL1C, LOGL_ERROR, "CCCH MODE CONF: MSG too short %u\n", - msgb_l3len(msg)); + if (msgb_l1len(msg) < sizeof(*conf)) { + LOGP(DL1C, LOGL_ERROR, "CCCH MODE CONF: MSG too short " + "(len=%u), missing CCCH mode info\n", msgb_l1len(msg)); return -1; } @@ -744,9 +755,9 @@ struct osmobb_tch_mode_conf mc; struct l1ctl_tch_mode_conf *conf; - if (msgb_l3len(msg) < sizeof(*conf)) { - LOGP(DL1C, LOGL_ERROR, "TCH MODE CONF: MSG too short %u\n", - msgb_l3len(msg)); + if (msgb_l1len(msg) < sizeof(*conf)) { + LOGP(DL1C, LOGL_ERROR, "TCH MODE CONF: MSG too short " + "(len=%u), missing TCH mode info\n", msgb_l1len(msg)); return -1; } @@ -768,6 +779,12 @@ struct l1ctl_info_dl *dl; struct l1ctl_traffic_ind *ti; + if (msgb_l1len(msg) < sizeof(*dl)) { + LOGP(DL1C, LOGL_ERROR, "TRAFFIC IND MSG too short " + "(len=%u), missing DL info header\n", msgb_l1len(msg)); + return -1; + } + /* Header handling */ dl = (struct l1ctl_info_dl *) msg->l1h; msg->l2h = dl->payload; @@ -854,6 +871,12 @@ { struct l1ctl_neigh_pm_ind *pm_ind; + if (msgb_l1len(msg) < sizeof(*pm_ind)) { + LOGP(DL1C, LOGL_ERROR, "NEIGH PH IND MSG too short " + "(len=%u), missing measurement results\n", msgb_l1len(msg)); + return -1; + } + for (pm_ind = (struct l1ctl_neigh_pm_ind *) msg->l1h; (uint8_t *) pm_ind < msg->tail; pm_ind++) { struct osmobb_neigh_pm_ind mi; -- To view, visit https://gerrit.osmocom.org/11219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I866bb5d97a1cc1b6cb887877bb444b9e3dca977a Gerrit-Change-Number: 11219 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 11:50:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 11:50:17 +0000 Subject: Change in pysim[master]: pySim-prog: Honor international '+' in SMSC number In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11201 ) Change subject: pySim-prog: Honor international '+' in SMSC number ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia79913f5b0307e9786a5acea75c0811927be2eef Gerrit-Change-Number: 11201 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 05 Oct 2018 11:50:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 12:12:13 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 5 Oct 2018 12:12:13 +0000 Subject: Change in osmo-dev[master]: Support osmo-sip-connector with kamailio In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11144 ) Change subject: Support osmo-sip-connector with kamailio ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11144/1/net/config_2g3g File net/config_2g3g: https://gerrit.osmocom.org/#/c/11144/1/net/config_2g3g at 33 PS1, Line 33: MSC_MNCC_SOCKET="/tmp/bsc_mncc" Minor nitpick: change to /tmp/msc_mncc The old name is from the days where we had openbsc instead of osmo-msc so it's somewhat misleading now. -- To view, visit https://gerrit.osmocom.org/11144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 Gerrit-Change-Number: 11144 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-CC: daniel Gerrit-Comment-Date: Fri, 05 Oct 2018 12:12:13 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 12:14:47 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 5 Oct 2018 12:14:47 +0000 Subject: Change in osmo-sip-connector[master]: Fix mncc socket name Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11240 Change subject: Fix mncc socket name ...................................................................... Fix mncc socket name For OpenBSC it made sense to have a /tmp/bsc_mncc file to share for external MNCC, but now that we have an MSC osmo-sip-connector communicates with that, so rename the socket file to avoid confusion. Change-Id: I5e0dbf1aafe1b9c3776c49a08a76d64dd4fe9cc5 --- M doc/examples/osmo-sip-connector.cfg M src/vty.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/40/11240/1 diff --git a/doc/examples/osmo-sip-connector.cfg b/doc/examples/osmo-sip-connector.cfg index ad42969..550cba6 100644 --- a/doc/examples/osmo-sip-connector.cfg +++ b/doc/examples/osmo-sip-connector.cfg @@ -1,6 +1,6 @@ app mncc - socket-path /tmp/bsc_mncc + socket-path /tmp/msc_mncc sip local 0.0.0.0 5060 remote pbx 5060 diff --git a/src/vty.c b/src/vty.c index 540e2de..3c9ade1 100644 --- a/src/vty.c +++ b/src/vty.c @@ -306,7 +306,7 @@ void mncc_sip_vty_init(void) { /* default values */ - g_app.mncc.path = talloc_strdup(tall_mncc_ctx, "/tmp/bsc_mncc"); + g_app.mncc.path = talloc_strdup(tall_mncc_ctx, "/tmp/msc_mncc"); g_app.sip.local_addr = talloc_strdup(tall_mncc_ctx, "127.0.0.1"); g_app.sip.local_port = 5060; g_app.sip.remote_addr = talloc_strdup(tall_mncc_ctx, "pbx"); -- To view, visit https://gerrit.osmocom.org/11240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5e0dbf1aafe1b9c3776c49a08a76d64dd4fe9cc5 Gerrit-Change-Number: 11240 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 12:21:25 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 5 Oct 2018 12:21:25 +0000 Subject: Change in pysim[master]: pySim-prog: Honor international '+' in SMSC number In-Reply-To: References: Message-ID: daniel has submitted this change and it was merged. ( https://gerrit.osmocom.org/11201 ) Change subject: pySim-prog: Honor international '+' in SMSC number ...................................................................... pySim-prog: Honor international '+' in SMSC number The smsc no. programmed by pySim-prog would always be a national number in the past. Check whether the first 'digit' is a + and indicate that it is an international number. Change-Id: Ia79913f5b0307e9786a5acea75c0811927be2eef --- M pySim-prog.py 1 file changed, 8 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/pySim-prog.py b/pySim-prog.py index eca8b4e..ae5e482 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -97,7 +97,7 @@ default=55, ) parser.add_option("-m", "--smsc", dest="smsc", - help="SMSP [default: '00 + country code + 5555']", + help="SMSC number (Start with + for international no.) [default: '00 + country code + 5555']", ) parser.add_option("-M", "--smsp", dest="smsp", help="Raw SMSP content in hex [default: auto from SMSC]", @@ -319,14 +319,19 @@ raise ValueError('SMSP must be at least 28 bytes') else: + ton = "81" if opts.smsc is not None: smsc = opts.smsc + if smsc[0] == '+': + ton = "91" + smsc = smsc[1:] if not _isnum(smsc): - raise ValueError('SMSC must be digits only !') + raise ValueError('SMSC must be digits only!\n \ + Start with \'+\' for international numbers') else: smsc = '00%d' % opts.country + '5555' # Hack ... - smsc = '%02d' % ((len(smsc) + 3)//2,) + "81" + swap_nibbles(rpad(smsc, 20)) + smsc = '%02d' % ((len(smsc) + 3)//2,) + ton + swap_nibbles(rpad(smsc, 20)) smsp = ( 'e1' + # Parameters indicator -- To view, visit https://gerrit.osmocom.org/11201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia79913f5b0307e9786a5acea75c0811927be2eef Gerrit-Change-Number: 11201 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 12:35:22 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 5 Oct 2018 12:35:22 +0000 Subject: Change in osmo-dev[master]: exit if xterm was not found In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11143 to look at the new patch set (#3). Change subject: exit if xterm was not found ...................................................................... exit if xterm was not found Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 --- M net/tmpl_std/run.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/43/11143/3 -- To view, visit https://gerrit.osmocom.org/11143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 Gerrit-Change-Number: 11143 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 12:35:22 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 5 Oct 2018 12:35:22 +0000 Subject: Change in osmo-dev[master]: Support osmo-sip-connector with kamailio In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11144 to look at the new patch set (#4). Change subject: Support osmo-sip-connector with kamailio ...................................................................... Support osmo-sip-connector with kamailio Kamailio is a SIP server, that is relatively easy to configure, in contrary to asterisk it only has one config file. The config file here is based on the example config provided in the wiki: To enable the osmo-sip-connector, build it, install kamailio and then set SIPCON_ENABLE=true in your copy of config_2g_3g. Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 --- M net/config_2g3g A net/tmpl_std/kamailio.cfg A net/tmpl_std/osmo-sip-connector.cfg M net/tmpl_std/run.sh 4 files changed, 462 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/44/11144/4 -- To view, visit https://gerrit.osmocom.org/11144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 Gerrit-Change-Number: 11144 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-CC: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 14:03:15 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 5 Oct 2018 14:03:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add a TTCN3 test suite for IPA protocol testing Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11241 Change subject: Add a TTCN3 test suite for IPA protocol testing ...................................................................... Add a TTCN3 test suite for IPA protocol testing This new test suite allows us to test IPA code in libosmocore and libosmo-netif. Currently only one test is implemented, which sends a chopped IPA ping message and expects to receive an IPA pong. The system under test is any IPA speaker on any TCP port. The default test configuration uses TCP port 3003 (RSL) and works with osmo-bsc and the osmo-bsc-minimal.cfg sample configuration file shipped with osmo-bsc. Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Related: OS#2010 --- M Makefile A ipa/IPA_Tests.cfg A ipa/IPA_Tests.ttcn A ipa/gen_links.sh A ipa/regen_makefile.sh 5 files changed, 165 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/11241/1 diff --git a/Makefile b/Makefile index 074e151..0255b0a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -SUBDIRS=bsc bsc-nat bts ggsn_tests hlr lapdm mgw msc pcu sccp selftest sgsn sip sysinfo +SUBDIRS=bsc bsc-nat bts ggsn_tests hlr ipa lapdm mgw msc pcu sccp selftest sgsn sip sysinfo NPROC=$(shell nproc 2>/dev/null) ifeq ($(NPROC),) diff --git a/ipa/IPA_Tests.cfg b/ipa/IPA_Tests.cfg new file mode 100644 index 0000000..dba8762 --- /dev/null +++ b/ipa/IPA_Tests.cfg @@ -0,0 +1,18 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" + +# Local configuration below + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +IPA_Tests.mp_ipa_ip := "127.0.0.1" +IPA_Tests.mp_ipa_tcp_port := 3003 + +[MAIN_CONTROLLER] + +[EXECUTE] +IPA_Tests.control diff --git a/ipa/IPA_Tests.ttcn b/ipa/IPA_Tests.ttcn new file mode 100644 index 0000000..ca69687 --- /dev/null +++ b/ipa/IPA_Tests.ttcn @@ -0,0 +1,114 @@ +/* (C) 2018 by sysmocom s.f.m.c. GmbH + * Author: Stefan Sperling + * All Rights Reserved + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + */ + +module IPA_Tests { + +import from IPL4asp_Types all; +import from IPL4asp_PortType all; +import from IPA_Types all; +import from Osmocom_Types all; + +modulepar { + charstring mp_ipa_ip := "127.0.0.1"; + integer mp_ipa_tcp_port := 3003; +} + +/* Encoded IPA messages (network byte order) */ +const octetstring ipa_msg_ping := '0001FE00'O; +const octetstring ipa_msg_pong := '0001FE01'O; + +type component system_CT { + port IPL4asp_PT IPL4; +} + +type component IPA_CT { + port IPL4asp_PT IPL4; + timer g_Tguard; +} + +private altstep as_Tguard() runs on IPA_CT { + [] g_Tguard.timeout { + setverdict(fail, "Tguard timeout"); + mtc.stop; + } +} + +function f_send_ipa_data(ConnectionId connId, octetstring data) runs on IPA_CT { + var IPL4asp_Types.Result res; + var ASP_SendTo asp := { + connId := connId, + remName := mp_ipa_ip, + remPort := mp_ipa_tcp_port, + proto := {tcp := {}}, + msg := data + }; + IPL4.send(asp); +} + +template ASP_RecvFrom t_recvfrom(octetstring msg) := { + connId := ?, + remName := ?, + remPort := ?, + locName := ?, + locPort := ?, + proto := {tcp := {}}, + userData := ?, + msg := msg +} + +function f_init() runs on IPA_CT return ConnectionId { + var IPL4asp_Types.Result res; + var ConnectionId connId; + + /* Create an IPA connection over TCP. */ + map(self:IPL4, system:IPL4); + res := IPL4asp_PortType.f_IPL4_connect(IPL4, mp_ipa_ip, mp_ipa_tcp_port, "", -1, 0, { tcp:={} }); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect IPA socket to ", mp_ipa_ip, " port ", + mp_ipa_tcp_port, "; check your configuration"); + mtc.stop; + } + + /* Activate guard timer. */ + g_Tguard.start(60.0); + activate(as_Tguard()); + + return res.connId; +} + +testcase TC_chopped_ipa_ping() runs on IPA_CT system system_CT { + const float delay := 6.0; + var ConnectionId connId; + var ASP_RecvFrom asp_rx; + + connId := f_init(); + + /* Send a ping message one byte at a time, waiting for TCP buffer to flush between each byte. */ + for (var integer i := 0; i < lengthof(ipa_msg_ping); i := i + 1) { + log("sending byte ", ipa_msg_ping[i]); + f_send_ipa_data(connId, ipa_msg_ping[i]); + f_sleep(delay); + } + + /* Expect a pong response. */ + alt { + [] IPL4.receive(t_recvfrom(ipa_msg_pong)) -> value asp_rx { + log("received pong: ", asp_rx.msg); + setverdict(pass); + } + [] IPL4.receive { + repeat; + } + } +} + +control { + execute( TC_chopped_ipa_ping() ); +} + +} diff --git a/ipa/gen_links.sh b/ipa/gen_links.sh new file mode 100755 index 0000000..5479d9a --- /dev/null +++ b/ipa/gen_links.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +BASEDIR=../deps + +. ../gen_links.sh.inc + +DIR=$BASEDIR/titan.TestPorts.IPL4asp/src +FILES="IPL4asp_Functions.ttcn IPL4asp_PT.cc IPL4asp_PT.hh IPL4asp_PortType.ttcn IPL4asp_Types.ttcn IPL4asp_discovery.cc IPL4asp_protocol_L234.hh" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src +FILES="Socket_API_Definitions.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src +FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" +FILES+=" TCCEncoding_Functions.ttcn TCCEncoding.cc " # GSM 7-bit coding +gen_links $DIR $FILES + +DIR=../library +FILES="General_Types.ttcn Osmocom_Types.ttcn IPA_Types.ttcn" + +gen_links $DIR $FILES + +ignore_pp_results diff --git a/ipa/regen_makefile.sh b/ipa/regen_makefile.sh new file mode 100755 index 0000000..8770145 --- /dev/null +++ b/ipa/regen_makefile.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +FILES="*.ttcn TCCConversion.cc TCCInterface.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCEncoding.cc " + +export CPPFLAGS_TTCN3="" + +../regen-makefile.sh IPA_Tests.ttcn $FILES -- To view, visit https://gerrit.osmocom.org/11241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Gerrit-Change-Number: 11241 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 14:42:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 14:42:51 +0000 Subject: Change in osmo-sip-connector[master]: Fix mncc socket name In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11240 ) Change subject: Fix mncc socket name ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5e0dbf1aafe1b9c3776c49a08a76d64dd4fe9cc5 Gerrit-Change-Number: 11240 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 05 Oct 2018 14:42:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 14:42:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 14:42:52 +0000 Subject: Change in osmo-sip-connector[master]: Fix mncc socket name In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11240 ) Change subject: Fix mncc socket name ...................................................................... Fix mncc socket name For OpenBSC it made sense to have a /tmp/bsc_mncc file to share for external MNCC, but now that we have an MSC osmo-sip-connector communicates with that, so rename the socket file to avoid confusion. Change-Id: I5e0dbf1aafe1b9c3776c49a08a76d64dd4fe9cc5 --- M doc/examples/osmo-sip-connector.cfg M src/vty.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/doc/examples/osmo-sip-connector.cfg b/doc/examples/osmo-sip-connector.cfg index ad42969..550cba6 100644 --- a/doc/examples/osmo-sip-connector.cfg +++ b/doc/examples/osmo-sip-connector.cfg @@ -1,6 +1,6 @@ app mncc - socket-path /tmp/bsc_mncc + socket-path /tmp/msc_mncc sip local 0.0.0.0 5060 remote pbx 5060 diff --git a/src/vty.c b/src/vty.c index 540e2de..3c9ade1 100644 --- a/src/vty.c +++ b/src/vty.c @@ -306,7 +306,7 @@ void mncc_sip_vty_init(void) { /* default values */ - g_app.mncc.path = talloc_strdup(tall_mncc_ctx, "/tmp/bsc_mncc"); + g_app.mncc.path = talloc_strdup(tall_mncc_ctx, "/tmp/msc_mncc"); g_app.sip.local_addr = talloc_strdup(tall_mncc_ctx, "127.0.0.1"); g_app.sip.local_port = 5060; g_app.sip.remote_addr = talloc_strdup(tall_mncc_ctx, "pbx"); -- To view, visit https://gerrit.osmocom.org/11240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5e0dbf1aafe1b9c3776c49a08a76d64dd4fe9cc5 Gerrit-Change-Number: 11240 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 14:43:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 14:43:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add a TTCN3 test suite for IPA protocol testing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11241 ) Change subject: Add a TTCN3 test suite for IPA protocol testing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Gerrit-Change-Number: 11241 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 05 Oct 2018 14:43:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 14:43:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 14:43:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add a TTCN3 test suite for IPA protocol testing In-Reply-To: References: Message-ID: Harald Welte has removed a vote on this change. Change subject: Add a TTCN3 test suite for IPA protocol testing ...................................................................... Removed Code-Review+2 by Harald Welte -- To view, visit https://gerrit.osmocom.org/11241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Gerrit-Change-Number: 11241 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 14:45:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 14:45:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add a TTCN3 test suite for IPA protocol testing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11241 ) Change subject: Add a TTCN3 test suite for IPA protocol testing ...................................................................... Patch Set 1: I would actually argue that this should become some kind of "library/" code that can be used by the various test suites. This means we can use it to add test caeses to our bts,bsc,msc,... test suites. -- To view, visit https://gerrit.osmocom.org/11241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Gerrit-Change-Number: 11241 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 05 Oct 2018 14:45:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 14:49:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 14:49:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add a TTCN3 test suite for IPA protocol testing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11241 ) Change subject: Add a TTCN3 test suite for IPA protocol testing ...................................................................... Patch Set 1: this could go both ways: a) by having actual testcase in the library, but then the respective 'component' would have to be configued with the required ports, etc., or b) by having most of the test logic in functions, so that the TC_ipa_foo() in e.g. BSC_Tests.ttcn becomes a thin wrapper doing nothing much but calling the function provided by the library. Please keep in mind that this should be highly parametrized, as many of our programs have many IPA based interfaces, and we'd like to execute the same test against all of those ports. For example, in the BSC we have at least RSL, OML, CTRL. I know that most of our programs will actually use implementations from libosmo*, but rather than creating artificial test executables for the libraries, I think running a set of 1..5 tests against each of bts/bsc/msc/... makes more sense. Sure, we'll be re-testing the same code several times, but that won't hurt. Also, different applications may use the libosmo* in different ways, so it doesn't hurt executing tests against each of those. -- To view, visit https://gerrit.osmocom.org/11241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Gerrit-Change-Number: 11241 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 05 Oct 2018 14:49:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 14:49:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 5 Oct 2018 14:49:35 +0000 Subject: Change in osmo-trx[master]: examples: Use logging level 'set-all' instead of 'all' Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11242 Change subject: examples: Use logging level 'set-all' instead of 'all' ...................................................................... examples: Use logging level 'set-all' instead of 'all' Change-Id: Ic52ce0defc774acb8e24947ed22cf2a56b8b0bb0 --- M doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg M doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg M doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg M doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/42/11242/1 diff --git a/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg b/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg index fae5b35..e2c67d6 100644 --- a/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg +++ b/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg @@ -4,7 +4,7 @@ logging print category 1 logging timestamp 1 logging print file basename - logging level all info + logging level set-all info ! line vty no login diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg index fae5b35..e2c67d6 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg @@ -4,7 +4,7 @@ logging print category 1 logging timestamp 1 logging print file basename - logging level all info + logging level set-all info ! line vty no login diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg index 06eb3e9..1b15b47 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg @@ -4,7 +4,7 @@ logging print category 1 logging timestamp 1 logging print file basename - logging level all info + logging level set-all info ! line vty no login diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg index af29929..7d02506 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg @@ -4,7 +4,7 @@ logging print category 1 logging timestamp 1 logging print file basename - logging level all info + logging level set-all info ! line vty no login -- To view, visit https://gerrit.osmocom.org/11242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic52ce0defc774acb8e24947ed22cf2a56b8b0bb0 Gerrit-Change-Number: 11242 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 14:51:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 5 Oct 2018 14:51:36 +0000 Subject: Change in osmo-ci[master]: osmocom-latest-packages.sh: Refactor to support building limesuite In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11239 ) Change subject: osmocom-latest-packages.sh: Refactor to support building limesuite ...................................................................... osmocom-latest-packages.sh: Refactor to support building limesuite This way the latest script is a lot more similar to the nightly one, and easier to maintain and expand with new features. checkout and build steps are split because once we have a new osmo-trx release, we'll need the create_osmo_trx_debian8_jessie trick to build it. In the future we can do further steps to have a common function lib between latest and nightly scripts. Change-Id: I786c6f4ad4b4e43d1692c1588d2ad2194d0b25a4 --- M scripts/osmocom-latest-packages.sh 1 file changed, 109 insertions(+), 54 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index ac5a2dd..f983d05 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -4,55 +4,87 @@ # apt install git-buildpackage osc git set -e +set -x # OBS project name PROJ=network:osmocom:latest DT=$(date +%Y%m%d) TOP=$(pwd) +DEBSRCDIR="$TOP/debsrc" if ! which osc >/dev/null 2>/dev/null ; then echo "osc binary not found" exit 1 fi -# start with a checkout of the project -if [ -d $PROJ ]; then - (cd $PROJ && osc up) -else - osc co $PROJ -fi +prepare() { + # start with a checkout of the project + if [ -d $PROJ ]; then + (cd $PROJ && osc up) + else + osc co $PROJ + fi + [ -d "$DEBSRCDIR" ] && rm -rf "$DEBSRCDIR" + mkdir "$DEBSRCDIR" +} + +get_last_tag() { + project="$1" + if [ "$project" = "limesuite" ]; then + ver_regexp="^v[0-9]*.[0-9]*.[0-9]*$" + else + ver_regexp="^[0-9]*.[0-9]*.[0-9]*$" + fi + VER=$(git -C "${TOP}/${project}" tag -l --sort=v:refname | grep "$ver_regexp" | tail -n 1) + echo "${VER}" +} + +checkout() { + project=$1 + gitbpargs="" + echo + echo "====> Checking out $project" + cd "$TOP" + if [ "$project" = "limesuite" ]; then + [ -d "$project" ] || git clone "https://github.com/myriadrf/LimeSuite" "$project" + else + [ -d "$project" ] || git clone "git://git.osmocom.org/$project" + fi + cd "$project" + git fetch + VER=$(get_last_tag "$project") + git checkout -f -B "$VER" "refs/tags/$VER" +} build() { project=$1 - output=$2 + gitbpargs="$2" + output="$DEBSRCDIR/$project" echo echo "====> Building $project" - cd "$TOP" - [ -d "$1" ] || git clone "git://git.osmocom.org/$1" - cd "$1" - git fetch - VER=$(git tag -l --sort=v:refname | grep "^[0-9]*.[0-9]*.[0-9]*$" | tail -n 1) + cd "$TOP/$project" + VER=$(get_last_tag "$project") git checkout -f -B "$VER" "refs/tags/$VER" if [ -x ./git-version-gen ]; then ./git-version-gen . > .tarball-version 2>/dev/null gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$output" \ - "--git-debian-branch=$VER" --git-ignore-new \ + "--git-debian-branch=$VER" --git-ignore-new $gitbpargs \ --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/' else gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$output" \ - "--git-debian-branch=$VER" --git-ignore-new + "--git-debian-branch=$VER" --git-ignore-new $gitbpargs fi - if [ ! -d "$TOP/$PROJ/$1" ] ; then + if [ ! -d "$TOP/$PROJ/$project" ] ; then # creating a new package is different from using old ones - mkdir "$TOP/$PROJ/$1" - mv "$output/"*.dsc "$TOP/$PROJ/$1/" - mv "$output/"*.tar* "$TOP/$PROJ/$1/" + mkdir "$TOP/$PROJ/$project" + mv "$output/"*.dsc "$TOP/$PROJ/$project/" + mv "$output/"*.tar* "$TOP/$PROJ/$project/" cd "$TOP/$PROJ" - osc add "$1" + osc add "$project" else - cd "$TOP/$PROJ/$1" + cd "$TOP/$PROJ/$project" # update OBS only if the filename doesn't match file=$(cd "$output/" ; ls ./*.dsc) @@ -66,40 +98,63 @@ cd "$TOP" } -PACKAGES=" - libosmocore - libosmo-sccp - libosmo-abis - libosmo-netif - libsmpp34 - libasn1c - libgtpnl - libusrp - osmo-iuh - osmo-ggsn - osmo-sgsn - openbsc - osmo-pcap - osmo-trx - osmo-sip-connector - osmo-bts - osmo-pcu - osmo-hlr - osmo-mgw - osmo-msc - osmo-bsc - simtrace2 - " -# add those two once they have tagged any versions that include the 'debian' sub-dir - #rtl-sdr - #osmo-fl2k +# add those two once they have tagged any versions that include the 'debian' sub-dir: +#rtl-sdr +#osmo-fl2k -[ -d "$TOP/debsrc" ] && rm -rf "$TOP/debsrc" -mkdir "$TOP/debsrc" +build_osmocom() { + prepare -for p in $PACKAGES; do - build "$p" "$TOP/debsrc/$p" -done + checkout limesuite + checkout libosmocore + checkout libosmo-sccp + checkout libosmo-abis + checkout libosmo-netif + checkout libsmpp34 + checkout libasn1c + checkout libgtpnl + checkout libusrp + checkout osmo-iuh + checkout osmo-ggsn + checkout osmo-sgsn + checkout openbsc + checkout osmo-pcap + checkout osmo-trx + checkout osmo-sip-connector + checkout osmo-bts + checkout osmo-pcu + checkout osmo-hlr + checkout osmo-mgw + checkout osmo-msc + checkout osmo-bsc + checkout simtrace2 -cd "$TOP/$PROJ" -osc ci -m "Latest Tagged versions of $DT" + build limesuite --git-upstream-tree="$(get_last_tag limesuite)" + build libosmocore + build libosmo-sccp + build libosmo-abis + build libosmo-netif + build libsmpp34 + build libasn1c + build libgtpnl + build libusrp + build osmo-iuh + build osmo-ggsn + build osmo-sgsn + build openbsc + build osmo-pcap + build osmo-trx + build osmo-sip-connector + build osmo-bts + build osmo-pcu + build osmo-hlr + build osmo-mgw + build osmo-msc + build osmo-bsc + build simtrace2 + + cd "$TOP/$PROJ" + osc ci -m "Latest Tagged versions of $DT" +} + +build_osmocom -- To view, visit https://gerrit.osmocom.org/11239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I786c6f4ad4b4e43d1692c1588d2ad2194d0b25a4 Gerrit-Change-Number: 11239 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 15:09:53 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 5 Oct 2018 15:09:53 +0000 Subject: Change in osmo-trx[master]: examples: Use logging level 'set-all' instead of 'all' In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11242 ) Change subject: examples: Use logging level 'set-all' instead of 'all' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic52ce0defc774acb8e24947ed22cf2a56b8b0bb0 Gerrit-Change-Number: 11242 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 05 Oct 2018 15:09:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 15:49:06 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 5 Oct 2018 15:49:06 +0000 Subject: Change in osmo-bsc[master]: gsm_08_08: abort complete L3 3 msg gen when no codecs are set In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11236 to look at the new patch set (#2). Change subject: gsm_08_08: abort complete L3 3 msg gen when no codecs are set ...................................................................... gsm_08_08: abort complete L3 3 msg gen when no codecs are set The COMPLETE LAYER 3 INFORMATION message should contain a Codec List (BSS Supported) IE. The contents of this list depend on the BTS capabilities and of the MSC configuration (allowed codecs). There may be cases where (due to miss-configuration) the list is empty. In those cases the BSC hits an assertion because the encoding of the overall message fails when the codec list is empty. A check is needed. - Check codec list before message generation, abort if the coded list is empty. Change-Id: I119607047a132b75b3077bbe56c97936d8ae6c96 Related: OS#3625 --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/36/11236/2 -- To view, visit https://gerrit.osmocom.org/11236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I119607047a132b75b3077bbe56c97936d8ae6c96 Gerrit-Change-Number: 11236 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 15:49:06 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 5 Oct 2018 15:49:06 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_msc: Set reasonable codec list defaults In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11237 to look at the new patch set (#2). Change subject: osmo_bsc_msc: Set reasonable codec list defaults ...................................................................... osmo_bsc_msc: Set reasonable codec list defaults When the user sets no codec-list in the msc node, the configuration will end up with an empty codec list. This is a useless configuration. There should be a sane default setting. - Set all possible codecs as default for codec-list Change-Id: I3749a65828c788f38c22f0a5314533f4516da3ed Related: OS#3625 --- M src/osmo-bsc/osmo_bsc_msc.c 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/37/11237/2 -- To view, visit https://gerrit.osmocom.org/11237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3749a65828c788f38c22f0a5314533f4516da3ed Gerrit-Change-Number: 11237 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 15:49:08 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 5 Oct 2018 15:49:08 +0000 Subject: Change in osmo-bsc[master]: codec_pref: check codec configuration before start Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11243 Change subject: codec_pref: check codec configuration before start ...................................................................... codec_pref: check codec configuration before start In networks with a couple of different BTSs it may be likely that one accidently sets up a codec configuration (codec-support)) that will be mutually exclusive towards the codec configuration for the MSC (codec-list). We need a check that validates the configuration before start to catch such configuration flaws quickly. - Add a check that checks each MSC codec-list against each BTS codec-support setting. Change-Id: Ice827896bab1a2330741e0fccc731a04f1a07d38 Related: OS#3625 --- M include/osmocom/bsc/codec_pref.h M src/osmo-bsc/codec_pref.c M src/osmo-bsc/osmo_bsc_main.c 3 files changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/43/11243/1 diff --git a/include/osmocom/bsc/codec_pref.h b/include/osmocom/bsc/codec_pref.h index 3085ad4..d62d29f 100644 --- a/include/osmocom/bsc/codec_pref.h +++ b/include/osmocom/bsc/codec_pref.h @@ -21,3 +21,5 @@ void gen_bss_supported_codec_list(struct gsm0808_speech_codec_list *scl, const struct bsc_msc_data *msc, const struct gsm_bts *bts); + +int check_codec_pref(struct llist_head *mscs); diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index afecaa3..0f0ffa5 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -348,3 +348,29 @@ } } +/*! Visit the codec settings for the MSC and for each BTS in order to make sure + * that the configuration does not contain any combinations that lead into a + * mutually exclusive codec configuration (empty intersection). + * \param[in] mscs list head of the msc list. + * \returns 0 on success, -1 in case an invalid setting is found. */ +int check_codec_pref(struct llist_head *mscs) +{ + struct bsc_msc_data *msc; + struct gsm_bts *bts; + struct gsm0808_speech_codec_list scl; + int rc = 0; + + llist_for_each_entry(msc, mscs, entry) { + llist_for_each_entry(bts, &msc->network->bts_list, list) { + gen_bss_supported_codec_list(&scl, msc, bts); + if (scl.len <= 0) { + LOGP(DMSC, LOGL_FATAL, + "codec-support of BTS %u does not intersect with codec-list of MSC %u\n", + bts->nr, msc->nr); + rc = -1; + } + } + } + + return rc; +} diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 468b58e..67fccd3 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -59,6 +59,7 @@ #include #include #include +#include #include @@ -881,6 +882,10 @@ exit(1); } + rc = check_codec_pref(&bsc_gsmnet->bsc_data->mscs); + if (rc < 0) + LOGP(DMSC, LOGL_ERROR, "Configuration contains mutually exclusive codec settings -- check configuration!\n"); + llist_for_each_entry(msc, &bsc_gsmnet->bsc_data->mscs, entry) { if (osmo_bsc_msc_init(msc) != 0) { LOGP(DNAT, LOGL_ERROR, "Failed to start up. Exiting.\n"); -- To view, visit https://gerrit.osmocom.org/11243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ice827896bab1a2330741e0fccc731a04f1a07d38 Gerrit-Change-Number: 11243 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 15:49:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 5 Oct 2018 15:49:44 +0000 Subject: Change in osmo-msc[master]: GSUP client: send CN domain IE on LU request Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11244 Change subject: GSUP client: send CN domain IE on LU request ...................................................................... GSUP client: send CN domain IE on LU request Give the HLR a chance to send us updated subscriber data by indicating the CN domain to be Circuit Switched, only during a LU Request GSUP message. Adjust msc_vlr_tests to expect the added GSUP CN domain IE to indicate CS, i.e. append '280102'. Related: OS#3601 Change-Id: I0c2d33fbfdb4728e480679120d06b7f3a2ccfd76 --- M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.c M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.c M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.c 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_ss.c M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_test_umts_authen.err 25 files changed, 176 insertions(+), 175 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/44/11244/1 diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index bfaf333..f7572f2 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -622,6 +622,7 @@ int rc; gsup_msg.message_type = OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST; + gsup_msg.cn_domain = vsub->vlr->cfg.is_ps ? OSMO_GSUP_CN_DOMAIN_PS : OSMO_GSUP_CN_DOMAIN_CS; rc = vlr_subscr_tx_gsup_message(vsub, &gsup_msg); return rc; diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c b/tests/msc_vlr/msc_vlr_test_authen_reuse.c index 3b80e83..6591557 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c @@ -85,7 +85,7 @@ if (via_ran == RAN_GERAN_A) { btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0"); + gsup_expect_tx("04010809710000000156f0280102"); ms_sends_msg("0554" "e229c19e" "2104" "791f2e41"); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -98,7 +98,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0"); + gsup_expect_tx("04010809710000000156f0280102"); ms_sends_security_mode_complete(); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.err b/tests/msc_vlr/msc_vlr_test_authen_reuse.err index e25396d..5f5db2f 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.err +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.err @@ -72,8 +72,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000010650: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000010650){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -506,8 +506,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -948,8 +948,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000010650: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000010650){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -1462,8 +1462,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -1997,8 +1997,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000010650: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000010650){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -2337,8 +2337,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 50bf174..5819e51 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -122,7 +122,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0"); + gsup_expect_tx("04010809710000000156f0280102"); ms_sends_security_mode_complete(); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index 7a70b4b..19cb25d 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -88,8 +88,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -466,8 +466,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -849,8 +849,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -1200,8 +1200,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -1544,8 +1544,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c index 6555fbd..8129781 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c @@ -75,7 +75,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -269,7 +269,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -446,7 +446,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("05545afc8d72"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -551,7 +551,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -654,7 +654,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -785,7 +785,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0"); + gsup_expect_tx("04010809710000000156f0280102"); ms_sends_msg("0554" "9b36efdf"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index 954934a..51f7367 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -90,8 +90,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -541,8 +541,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -961,8 +961,8 @@ DVLR upd_hlr_vlr_fsm(LU:50462976){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:50462976){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:50462976) DVLR upd_hlr_vlr_fsm(LU:50462976){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:50462976){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:50462976){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -1201,8 +1201,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -1438,8 +1438,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -1688,8 +1688,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000010650: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000010650){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c index 4254066..8f256b1 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c @@ -77,7 +77,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -292,7 +292,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -531,7 +531,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -641,7 +641,7 @@ vlr_subscr_put(vsub); btw("MS sends Ciphering Mode Complete with IMEISV, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("063217094b32244332244372f5"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -736,7 +736,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -915,7 +915,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0"); + gsup_expect_tx("04010809710000000156f0280102"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -1109,7 +1109,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -1330,7 +1330,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 4a13b68..cc8659c 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -97,8 +97,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT @@ -601,8 +601,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT @@ -1140,8 +1140,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT @@ -1388,8 +1388,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - Subscriber has the IMEISV @@ -1611,8 +1611,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT @@ -1873,8 +1873,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT @@ -2353,8 +2353,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT @@ -2853,8 +2853,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.c b/tests/msc_vlr/msc_vlr_test_hlr_reject.c index 8dfe1f4..13bed42 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.c +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.c @@ -114,7 +114,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -203,7 +203,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -326,7 +326,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -371,7 +371,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -400,7 +400,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -424,7 +424,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err index f151838..505a3b4 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err @@ -233,8 +233,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -388,8 +388,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -546,8 +546,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -783,8 +783,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -1055,8 +1055,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -1137,8 +1137,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c index ce3f3d0..a237695 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c +++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c @@ -73,7 +73,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err index dab8e2c..c6cbeab 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err @@ -117,8 +117,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.c b/tests/msc_vlr/msc_vlr_test_ms_timeout.c index ddb6324..a4851b3 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.c +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.c @@ -125,7 +125,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -198,7 +198,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index 43eb3d4..d2b7ef3 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -180,8 +180,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -383,8 +383,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c index afa03c3..b34ddd7 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.c +++ b/tests/msc_vlr/msc_vlr_test_no_authen.c @@ -35,7 +35,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -177,7 +177,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -327,7 +327,7 @@ BTW("subscriber sends LU Request, this time with the TMSI"); btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130" "05f4" "03020100"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -400,7 +400,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -471,7 +471,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -555,7 +555,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0559094332244332244372f5"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -618,7 +618,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0559094332244332244372f5"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -698,7 +698,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0559094332244332244372f5"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -754,7 +754,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0559095332244332244372f6"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -840,7 +840,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0559094332244332244372f5"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -934,7 +934,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index f2453af..fb0582b 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -28,8 +28,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -351,8 +351,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -674,8 +674,8 @@ DVLR upd_hlr_vlr_fsm(LU:50462976){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:50462976){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:50462976) DVLR upd_hlr_vlr_fsm(LU:50462976){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:50462976){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:50462976){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:50462976){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -866,8 +866,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -1055,8 +1055,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -1286,8 +1286,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -1461,8 +1461,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -1668,8 +1668,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -1836,8 +1836,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -2046,8 +2046,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -2266,8 +2266,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c index 580135a..d206571 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c @@ -30,7 +30,7 @@ btw("Location Update Request on one connection"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -73,7 +73,7 @@ { btw("Location Update Request"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 84436d3..0a964ac 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -28,8 +28,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -187,8 +187,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -317,8 +317,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -454,8 +454,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -586,8 +586,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -783,8 +783,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -983,8 +983,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -1171,8 +1171,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -1398,8 +1398,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -1645,8 +1645,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH diff --git a/tests/msc_vlr/msc_vlr_test_rest.c b/tests/msc_vlr/msc_vlr_test_rest.c index aef1df5..247e7ae 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.c +++ b/tests/msc_vlr/msc_vlr_test_rest.c @@ -85,7 +85,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -116,7 +116,7 @@ BTW("verify that the MS can send another LU request"); btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -168,7 +168,7 @@ thwart_rx_non_initial_requests(); btw("MS tells us the IMSI, causes a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0559089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index 395a138..fc3a85d 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -120,8 +120,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -241,8 +241,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -425,8 +425,8 @@ DVLR upd_hlr_vlr_fsm(LU:591536962){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:591536962){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:591536962) DVLR upd_hlr_vlr_fsm(LU:591536962){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:591536962){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:591536962){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED diff --git a/tests/msc_vlr/msc_vlr_test_ss.c b/tests/msc_vlr/msc_vlr_test_ss.c index 88e8036..34aa634 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.c +++ b/tests/msc_vlr/msc_vlr_test_ss.c @@ -47,7 +47,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err index 7255e7d..0f10910 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.err +++ b/tests/msc_vlr/msc_vlr_test_ss.err @@ -28,8 +28,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -232,8 +232,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c index 03f516f..62e280e 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.c +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c @@ -124,7 +124,7 @@ if (via_ran == RAN_GERAN_A) { btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0"); + gsup_expect_tx("04010809710000000156f0280102"); ms_sends_msg("0554" "e229c19e" "2104" "791f2e41"); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -137,7 +137,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0"); + gsup_expect_tx("04010809710000000156f0280102"); ms_sends_security_mode_complete(); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -493,7 +493,7 @@ if (via_ran == RAN_GERAN_A) { btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0"); + gsup_expect_tx("04010809710000000156f0280102"); ms_sends_msg("0554" "1df5f0b4" "2104" "f22b696e"); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -506,7 +506,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0"); + gsup_expect_tx("04010809710000000156f0280102"); ms_sends_security_mode_complete(); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index 4a060af..538a3d9 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -72,8 +72,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000010650: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000010650){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -552,8 +552,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -1071,8 +1071,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000010650: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000010650){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -1305,8 +1305,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 -- To view, visit https://gerrit.osmocom.org/11244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0c2d33fbfdb4728e480679120d06b7f3a2ccfd76 Gerrit-Change-Number: 11244 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 15:55:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 5 Oct 2018 15:55:29 +0000 Subject: Change in osmo-hlr[master]: store gsup peer upon accepting LU In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11232 to look at the new patch set (#3). Change subject: store gsup peer upon accepting LU ...................................................................... store gsup peer upon accepting LU Store the GSUP client's IPA_IDTAG_SERNR in vlr_number or sgsn_number (depending on is_ps), just before sending the Insert Subscriber Data message after a successful LU Req. Log about it. Original patch: Ib2611421f3638eadc361787af801fffe9a34bd8a by laforge Related: OS#2796 Change-Id: If438664faa5d68404f465f8b2002c6d03bbf3ceb --- M src/hlr.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/32/11232/3 -- To view, visit https://gerrit.osmocom.org/11232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If438664faa5d68404f465f8b2002c6d03bbf3ceb Gerrit-Change-Number: 11232 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 15:57:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 5 Oct 2018 15:57:05 +0000 Subject: Change in osmo-hlr[master]: store gsup peer upon accepting LU In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11232 ) Change subject: store gsup peer upon accepting LU ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11232/3/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/#/c/11232/3/src/hlr.c at 308 PS3, Line 308: osmo_quote_str((const char*)luop->peer, -1)); Ah sure. Now I'm escaping the string, in case it contains unprintable characters. I'm still assuming it is nul terminated though, because luop->peer doesn't have a len and also seems to assume so... maybe that needs a FIXME to allow null bytes in the GT? -- To view, visit https://gerrit.osmocom.org/11232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If438664faa5d68404f465f8b2002c6d03bbf3ceb Gerrit-Change-Number: 11232 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 05 Oct 2018 15:57:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 17:20:02 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 5 Oct 2018 17:20:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: don't overwrite the expected meas results In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11228 ) Change subject: BTS_Tests.ttcn: fix: don't overwrite the expected meas results ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie902bfc7619181b528eafbce367c87e0b062243a Gerrit-Change-Number: 11228 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 05 Oct 2018 17:20:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 17:55:16 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 5 Oct 2018 17:55:16 +0000 Subject: Change in osmo-sip-connector[master]: Fix mncc socket name In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/11240 ) Change subject: Fix mncc socket name ...................................................................... Patch Set 1: > Change has been successfully merged by Harald Welte Hmm.. broken now for anybody who was using osmo-nitb... of course they can fix it by passing the socket name to nitb -- To view, visit https://gerrit.osmocom.org/11240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5e0dbf1aafe1b9c3776c49a08a76d64dd4fe9cc5 Gerrit-Change-Number: 11240 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Keith Whyte Gerrit-Comment-Date: Fri, 05 Oct 2018 17:55:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 5 21:43:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 5 Oct 2018 21:43:46 +0000 Subject: Change in osmo-gsm-manuals[master]: add SGs / CSFB related dot + msc files Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11245 Change subject: add SGs / CSFB related dot + msc files ...................................................................... add SGs / CSFB related dot + msc files Those graphs + message sequence charts are not yet used by any of our manuals, but they should become used by the OsmoMSC user manual once SGs interface support is added. Related: OS#2583 Change-Id: Idfd3a66c18131b5458d183b8e66f62eaaab65991 --- A OsmoMSC/images/sgs-imsi_attach_lu.msc A OsmoMSC/images/sgs-mo_call_no_ps_ho.msc A OsmoMSC/images/sgs-mo_sms_idle.msc A OsmoMSC/images/sgs-mt_call_idle.msc A OsmoMSC/images/sgs-mt_sms_idle.msc A common/images/lte-eps-sgs.dot A common/images/lte-eps.dot 7 files changed, 135 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/45/11245/1 diff --git a/OsmoMSC/images/sgs-imsi_attach_lu.msc b/OsmoMSC/images/sgs-imsi_attach_lu.msc new file mode 100644 index 0000000..e62c2b8 --- /dev/null +++ b/OsmoMSC/images/sgs-imsi_attach_lu.msc @@ -0,0 +1,15 @@ +msc { + UE, MME, VLR [label="MSC/VLR"], HSS [label="HSS/HLR"]; + + UE => MME [label="Attach Request"]; + UE box HSS [label="Steps 3..16 of LTE Attach procedure TS 23.401"]; + MME box MME [label="Derive VLR Number"]; + MME => VLR [label="LU Request"]; + VLR box VLR [label="Create SGs Association"]; + VLR box HSS [label="MAP/GSUP UL / ISD"]; + MME <= VLR [label="LU Accept"]; + UE box HSS [label="Steps 17..16 of LTE Attach procedure TS 23.401"]; + |||; + ...; + MME <= VLR [label="Paging Request"]; +} diff --git a/OsmoMSC/images/sgs-mo_call_no_ps_ho.msc b/OsmoMSC/images/sgs-mo_call_no_ps_ho.msc new file mode 100644 index 0000000..f886c89 --- /dev/null +++ b/OsmoMSC/images/sgs-mo_call_no_ps_ho.msc @@ -0,0 +1,18 @@ +msc { + hscale=2; + UE, ENB [label="eNodeB"], BSS, MME, VLR [label="MSC/VLR"], HSS [label="HSS/HLR"]; + + UE => MME [label="NAS Extended Service Request"]; + ENB <= MME [label="S1-AP UE Context Mod Req with CSFB"]; + ENB => MME [label="S1-AP UE Context Mod Resp"]; + UE <= ENB [label="NACC (Network Assisted Cell Change)"]; + ENB => MME [label="S1-AP S1 UE Context Release Req"]; + UE box MME [label="S1 UE Context Release"]; + + UE box HSS [label="UE changes RAT then LA and/or RA update"]; + UE <=> HSS [label="PS Suspend (TS 23.060)"]; + + UE => BSS [label="CM SERV REQ"]; + BSS => VLR [label="COMPL L3 (CM SERV REQ)"]; + UE <=> VLR [label="Normal 2G Voice Call"]; +} diff --git a/OsmoMSC/images/sgs-mo_sms_idle.msc b/OsmoMSC/images/sgs-mo_sms_idle.msc new file mode 100644 index 0000000..5acc0e8 --- /dev/null +++ b/OsmoMSC/images/sgs-mo_sms_idle.msc @@ -0,0 +1,21 @@ +msc { + hscale=2; + UE, MME, VLR [label="MSC/VLR"], HSS [label="HSS/HLR"], SMSC; + + UE box HSS [label="EPS/IMSI attach procedure"]; + ...; + UE box MME [label="UE triggered Service Request"]; + UE => MME [label="UL NAS Transport"]; + MME => VLR [label="SGsAP UPLINK UNITDATA\n(CP-DATA/RP-DATA/TPDU)"]; + VLR => SMSC [label="MAP/GSUP Forward SM"]; + MME <= VLR [label="SGsAP DOWNLINK UNITDATA"]; + UE <= MME [label="DL NAS Transport"]; + ...; + + VLR <= SMSC [label="Delivery Report"]; + MME <= VLR [label="SGsAP DOWNLINK UNITDATA"]; + UE <= MME [label="DL NAS Transport"]; + UE => MME [label="UL NAS Transport"]; + MME => VLR [label="SGsAP UPLINK UNITDATA"]; + MME <= VLR [label="SGsAP RELEASE REQ"]; +} diff --git a/OsmoMSC/images/sgs-mt_call_idle.msc b/OsmoMSC/images/sgs-mt_call_idle.msc new file mode 100644 index 0000000..b3cff3c --- /dev/null +++ b/OsmoMSC/images/sgs-mt_call_idle.msc @@ -0,0 +1,17 @@ +msc { + hscale=2; + UE, ENB [label="eNodeB"], BSS, MME, VLR [label="MSC/VLR"], PSTN; + + VLR <= PSTN [label="ISUP IAM or SIP INVITE"]; + MME <= VLR [label="SGsAP PAGING REQUEST"]; + ENB <= MME [label="Paging"]; + UE <= MME [label="Paging"]; + + UE => MME [label="Extended Service Req"]; + MME => VLR [label="SGsAP SERVICE REQUEST"]; + ENB <= MME [label="Initial UE Ctx Setup"]; + + UE => BSS [label="Paging Response"]; + BSS => VLR [label="COMPL L3 (PAGING RESP)"]; + UE <=> VLR [label="Normal 2G Voice Call"]; +} diff --git a/OsmoMSC/images/sgs-mt_sms_idle.msc b/OsmoMSC/images/sgs-mt_sms_idle.msc new file mode 100644 index 0000000..7b453e0 --- /dev/null +++ b/OsmoMSC/images/sgs-mt_sms_idle.msc @@ -0,0 +1,22 @@ +msc { + hscale=2; + UE, MME, VLR [label="MSC/VLR"], HSS [label="HSS/HLR"], SMSC; + + UE box HSS [label="EPS/IMSI attach procedure"]; + ...; + + VLR <= SMSC [label="MAP/GSUP ForwardSM"]; + MME <= VLR [label="SGsAP PAGING"]; + UE <= MME [label="Paging"]; + UE box MME [label="Service Request"]; + MME => VLR [label="SGsAP SERVICE REQ"]; + MME <= VLR [label="SGsAP DL UNITDATA\n(CP-DATA/RP-DATA/TPDU)"]; + UE <= MME [label="DL NAS Transport"]; + UE => MME [label="UL NAS Transport"]; + MME => VLR [label="SGsAP UL UNITDATA"]; + ...; + UE => MME [label="UL NAS Transport"]; + MME => VLR [label="SGsAP UL UNITDATA"]; + VLR => SMSC [label="Delivery report"]; + MME <= VLR [label="SGsAP RELEASE REQ"]; +} diff --git a/common/images/lte-eps-sgs.dot b/common/images/lte-eps-sgs.dot new file mode 100644 index 0000000..a9a714d --- /dev/null +++ b/common/images/lte-eps-sgs.dot @@ -0,0 +1,28 @@ +digraph G { + rankdir=LR; + + HSS [label="HSS/HLR"]; + + { rank=same; MME; MSC; } + + SGW [label="S-GW"]; + PGW [label="P-GW"]; + + UE -> eNodeB [label="Radio"]; + eNodeB -> MME [label="S1-MME\nControl Plane"]; + eNodeB -> SGW [label="S1-U\nUser Plane"]; + MME -> HSS [label="S6a\nDIAMETER"]; + MME -> SGW [label="S11"]; + SGW -> PGW [label="S5/S8\nGTP"]; + PGW -> Internet [label="SGi"]; + + UE -> GERAN [label="Um"]; + UE -> UTRAN [label="Uu"]; + GERAN-> MSC [label="A"]; + UTRAN-> MSC [label="IuCS"]; + + MME -> MSC [label="SGs"]; + + MSC -> HSS [label="MAP"]; + MSC -> SMSC [label="MAP"]; +} diff --git a/common/images/lte-eps.dot b/common/images/lte-eps.dot new file mode 100644 index 0000000..d48bce2 --- /dev/null +++ b/common/images/lte-eps.dot @@ -0,0 +1,14 @@ +digraph G { + rankdir=LR; + + SGW [label="S-GW"]; + PGW [label="P-GW"]; + + UE -> eNodeB [label="Radio"]; + eNodeB -> MME [label="S1-MME\nControl Plane"]; + eNodeB -> SGW [label="S1-U\nUser Plane"]; + MME -> HSS [label="S6a\nDIAMETER"]; + MME -> SGW [label="S11"]; + SGW -> PGW [label="S5/S8\nGTP"]; + PGW -> Internet [label="SGi"]; +} -- To view, visit https://gerrit.osmocom.org/11245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idfd3a66c18131b5458d183b8e66f62eaaab65991 Gerrit-Change-Number: 11245 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 09:44:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 6 Oct 2018 09:44:58 +0000 Subject: Change in osmocom-bb[master]: layer23/common: introduce L23SAP API for L1CTL Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11246 Change subject: layer23/common: introduce L23SAP API for L1CTL ...................................................................... layer23/common: introduce L23SAP API for L1CTL Having a separate abstraction layer between both L1CTL interface and the upper layers would allow to keep the L1CTL implementation clean from GSMTAP / LAPDm / measurement specific stuff. Change-Id: I22d7932ddc03c692f2616726ced53b6e8eef822d --- M src/host/layer23/include/osmocom/bb/common/Makefile.am A src/host/layer23/include/osmocom/bb/common/l23sap.h M src/host/layer23/include/osmocom/bb/common/logging.h M src/host/layer23/src/common/Makefile.am M src/host/layer23/src/common/l1ctl.c A src/host/layer23/src/common/l23sap.c M src/host/layer23/src/common/logging.c 7 files changed, 134 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/46/11246/1 diff --git a/src/host/layer23/include/osmocom/bb/common/Makefile.am b/src/host/layer23/include/osmocom/bb/common/Makefile.am index cd3437e..5a137df 100644 --- a/src/host/layer23/include/osmocom/bb/common/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/common/Makefile.am @@ -1,2 +1,2 @@ noinst_HEADERS = l1ctl.h l1l2_interface.h l23_app.h logging.h \ - networks.h gps.h sysinfo.h osmocom_data.h utils.h + networks.h gps.h sysinfo.h osmocom_data.h utils.h l23sap.h diff --git a/src/host/layer23/include/osmocom/bb/common/l23sap.h b/src/host/layer23/include/osmocom/bb/common/l23sap.h new file mode 100644 index 0000000..814fb7d --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/common/l23sap.h @@ -0,0 +1,15 @@ +#pragma once + +#include +#include + +/* Logical channel link ID */ +#define LID_SACCH 0x40 +#define LID_DEDIC 0x00 + +#define CHAN_IS_SACCH(link_id) \ + ((link_id & 0xc0) == LID_SACCH) + +int l23sap_data_ind(struct osmocom_ms *ms, struct msgb *msg); +int l23sap_data_conf(struct osmocom_ms *ms, struct msgb *msg); +int l23sap_rach_conf(struct osmocom_ms *ms, struct msgb *msg); diff --git a/src/host/layer23/include/osmocom/bb/common/logging.h b/src/host/layer23/include/osmocom/bb/common/logging.h index bf6e6aa..10b2f7f 100644 --- a/src/host/layer23/include/osmocom/bb/common/logging.h +++ b/src/host/layer23/include/osmocom/bb/common/logging.h @@ -25,6 +25,7 @@ DMOB, DPRIM, DLUA, + DL23SAP, }; extern const struct log_info log_info; diff --git a/src/host/layer23/src/common/Makefile.am b/src/host/layer23/src/common/Makefile.am index b76094c..e1b7b44 100644 --- a/src/host/layer23/src/common/Makefile.am +++ b/src/host/layer23/src/common/Makefile.am @@ -3,4 +3,4 @@ noinst_LIBRARIES = liblayer23.a liblayer23_a_SOURCES = l1ctl.c l1l2_interface.c sap_interface.c \ - logging.c networks.c sim.c sysinfo.c gps.c l1ctl_lapdm_glue.c utils.c + logging.c networks.c sim.c sysinfo.c gps.c l1ctl_lapdm_glue.c utils.c l23sap.c diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 6f4a6d8..8a45ebe 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -43,9 +43,9 @@ #include #include +#include #include #include -#include #include extern struct gsmtap_inst *gsmtap_inst; @@ -117,34 +117,21 @@ static int rx_l1_rach_conf(struct osmocom_ms *ms, struct msgb *msg) { - struct lapdm_entity *le = &ms->lapdm_channel.lapdm_dcch; - struct osmo_phsap_prim pp; - struct l1ctl_info_dl *dl; - - if (msgb_l1len(msg) < sizeof(*dl)) { + if (msgb_l1len(msg) < sizeof(struct l1ctl_info_dl)) { LOGP(DL1C, LOGL_ERROR, "RACH CONF MSG too short " "(len=%u), missing DL info header\n", msgb_l1len(msg)); msgb_free(msg); return -1; } - dl = (struct l1ctl_info_dl *) msg->l1h; - msg->l2h = msg->l3h = dl->payload; - - osmo_prim_init(&pp.oph, SAP_GSM_PH, PRIM_PH_RACH, - PRIM_OP_CONFIRM, msg); - pp.u.rach_ind.fn = ntohl(dl->frame_nr); - - return lapdm_phsap_up(&pp.oph, le); + return l23sap_rach_conf(ms, msg); } /* Receive L1CTL_DATA_IND (Data Indication from L1) */ -static int rx_ph_data_ind(struct osmocom_ms *ms, struct msgb *msg) +static int rx_data_ind(struct osmocom_ms *ms, struct msgb *msg) { - struct osmo_phsap_prim pp; struct l1ctl_info_dl *dl; struct l1ctl_data_ind *ccch; - struct lapdm_entity *le; struct rx_meas_stat *meas = &ms->meas; uint8_t chan_type, chan_ts, chan_ss; uint8_t gsmtap_chan_type; @@ -238,46 +225,22 @@ gsmtap_chan_type, chan_ss, tm.fn, dl->rx_level-110, dl->snr, ccch->data, sizeof(ccch->data)); - /* determine LAPDm entity based on SACCH or not */ - if (dl->link_id & 0x40) - le = &ms->lapdm_channel.lapdm_acch; - else - le = &ms->lapdm_channel.lapdm_dcch; - - osmo_prim_init(&pp.oph, SAP_GSM_PH, PRIM_PH_DATA, - PRIM_OP_INDICATION, msg); - pp.u.data.chan_nr = dl->chan_nr; - pp.u.data.link_id = dl->link_id; - - /* send it up into LAPDm */ - return lapdm_phsap_up(&pp.oph, le); + /* Send it up towards LAPDm via L23SAP */ + return l23sap_data_ind(ms, msg); } /* Receive L1CTL_DATA_CONF (Data Confirm from L1) */ -static int rx_ph_data_conf(struct osmocom_ms *ms, struct msgb *msg) +static int rx_data_conf(struct osmocom_ms *ms, struct msgb *msg) { - struct osmo_phsap_prim pp; - struct l1ctl_info_dl *dl = (struct l1ctl_info_dl *) msg->l1h; - struct lapdm_entity *le; - - if (msgb_l1len(msg) < sizeof(*dl)) { + if (msgb_l1len(msg) < sizeof(struct l1ctl_info_dl)) { LOGP(DL1C, LOGL_ERROR, "DATA CONF MSG too short (len=%u), " "missing UL info header\n", msgb_l1len(msg)); msgb_free(msg); return -1; } - osmo_prim_init(&pp.oph, SAP_GSM_PH, PRIM_PH_RTS, - PRIM_OP_INDICATION, msg); - - /* determine LAPDm entity based on SACCH or not */ - if (dl->link_id & 0x40) - le = &ms->lapdm_channel.lapdm_acch; - else - le = &ms->lapdm_channel.lapdm_dcch; - - /* send it up into LAPDm */ - return lapdm_phsap_up(&pp.oph, le); + /* Send it up towards LAPDm via L23SAP */ + return l23sap_data_conf(ms, msg); } /* Transmit L1CTL_DATA_REQ */ @@ -919,10 +882,10 @@ msgb_free(msg); break; case L1CTL_DATA_IND: - rc = rx_ph_data_ind(ms, msg); + rc = rx_data_ind(ms, msg); break; case L1CTL_DATA_CONF: - rc = rx_ph_data_conf(ms, msg); + rc = rx_data_conf(ms, msg); break; case L1CTL_RESET_IND: case L1CTL_RESET_CONF: diff --git a/src/host/layer23/src/common/l23sap.c b/src/host/layer23/src/common/l23sap.c new file mode 100644 index 0000000..b07265a --- /dev/null +++ b/src/host/layer23/src/common/l23sap.c @@ -0,0 +1,98 @@ +/* + * L23SAP (L2&3 Service Access Point), an interface between + * L1 implementation and the upper layers (i.e. L2&3). + * + * (C) 2011 by Harald Welte + * (C) 2018 by Vadim Yanitskiy + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include +#include +#include + +#include +#include + +#include +#include +#include +#include + +#include +#include +#include + +int l23sap_data_ind(struct osmocom_ms *ms, struct msgb *msg) +{ + struct l1ctl_info_dl *dl = (struct l1ctl_info_dl *) msg->l1h; + struct osmo_phsap_prim pp; + struct lapdm_entity *le; + + /* Init a new DATA IND primitive */ + osmo_prim_init(&pp.oph, SAP_GSM_PH, PRIM_PH_DATA, + PRIM_OP_INDICATION, msg); + pp.u.data.chan_nr = dl->chan_nr; + pp.u.data.link_id = dl->link_id; + + /* Determine LAPDm entity based on SACCH or not */ + if (CHAN_IS_SACCH(dl->link_id)) + le = &ms->lapdm_channel.lapdm_acch; + else + le = &ms->lapdm_channel.lapdm_dcch; + + /* Send it up into LAPDm */ + return lapdm_phsap_up(&pp.oph, le); +} + +int l23sap_data_conf(struct osmocom_ms *ms, struct msgb *msg) +{ + struct l1ctl_info_dl *dl = (struct l1ctl_info_dl *) msg->l1h; + struct osmo_phsap_prim pp; + struct lapdm_entity *le; + + osmo_prim_init(&pp.oph, SAP_GSM_PH, PRIM_PH_RTS, + PRIM_OP_INDICATION, msg); + + /* Determine LAPDm entity based on SACCH or not */ + if (CHAN_IS_SACCH(dl->link_id)) + le = &ms->lapdm_channel.lapdm_acch; + else + le = &ms->lapdm_channel.lapdm_dcch; + + /* Send it up into LAPDm */ + return lapdm_phsap_up(&pp.oph, le); +} + +int l23sap_rach_conf(struct osmocom_ms *ms, struct msgb *msg) +{ + struct l1ctl_info_dl *dl = (struct l1ctl_info_dl *) msg->l1h; + struct osmo_phsap_prim pp; + + osmo_prim_init(&pp.oph, SAP_GSM_PH, PRIM_PH_RACH, + PRIM_OP_CONFIRM, msg); + pp.u.rach_ind.fn = ntohl(dl->frame_nr); + + /* TODO: do we really need this? */ + msg->l2h = msg->l3h = dl->payload; + + /* Send it up into LAPDm */ + return lapdm_phsap_up(&pp.oph, + &ms->lapdm_channel.lapdm_dcch); +} diff --git a/src/host/layer23/src/common/logging.c b/src/host/layer23/src/common/logging.c index ed79991..2f43fff 100644 --- a/src/host/layer23/src/common/logging.c +++ b/src/host/layer23/src/common/logging.c @@ -145,6 +145,12 @@ .color = "\033[1;32m", .enabled = 1, .loglevel = LOGL_DEBUG, }, + [DL23SAP] = { + .name = "DL23SAP", + .description = "L2&3 SAP (Service Access Point)", + .color = "\033[1;36m", + .enabled = 1, .loglevel = LOGL_DEBUG, + }, }; const struct log_info log_info = { -- To view, visit https://gerrit.osmocom.org/11246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I22d7932ddc03c692f2616726ced53b6e8eef822d Gerrit-Change-Number: 11246 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 09:44:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 6 Oct 2018 09:44:58 +0000 Subject: Change in osmocom-bb[master]: layer23/common: move SIM APDU caching from l1ctl.c Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11247 Change subject: layer23/common: move SIM APDU caching from l1ctl.c ...................................................................... layer23/common: move SIM APDU caching from l1ctl.c L1CTL implementation (i.e. l1ctl.c) is not a good place for the SIM specific stuff. Let's move it to the proper place (i.e. sim.c). As a bonus, this change fixes a possible problem of loosing the cached APDUs if two or more L2&3 applications are using a single LAPDm connection. The APDU buffer is dedicated per MS now. Change-Id: I564c610e45aa3b630ca5d1ec6bc1cace0dc9c566 --- M src/host/layer23/include/osmocom/bb/common/sim.h M src/host/layer23/src/common/l1ctl.c M src/host/layer23/src/common/sim.c 3 files changed, 29 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/47/11247/1 diff --git a/src/host/layer23/include/osmocom/bb/common/sim.h b/src/host/layer23/include/osmocom/bb/common/sim.h index 95d2147..8b1f830 100644 --- a/src/host/layer23/include/osmocom/bb/common/sim.h +++ b/src/host/layer23/include/osmocom/bb/common/sim.h @@ -176,6 +176,10 @@ uint8_t reset; uint8_t chv1_remain, chv2_remain; uint8_t unblk1_remain, unblk2_remain; + + /* APDU cache (used by GSMTAP) */ + uint8_t apdu_data[256 + 7]; + uint16_t apdu_len; }; struct sim_hdr { diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 8a45ebe..e78f8be 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -50,9 +50,6 @@ extern struct gsmtap_inst *gsmtap_inst; -static int apdu_len = -1; -static uint8_t apdu_data[256 + 7]; - static struct msgb *osmo_l1_alloc(uint8_t msg_type) { struct l1ctl_hdr *l1h; @@ -583,12 +580,6 @@ struct msgb *msg; uint8_t *dat; - if (length <= sizeof(apdu_data)) { - memcpy(apdu_data, data, length); - apdu_len = length; - } else - apdu_len = -1; - msg = osmo_l1_alloc(L1CTL_SIM_REQ); if (!msg) return -1; @@ -605,13 +596,6 @@ uint16_t len = msgb_l2len(msg); uint8_t *data = msg->data; - if (apdu_len > -1 && apdu_len + len <= sizeof(apdu_data)) { - memcpy(apdu_data + apdu_len, data, len); - apdu_len += len; - gsmtap_send_ex(gsmtap_inst, GSMTAP_TYPE_SIM, 0, 0, 0, 0, 0, 0, - 0, apdu_data, apdu_len); - } - LOGP(DL1C, LOGL_INFO, "SIM %s\n", osmo_hexdump(data, len)); sim_apdu_resp(ms, msg); diff --git a/src/host/layer23/src/common/sim.c b/src/host/layer23/src/common/sim.c index c2d6033..7f5240d 100644 --- a/src/host/layer23/src/common/sim.c +++ b/src/host/layer23/src/common/sim.c @@ -24,11 +24,15 @@ #include #include #include +#include +#include #include #include #include +extern struct gsmtap_inst *gsmtap_inst; + static int sim_process_job(struct osmocom_ms *ms); /* @@ -185,6 +189,16 @@ LOGP(DSIM, LOGL_INFO, "sending APDU (class 0x%02x, ins 0x%02x)\n", data[0], data[1]); + /* Cache this APDU, so it can be sent to GSMTAP on response */ + if (length <= sizeof(ms->sim.apdu_data)) { + memcpy(ms->sim.apdu_data, data, length); + ms->sim.apdu_len = length; + } else { + LOGP(DSIM, LOGL_NOTICE, "Cannot cache SIM APDU " + "(len=%u), so it won't be sent to GSMTAP\n", length); + ms->sim.apdu_len = 0; + } + /* adding SAP client support * it makes more sense to do it here then in L1CTL */ if (ms->subscr.sim_type == GSM_SIM_TYPE_SAP) { @@ -861,6 +875,17 @@ struct gsm1111_response_mfdf_gsm *mfdf_gsm; int i; + /* If there is cached APDU */ + if (ms->sim.apdu_len) { + /* ... and APDU buffer has enough space, send it to GSMTAP */ + if ((ms->sim.apdu_len + length) <= sizeof(ms->sim.apdu_data)) { + memcpy(ms->sim.apdu_data + ms->sim.apdu_len, data, length); + ms->sim.apdu_len += length; + gsmtap_send_ex(gsmtap_inst, GSMTAP_TYPE_SIM, + 0, 0, 0, 0, 0, 0, 0, ms->sim.apdu_data, ms->sim.apdu_len); + } + } + /* ignore, if current job already gone */ if (!sim->job_msg) { LOGP(DSIM, LOGL_ERROR, "received APDU but no job, " -- To view, visit https://gerrit.osmocom.org/11247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I564c610e45aa3b630ca5d1ec6bc1cace0dc9c566 Gerrit-Change-Number: 11247 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 09:44:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 6 Oct 2018 09:44:58 +0000 Subject: Change in osmocom-bb[master]: layer23/common: move GSMTAP handling to L23SAP Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11248 Change subject: layer23/common: move GSMTAP handling to L23SAP ...................................................................... layer23/common: move GSMTAP handling to L23SAP L1CTL implementation (i.e. l1ctl.c) is also not a good place for GSMTAP handling, let's move it to L23SAP. Change-Id: Ie143b9e839d944a7a7eebf5529798a49b8e175d7 --- M src/host/layer23/include/osmocom/bb/common/l23sap.h M src/host/layer23/src/common/l1ctl.c M src/host/layer23/src/common/l23sap.c 3 files changed, 66 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/48/11248/1 diff --git a/src/host/layer23/include/osmocom/bb/common/l23sap.h b/src/host/layer23/include/osmocom/bb/common/l23sap.h index 814fb7d..eaa62c1 100644 --- a/src/host/layer23/include/osmocom/bb/common/l23sap.h +++ b/src/host/layer23/include/osmocom/bb/common/l23sap.h @@ -10,6 +10,9 @@ #define CHAN_IS_SACCH(link_id) \ ((link_id & 0xc0) == LID_SACCH) +int l23sap_gsmtap_data_ind(struct osmocom_ms *ms, struct msgb *msg); +int l23sap_gsmtap_data_req(struct osmocom_ms *ms, struct msgb *msg); + int l23sap_data_ind(struct osmocom_ms *ms, struct msgb *msg); int l23sap_data_conf(struct osmocom_ms *ms, struct msgb *msg); int l23sap_rach_conf(struct osmocom_ms *ms, struct msgb *msg); diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index e78f8be..60039c9 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -36,8 +36,6 @@ #include #include #include -#include -#include #include #include #include @@ -48,8 +46,6 @@ #include #include -extern struct gsmtap_inst *gsmtap_inst; - static struct msgb *osmo_l1_alloc(uint8_t msg_type) { struct l1ctl_hdr *l1h; @@ -131,7 +127,6 @@ struct l1ctl_data_ind *ccch; struct rx_meas_stat *meas = &ms->meas; uint8_t chan_type, chan_ts, chan_ss; - uint8_t gsmtap_chan_type; struct gsm_time tm; if (msgb_l1len(msg) < sizeof(*dl)) { @@ -216,12 +211,6 @@ return 0; } - /* send CCCH data via GSMTAP */ - gsmtap_chan_type = chantype_rsl2gsmtap(chan_type, dl->link_id); - gsmtap_send(gsmtap_inst, ntohs(dl->band_arfcn), chan_ts, - gsmtap_chan_type, chan_ss, tm.fn, dl->rx_level-110, - dl->snr, ccch->data, sizeof(ccch->data)); - /* Send it up towards LAPDm via L23SAP */ return l23sap_data_ind(ms, msg); } @@ -246,8 +235,6 @@ { struct l1ctl_hdr *l1h; struct l1ctl_info_ul *l1i_ul; - uint8_t chan_type, chan_ts, chan_ss; - uint8_t gsmtap_chan_type; DEBUGP(DL1C, "(%s)\n", osmo_hexdump(msg->l2h, msgb_l2len(msg))); @@ -258,18 +245,15 @@ return -EINVAL; } - /* send copy via GSMTAP */ - rsl_dec_chan_nr(chan_nr, &chan_type, &chan_ss, &chan_ts); - gsmtap_chan_type = chantype_rsl2gsmtap(chan_type, link_id); - gsmtap_send(gsmtap_inst, 0|0x4000, chan_ts, gsmtap_chan_type, - chan_ss, 0, 127, 255, msg->l2h, msgb_l2len(msg)); - /* prepend uplink info header */ l1i_ul = (struct l1ctl_info_ul *) msgb_push(msg, sizeof(*l1i_ul)); - + msg->l1h = (uint8_t *) l1i_ul; l1i_ul->chan_nr = chan_nr; l1i_ul->link_id = link_id; + /* Send to GSMTAP */ + l23sap_gsmtap_data_req(ms, msg); + /* prepend l1 header */ msg->l1h = msgb_push(msg, sizeof(*l1h)); l1h = (struct l1ctl_hdr *) msg->l1h; diff --git a/src/host/layer23/src/common/l23sap.c b/src/host/layer23/src/common/l23sap.c index b07265a..d034b27 100644 --- a/src/host/layer23/src/common/l23sap.c +++ b/src/host/layer23/src/common/l23sap.c @@ -26,19 +26,75 @@ #include #include #include +#include #include #include #include +#include +#include #include #include + #include +#include #include #include #include +extern struct gsmtap_inst *gsmtap_inst; + +int l23sap_gsmtap_data_ind(struct osmocom_ms *ms, struct msgb *msg) +{ + struct l1ctl_info_dl *dl = (struct l1ctl_info_dl *) msg->l1h; + uint8_t chan_type, chan_ts, chan_ss; + uint8_t gsmtap_chan_type; + uint16_t band_arfcn; + int8_t signal_dbm; + uint32_t fn; + + /* FDMA / TDMA info indicated by L1 */ + band_arfcn = ntohs(dl->band_arfcn); + signal_dbm = dl->rx_level - 110; + fn = ntohl(dl->frame_nr); + + /* Logical channel info */ + rsl_dec_chan_nr(dl->chan_nr, &chan_type, &chan_ss, &chan_ts); + gsmtap_chan_type = chantype_rsl2gsmtap(chan_type, dl->link_id); + + /* Send to GSMTAP */ + return gsmtap_send(gsmtap_inst, band_arfcn, chan_ts, + gsmtap_chan_type, chan_ss, fn, signal_dbm, + dl->snr, msg->l2h, msgb_l2len(msg)); +} + +int l23sap_gsmtap_data_req(struct osmocom_ms *ms, struct msgb *msg) +{ + struct l1ctl_info_ul *ul = (struct l1ctl_info_ul *) msg->l1h; + uint8_t chan_type, chan_ts, chan_ss; + uint8_t gsmtap_chan_type; + + /* send copy via GSMTAP */ + rsl_dec_chan_nr(ul->chan_nr, &chan_type, &chan_ss, &chan_ts); + gsmtap_chan_type = chantype_rsl2gsmtap(chan_type, ul->link_id); + + /** + * Send to GSMTAP + * + * FIXME: neither FDMA, not TDMA info is known here. + * As a possible solution, we can store an UL frame + * until RTS (TX confirmation) is received from PHY. + * This would also require to add some reference + * info to both UL/DL info headers. This is similar + * to how SIM-card related messages are handled. + */ + return gsmtap_send(gsmtap_inst, 0 | 0x4000, chan_ts, + gsmtap_chan_type, chan_ss, 0, 127, 255, + msg->l2h, msgb_l2len(msg)); +} + int l23sap_data_ind(struct osmocom_ms *ms, struct msgb *msg) { struct l1ctl_info_dl *dl = (struct l1ctl_info_dl *) msg->l1h; @@ -57,6 +113,9 @@ else le = &ms->lapdm_channel.lapdm_dcch; + /* Send to GSMTAP */ + l23sap_gsmtap_data_ind(ms, msg); + /* Send it up into LAPDm */ return lapdm_phsap_up(&pp.oph, le); } -- To view, visit https://gerrit.osmocom.org/11248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie143b9e839d944a7a7eebf5529798a49b8e175d7 Gerrit-Change-Number: 11248 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 09:44:59 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 6 Oct 2018 09:44:59 +0000 Subject: Change in osmocom-bb[master]: layer23/common: merge l1ctl_ph_prim_cb() to L23SAP Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11249 Change subject: layer23/common: merge l1ctl_ph_prim_cb() to L23SAP ...................................................................... layer23/common: merge l1ctl_ph_prim_cb() to L23SAP Change-Id: Ic852b2b7f5a651b7a4debc83778ae24c687e85f8 --- M src/host/layer23/include/osmocom/bb/common/l1ctl.h M src/host/layer23/include/osmocom/bb/common/l23sap.h M src/host/layer23/src/common/Makefile.am D src/host/layer23/src/common/l1ctl_lapdm_glue.c M src/host/layer23/src/common/l23sap.c M src/host/layer23/src/common/main.c M src/host/layer23/src/mobile/app_mobile.c 7 files changed, 40 insertions(+), 69 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/49/11249/1 diff --git a/src/host/layer23/include/osmocom/bb/common/l1ctl.h b/src/host/layer23/include/osmocom/bb/common/l1ctl.h index e4dbded..e9d5be5 100644 --- a/src/host/layer23/include/osmocom/bb/common/l1ctl.h +++ b/src/host/layer23/include/osmocom/bb/common/l1ctl.h @@ -67,9 +67,6 @@ int l1ctl_tx_traffic_req(struct osmocom_ms *ms, struct msgb *msg, uint8_t chan_nr, uint8_t link_id); -/* LAPDm wants to send a PH-* primitive to the physical layer (L1) */ -int l1ctl_ph_prim_cb(struct osmo_prim_hdr *oph, void *ctx); - /* Transmit L1CTL_NEIGH_PM_REQ */ int l1ctl_tx_neigh_pm_req(struct osmocom_ms *ms, int num, uint16_t *arfcn); diff --git a/src/host/layer23/include/osmocom/bb/common/l23sap.h b/src/host/layer23/include/osmocom/bb/common/l23sap.h index eaa62c1..ede5620 100644 --- a/src/host/layer23/include/osmocom/bb/common/l23sap.h +++ b/src/host/layer23/include/osmocom/bb/common/l23sap.h @@ -10,6 +10,8 @@ #define CHAN_IS_SACCH(link_id) \ ((link_id & 0xc0) == LID_SACCH) +int l23sap_lapdm_ph_prim_cb(struct osmo_prim_hdr *oph, void *ctx); + int l23sap_gsmtap_data_ind(struct osmocom_ms *ms, struct msgb *msg); int l23sap_gsmtap_data_req(struct osmocom_ms *ms, struct msgb *msg); diff --git a/src/host/layer23/src/common/Makefile.am b/src/host/layer23/src/common/Makefile.am index e1b7b44..2d26b49 100644 --- a/src/host/layer23/src/common/Makefile.am +++ b/src/host/layer23/src/common/Makefile.am @@ -3,4 +3,4 @@ noinst_LIBRARIES = liblayer23.a liblayer23_a_SOURCES = l1ctl.c l1l2_interface.c sap_interface.c \ - logging.c networks.c sim.c sysinfo.c gps.c l1ctl_lapdm_glue.c utils.c l23sap.c + logging.c networks.c sim.c sysinfo.c gps.c utils.c l23sap.c diff --git a/src/host/layer23/src/common/l1ctl_lapdm_glue.c b/src/host/layer23/src/common/l1ctl_lapdm_glue.c deleted file mode 100644 index 0b2a8ed..0000000 --- a/src/host/layer23/src/common/l1ctl_lapdm_glue.c +++ /dev/null @@ -1,62 +0,0 @@ -/* Glue code between L1CTL and LAPDm */ - -/* (C) 2011 by Harald Welte - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - */ - -#include - -#include - -#include - -#include -#include - -/* LAPDm wants to send a PH-* primitive to the physical layer (L1) */ -int l1ctl_ph_prim_cb(struct osmo_prim_hdr *oph, void *ctx) -{ - struct osmocom_ms *ms = ctx; - struct osmo_phsap_prim *pp = (struct osmo_phsap_prim *) oph; - int rc = 0; - - if (oph->sap != SAP_GSM_PH) - return -ENODEV; - - if (oph->operation != PRIM_OP_REQUEST) - return -EINVAL; - - switch (oph->primitive) { - case PRIM_PH_DATA: - rc = l1ctl_tx_data_req(ms, oph->msg, pp->u.data.chan_nr, - pp->u.data.link_id); - break; - case PRIM_PH_RACH: - l1ctl_tx_param_req(ms, pp->u.rach_req.ta, - pp->u.rach_req.tx_power); - rc = l1ctl_tx_rach_req(ms, pp->u.rach_req.ra, - pp->u.rach_req.offset, - pp->u.rach_req.is_combined_ccch); - break; - default: - rc = -EINVAL; - } - - return rc; -} diff --git a/src/host/layer23/src/common/l23sap.c b/src/host/layer23/src/common/l23sap.c index d034b27..a34f515 100644 --- a/src/host/layer23/src/common/l23sap.c +++ b/src/host/layer23/src/common/l23sap.c @@ -42,6 +42,7 @@ #include #include +#include #include extern struct gsmtap_inst *gsmtap_inst; @@ -155,3 +156,35 @@ return lapdm_phsap_up(&pp.oph, &ms->lapdm_channel.lapdm_dcch); } + +/* LAPDm wants to send a PH-* primitive to the PHY (L1) */ +int l23sap_lapdm_ph_prim_cb(struct osmo_prim_hdr *oph, void *ctx) +{ + struct osmocom_ms *ms = ctx; + struct osmo_phsap_prim *pp = (struct osmo_phsap_prim *) oph; + int rc = 0; + + if (oph->sap != SAP_GSM_PH) + return -ENODEV; + + if (oph->operation != PRIM_OP_REQUEST) + return -EINVAL; + + switch (oph->primitive) { + case PRIM_PH_DATA: + rc = l1ctl_tx_data_req(ms, oph->msg, pp->u.data.chan_nr, + pp->u.data.link_id); + break; + case PRIM_PH_RACH: + l1ctl_tx_param_req(ms, pp->u.rach_req.ta, + pp->u.rach_req.tx_power); + rc = l1ctl_tx_rach_req(ms, pp->u.rach_req.ra, + pp->u.rach_req.offset, + pp->u.rach_req.is_combined_ccch); + break; + default: + rc = -EINVAL; + } + + return rc; +} diff --git a/src/host/layer23/src/common/main.c b/src/host/layer23/src/common/main.c index 693b10e..c3c7992 100644 --- a/src/host/layer23/src/common/main.c +++ b/src/host/layer23/src/common/main.c @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include #include @@ -266,7 +266,7 @@ ms->lapdm_channel.lapdm_acch.l1_ctx = ms; ms->lapdm_channel.lapdm_acch.l3_ctx = ms; lapdm_channel_init(&ms->lapdm_channel, LAPDM_MODE_MS); - lapdm_channel_set_l1(&ms->lapdm_channel, l1ctl_ph_prim_cb, ms); + lapdm_channel_set_l1(&ms->lapdm_channel, l23sap_lapdm_ph_prim_cb, ms); rc = l23_app_init(ms); if (rc < 0) diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index b0e2a13..f420530 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -195,7 +196,7 @@ ms->lapdm_channel.lapdm_acch.datalink[DL_SAPI3].dl.t200_sec = T200_ACCH; ms->lapdm_channel.lapdm_acch.datalink[DL_SAPI3].dl.t200_usec = 0; - lapdm_channel_set_l1(&ms->lapdm_channel, l1ctl_ph_prim_cb, ms); + lapdm_channel_set_l1(&ms->lapdm_channel, l23sap_lapdm_ph_prim_cb, ms); /* init SAP client before SIM card starts up */ osmosap_init(ms); -- To view, visit https://gerrit.osmocom.org/11249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic852b2b7f5a651b7a4debc83778ae24c687e85f8 Gerrit-Change-Number: 11249 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 09:44:59 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 6 Oct 2018 09:44:59 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: cosmetic: drop useless includes Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11250 Change subject: layer23/l1ctl.c: cosmetic: drop useless includes ...................................................................... layer23/l1ctl.c: cosmetic: drop useless includes Change-Id: I16f595110faf27444175864384ce6800a90e10da --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/50/11250/1 diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 60039c9..4346da9 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -34,10 +34,7 @@ #include #include #include -#include #include -#include -#include #include #include -- To view, visit https://gerrit.osmocom.org/11250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I16f595110faf27444175864384ce6800a90e10da Gerrit-Change-Number: 11250 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 09:44:59 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 6 Oct 2018 09:44:59 +0000 Subject: Change in osmocom-bb[master]: layer23/common: move signal loss criteria to L23SAP Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11251 Change subject: layer23/common: move signal loss criteria to L23SAP ...................................................................... layer23/common: move signal loss criteria to L23SAP Change-Id: Ib70bf9104cf3b5489413dd90819fd4955ec16f95 --- M src/host/layer23/src/common/l1ctl.c M src/host/layer23/src/common/l23sap.c 2 files changed, 83 insertions(+), 67 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/51/11251/1 diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 4346da9..a08fac2 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -122,8 +122,6 @@ { struct l1ctl_info_dl *dl; struct l1ctl_data_ind *ccch; - struct rx_meas_stat *meas = &ms->meas; - uint8_t chan_type, chan_ts, chan_ss; struct gsm_time tm; if (msgb_l1len(msg) < sizeof(*dl)) { @@ -138,76 +136,11 @@ ccch = (struct l1ctl_data_ind *) msg->l2h; gsm_fn2gsmtime(&tm, ntohl(dl->frame_nr)); - rsl_dec_chan_nr(dl->chan_nr, &chan_type, &chan_ss, &chan_ts); DEBUGP(DL1C, "%s (%.4u/%.2u/%.2u) %d dBm: %s\n", rsl_chan_nr_str(dl->chan_nr), tm.t1, tm.t2, tm.t3, (int)dl->rx_level-110, osmo_hexdump(ccch->data, sizeof(ccch->data))); - meas->last_fn = ntohl(dl->frame_nr); - meas->frames++; - meas->snr += dl->snr; - meas->berr += dl->num_biterr; - meas->rxlev += dl->rx_level; - - /* counting loss criteria */ - if (!(dl->link_id & 0x40)) { - switch (chan_type) { - case RSL_CHAN_PCH_AGCH: - /* only look at one CCCH frame in each 51 multiframe. - * FIXME: implement DRX - * - select correct paging block that is for us. - * - initialize ds_fail according to BS_PA_MFRMS. - */ - if ((dl->frame_nr % 51) != 6) - break; - if (!meas->ds_fail) - break; - if (dl->fire_crc >= 2) - meas->dsc -= 4; - else - meas->dsc += 1; - if (meas->dsc > meas->ds_fail) - meas->dsc = meas->ds_fail; - if (meas->dsc < meas->ds_fail) - LOGP(DL1C, LOGL_INFO, "LOSS counter for CCCH %d\n", meas->dsc); - if (meas->dsc > 0) - break; - meas->ds_fail = 0; - osmo_signal_dispatch(SS_L1CTL, S_L1CTL_LOSS_IND, ms); - break; - } - } else { - switch (chan_type) { - case RSL_CHAN_Bm_ACCHs: - case RSL_CHAN_Lm_ACCHs: - case RSL_CHAN_SDCCH4_ACCH: - case RSL_CHAN_SDCCH8_ACCH: - if (!meas->rl_fail) - break; - if (dl->fire_crc >= 2) - meas->s -= 1; - else - meas->s += 2; - if (meas->s > meas->rl_fail) - meas->s = meas->rl_fail; - if (meas->s < meas->rl_fail) - LOGP(DL1C, LOGL_NOTICE, "LOSS counter for ACCH %d\n", meas->s); - if (meas->s > 0) - break; - meas->rl_fail = 0; - osmo_signal_dispatch(SS_L1CTL, S_L1CTL_LOSS_IND, ms); - break; - } - } - - if (dl->fire_crc >= 2) { - LOGP(DL1C, LOGL_NOTICE, "Dropping frame with %u bit errors\n", - dl->num_biterr); - msgb_free(msg); - return 0; - } - /* Send it up towards LAPDm via L23SAP */ return l23sap_data_ind(ms, msg); } diff --git a/src/host/layer23/src/common/l23sap.c b/src/host/layer23/src/common/l23sap.c index a34f515..fbdc75c 100644 --- a/src/host/layer23/src/common/l23sap.c +++ b/src/host/layer23/src/common/l23sap.c @@ -2,6 +2,7 @@ * L23SAP (L2&3 Service Access Point), an interface between * L1 implementation and the upper layers (i.e. L2&3). * + * (C) 2010 by Andreas Eversberg * (C) 2011 by Harald Welte * (C) 2018 by Vadim Yanitskiy * @@ -34,6 +35,7 @@ #include #include #include +#include #include #include @@ -47,6 +49,81 @@ extern struct gsmtap_inst *gsmtap_inst; +static int l23sap_check_dl_loss(struct osmocom_ms *ms, + struct l1ctl_info_dl *dl) +{ + struct rx_meas_stat *meas = &ms->meas; + uint8_t chan_type, chan_ts, chan_ss; + + /* Update measurements */ + meas->last_fn = ntohl(dl->frame_nr); + meas->frames++; + meas->snr += dl->snr; + meas->berr += dl->num_biterr; + meas->rxlev += dl->rx_level; + + rsl_dec_chan_nr(dl->chan_nr, &chan_type, &chan_ss, &chan_ts); + + /* counting loss criteria */ + if (!(dl->link_id & 0x40)) { + switch (chan_type) { + case RSL_CHAN_PCH_AGCH: + /* only look at one CCCH frame in each 51 multiframe. + * FIXME: implement DRX + * - select correct paging block that is for us. + * - initialize ds_fail according to BS_PA_MFRMS. + */ + if ((dl->frame_nr % 51) != 6) + break; + if (!meas->ds_fail) + break; + if (dl->fire_crc >= 2) + meas->dsc -= 4; + else + meas->dsc += 1; + if (meas->dsc > meas->ds_fail) + meas->dsc = meas->ds_fail; + if (meas->dsc < meas->ds_fail) + LOGP(DL23SAP, LOGL_INFO, "LOSS counter for CCCH %d\n", meas->dsc); + if (meas->dsc > 0) + break; + meas->ds_fail = 0; + osmo_signal_dispatch(SS_L1CTL, S_L1CTL_LOSS_IND, ms); + break; + } + } else { + switch (chan_type) { + case RSL_CHAN_Bm_ACCHs: + case RSL_CHAN_Lm_ACCHs: + case RSL_CHAN_SDCCH4_ACCH: + case RSL_CHAN_SDCCH8_ACCH: + if (!meas->rl_fail) + break; + if (dl->fire_crc >= 2) + meas->s -= 1; + else + meas->s += 2; + if (meas->s > meas->rl_fail) + meas->s = meas->rl_fail; + if (meas->s < meas->rl_fail) + LOGP(DL23SAP, LOGL_NOTICE, "LOSS counter for ACCH %d\n", meas->s); + if (meas->s > 0) + break; + meas->rl_fail = 0; + osmo_signal_dispatch(SS_L1CTL, S_L1CTL_LOSS_IND, ms); + break; + } + } + + if (dl->fire_crc >= 2) { + LOGP(DL23SAP, LOGL_NOTICE, "Dropping frame with %u bit " + "errors\n", dl->num_biterr); + return -EBADMSG; + } + + return 0; +} + int l23sap_gsmtap_data_ind(struct osmocom_ms *ms, struct msgb *msg) { struct l1ctl_info_dl *dl = (struct l1ctl_info_dl *) msg->l1h; @@ -102,6 +179,12 @@ struct osmo_phsap_prim pp; struct lapdm_entity *le; + /* Check for decoding errors (path loss) */ + if (l23sap_check_dl_loss(ms, dl)) { + msgb_free(msg); + return 0; + } + /* Init a new DATA IND primitive */ osmo_prim_init(&pp.oph, SAP_GSM_PH, PRIM_PH_DATA, PRIM_OP_INDICATION, msg); -- To view, visit https://gerrit.osmocom.org/11251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib70bf9104cf3b5489413dd90819fd4955ec16f95 Gerrit-Change-Number: 11251 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 09:45:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 6 Oct 2018 09:45:00 +0000 Subject: Change in osmocom-bb[master]: layer23/l23sap.c: fix: use host byte order for dl->frame_nr Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11252 Change subject: layer23/l23sap.c: fix: use host byte order for dl->frame_nr ...................................................................... layer23/l23sap.c: fix: use host byte order for dl->frame_nr Change-Id: Ic72b04b4bb6990413578b1e9f4499fe98acf5d85 --- M src/host/layer23/src/common/l23sap.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/52/11252/1 diff --git a/src/host/layer23/src/common/l23sap.c b/src/host/layer23/src/common/l23sap.c index fbdc75c..e41e8ce 100644 --- a/src/host/layer23/src/common/l23sap.c +++ b/src/host/layer23/src/common/l23sap.c @@ -73,7 +73,7 @@ * - select correct paging block that is for us. * - initialize ds_fail according to BS_PA_MFRMS. */ - if ((dl->frame_nr % 51) != 6) + if ((meas->last_fn % 51) != 6) break; if (!meas->ds_fail) break; -- To view, visit https://gerrit.osmocom.org/11252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic72b04b4bb6990413578b1e9f4499fe98acf5d85 Gerrit-Change-Number: 11252 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 09:45:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 6 Oct 2018 09:45:00 +0000 Subject: Change in osmocom-bb[master]: layer23/l23sap.c: use the CHAN_IS_SACCH() macro Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11253 Change subject: layer23/l23sap.c: use the CHAN_IS_SACCH() macro ...................................................................... layer23/l23sap.c: use the CHAN_IS_SACCH() macro Change-Id: I25200bbcd174882b37e7c628e7f1204c488aa258 --- M src/host/layer23/src/common/l23sap.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/53/11253/1 diff --git a/src/host/layer23/src/common/l23sap.c b/src/host/layer23/src/common/l23sap.c index e41e8ce..5a3e79e 100644 --- a/src/host/layer23/src/common/l23sap.c +++ b/src/host/layer23/src/common/l23sap.c @@ -65,7 +65,7 @@ rsl_dec_chan_nr(dl->chan_nr, &chan_type, &chan_ss, &chan_ts); /* counting loss criteria */ - if (!(dl->link_id & 0x40)) { + if (!CHAN_IS_SACCH(dl->link_id)) { switch (chan_type) { case RSL_CHAN_PCH_AGCH: /* only look at one CCCH frame in each 51 multiframe. -- To view, visit https://gerrit.osmocom.org/11253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I25200bbcd174882b37e7c628e7f1204c488aa258 Gerrit-Change-Number: 11253 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 09:45:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 6 Oct 2018 09:45:00 +0000 Subject: Change in osmocom-bb[master]: layer23/l23sap.c: use safe wrapper around rsl_dec_chan_nr() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11254 Change subject: layer23/l23sap.c: use safe wrapper around rsl_dec_chan_nr() ...................................................................... layer23/l23sap.c: use safe wrapper around rsl_dec_chan_nr() The rsl_dec_chan_nr() may fail to decode a given chan_nr, so it could lead to uninitialized memory access. Let's avoid this by adding a safe wrapper that. Change-Id: Id78304f494be70aa05e2da11c785ba5d9aeaf6db --- M src/host/layer23/src/common/l23sap.c 1 file changed, 38 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/54/11254/1 diff --git a/src/host/layer23/src/common/l23sap.c b/src/host/layer23/src/common/l23sap.c index 5a3e79e..4560d23 100644 --- a/src/host/layer23/src/common/l23sap.c +++ b/src/host/layer23/src/common/l23sap.c @@ -49,11 +49,36 @@ extern struct gsmtap_inst *gsmtap_inst; +/* Safe wrapper around rsl_dec_chan_nr() */ +static int l23sap_dec_chan_nr(uint8_t chan_nr, uint8_t link_id, + uint8_t *chan_type, uint8_t *chan_ts, uint8_t *chan_ss, + uint8_t *gsmtap_chan_type) +{ + int rc; + + rc = rsl_dec_chan_nr(chan_nr, chan_type, chan_ss, chan_ts); + if (rc) { + LOGP(DL23SAP, LOGL_ERROR, "Failed to decode logical channel " + "info (chan_nr=0x%02x, link_id=0x%02x)\n", chan_nr, link_id); + if (gsmtap_chan_type) + *gsmtap_chan_type = GSMTAP_CHANNEL_UNKNOWN; + *chan_type = *chan_ss = *chan_ts = 0x00; + return -EINVAL; + } + + /* Pick corresponding GSMTAP channel type */ + if (gsmtap_chan_type) + *gsmtap_chan_type = chantype_rsl2gsmtap(*chan_type, link_id); + + return 0; +} + static int l23sap_check_dl_loss(struct osmocom_ms *ms, struct l1ctl_info_dl *dl) { struct rx_meas_stat *meas = &ms->meas; uint8_t chan_type, chan_ts, chan_ss; + int rc; /* Update measurements */ meas->last_fn = ntohl(dl->frame_nr); @@ -62,7 +87,11 @@ meas->berr += dl->num_biterr; meas->rxlev += dl->rx_level; - rsl_dec_chan_nr(dl->chan_nr, &chan_type, &chan_ss, &chan_ts); + /* Attempt to decode logical channel info */ + rc = l23sap_dec_chan_nr(dl->chan_nr, dl->link_id, + &chan_type, &chan_ts, &chan_ss, NULL); + if (rc) + return rc; /* counting loss criteria */ if (!CHAN_IS_SACCH(dl->link_id)) { @@ -138,9 +167,10 @@ signal_dbm = dl->rx_level - 110; fn = ntohl(dl->frame_nr); - /* Logical channel info */ - rsl_dec_chan_nr(dl->chan_nr, &chan_type, &chan_ss, &chan_ts); - gsmtap_chan_type = chantype_rsl2gsmtap(chan_type, dl->link_id); + /* Attempt to decode logical channel info */ + l23sap_dec_chan_nr(dl->chan_nr, dl->link_id, + &chan_type, &chan_ts, &chan_ss, + &gsmtap_chan_type); /* Send to GSMTAP */ return gsmtap_send(gsmtap_inst, band_arfcn, chan_ts, @@ -154,9 +184,10 @@ uint8_t chan_type, chan_ts, chan_ss; uint8_t gsmtap_chan_type; - /* send copy via GSMTAP */ - rsl_dec_chan_nr(ul->chan_nr, &chan_type, &chan_ss, &chan_ts); - gsmtap_chan_type = chantype_rsl2gsmtap(chan_type, ul->link_id); + /* Attempt to decode logical channel info */ + l23sap_dec_chan_nr(ul->chan_nr, ul->link_id, + &chan_type, &chan_ts, &chan_ss, + &gsmtap_chan_type); /** * Send to GSMTAP -- To view, visit https://gerrit.osmocom.org/11254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id78304f494be70aa05e2da11c785ba5d9aeaf6db Gerrit-Change-Number: 11254 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 09:45:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 6 Oct 2018 09:45:00 +0000 Subject: Change in osmocom-bb[master]: layer23/l23sap.c: add Osmocom specific cbits for CBCH Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11255 Change subject: layer23/l23sap.c: add Osmocom specific cbits for CBCH ...................................................................... layer23/l23sap.c: add Osmocom specific cbits for CBCH CBCH logical channel is a bit similar to FACCH as there is no way to indicate that it's exactly CBCH and not just a regular SDCCH. There is nothing about CBCH stated in GSM 08.58, Chapter 9.3.1. This change introduces Osmocom specific extensions for that. Change-Id: I35e454c825481e6a390485ee042e384b31a08bf4 --- M src/host/layer23/src/common/l23sap.c 1 file changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/55/11255/1 diff --git a/src/host/layer23/src/common/l23sap.c b/src/host/layer23/src/common/l23sap.c index 4560d23..fde5514 100644 --- a/src/host/layer23/src/common/l23sap.c +++ b/src/host/layer23/src/common/l23sap.c @@ -49,6 +49,30 @@ extern struct gsmtap_inst *gsmtap_inst; +/* Decoder for Osmocom specific chan_nr / link_id values (e.g. CBCH) */ +static int l23sap_dec_chan_nr_ext(uint8_t chan_nr, uint8_t link_id, + uint8_t *chan_type, uint8_t *chan_ts, uint8_t *chan_ss, + uint8_t *gsmtap_chan_type) +{ + uint8_t cbits = (chan_nr >> 3); + + if ((cbits & 0x1f) == 0x18) { + *chan_type = GSMTAP_CHANNEL_SDCCH4; + *chan_ss = 2; + if (gsmtap_chan_type) + *gsmtap_chan_type = GSMTAP_CHANNEL_CBCH51; + } else if ((cbits & 0x1f) == 0x19) { + *chan_type = GSMTAP_CHANNEL_SDCCH8; + if (gsmtap_chan_type) + *gsmtap_chan_type = GSMTAP_CHANNEL_CBCH51; + } else { + return -ENODEV; + } + + *chan_ts = chan_nr & 0x07; + return 0; +} + /* Safe wrapper around rsl_dec_chan_nr() */ static int l23sap_dec_chan_nr(uint8_t chan_nr, uint8_t link_id, uint8_t *chan_type, uint8_t *chan_ts, uint8_t *chan_ss, @@ -56,6 +80,13 @@ { int rc; + /* Attempt to decode Osmocom specific extensions */ + rc = l23sap_dec_chan_nr_ext(chan_nr, link_id, + chan_type, chan_ts, chan_ss, gsmtap_chan_type); + if (!rc) /* Successful decoding */ + return 0; + + /* Attempt to decode according to the specs */ rc = rsl_dec_chan_nr(chan_nr, chan_type, chan_ss, chan_ts); if (rc) { LOGP(DL23SAP, LOGL_ERROR, "Failed to decode logical channel " -- To view, visit https://gerrit.osmocom.org/11255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I35e454c825481e6a390485ee042e384b31a08bf4 Gerrit-Change-Number: 11255 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 10:14:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 6 Oct 2018 10:14:58 +0000 Subject: Change in osmo-gsm-manuals[master]: add SGs / CSFB related dot + msc files In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11245 ) Change subject: add SGs / CSFB related dot + msc files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idfd3a66c18131b5458d183b8e66f62eaaab65991 Gerrit-Change-Number: 11245 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 06 Oct 2018 10:14:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 10:15:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 6 Oct 2018 10:15:00 +0000 Subject: Change in osmo-gsm-manuals[master]: add SGs / CSFB related dot + msc files In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11245 ) Change subject: add SGs / CSFB related dot + msc files ...................................................................... add SGs / CSFB related dot + msc files Those graphs + message sequence charts are not yet used by any of our manuals, but they should become used by the OsmoMSC user manual once SGs interface support is added. Related: OS#2583 Change-Id: Idfd3a66c18131b5458d183b8e66f62eaaab65991 --- A OsmoMSC/images/sgs-imsi_attach_lu.msc A OsmoMSC/images/sgs-mo_call_no_ps_ho.msc A OsmoMSC/images/sgs-mo_sms_idle.msc A OsmoMSC/images/sgs-mt_call_idle.msc A OsmoMSC/images/sgs-mt_sms_idle.msc A common/images/lte-eps-sgs.dot A common/images/lte-eps.dot 7 files changed, 135 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/OsmoMSC/images/sgs-imsi_attach_lu.msc b/OsmoMSC/images/sgs-imsi_attach_lu.msc new file mode 100644 index 0000000..e62c2b8 --- /dev/null +++ b/OsmoMSC/images/sgs-imsi_attach_lu.msc @@ -0,0 +1,15 @@ +msc { + UE, MME, VLR [label="MSC/VLR"], HSS [label="HSS/HLR"]; + + UE => MME [label="Attach Request"]; + UE box HSS [label="Steps 3..16 of LTE Attach procedure TS 23.401"]; + MME box MME [label="Derive VLR Number"]; + MME => VLR [label="LU Request"]; + VLR box VLR [label="Create SGs Association"]; + VLR box HSS [label="MAP/GSUP UL / ISD"]; + MME <= VLR [label="LU Accept"]; + UE box HSS [label="Steps 17..16 of LTE Attach procedure TS 23.401"]; + |||; + ...; + MME <= VLR [label="Paging Request"]; +} diff --git a/OsmoMSC/images/sgs-mo_call_no_ps_ho.msc b/OsmoMSC/images/sgs-mo_call_no_ps_ho.msc new file mode 100644 index 0000000..f886c89 --- /dev/null +++ b/OsmoMSC/images/sgs-mo_call_no_ps_ho.msc @@ -0,0 +1,18 @@ +msc { + hscale=2; + UE, ENB [label="eNodeB"], BSS, MME, VLR [label="MSC/VLR"], HSS [label="HSS/HLR"]; + + UE => MME [label="NAS Extended Service Request"]; + ENB <= MME [label="S1-AP UE Context Mod Req with CSFB"]; + ENB => MME [label="S1-AP UE Context Mod Resp"]; + UE <= ENB [label="NACC (Network Assisted Cell Change)"]; + ENB => MME [label="S1-AP S1 UE Context Release Req"]; + UE box MME [label="S1 UE Context Release"]; + + UE box HSS [label="UE changes RAT then LA and/or RA update"]; + UE <=> HSS [label="PS Suspend (TS 23.060)"]; + + UE => BSS [label="CM SERV REQ"]; + BSS => VLR [label="COMPL L3 (CM SERV REQ)"]; + UE <=> VLR [label="Normal 2G Voice Call"]; +} diff --git a/OsmoMSC/images/sgs-mo_sms_idle.msc b/OsmoMSC/images/sgs-mo_sms_idle.msc new file mode 100644 index 0000000..5acc0e8 --- /dev/null +++ b/OsmoMSC/images/sgs-mo_sms_idle.msc @@ -0,0 +1,21 @@ +msc { + hscale=2; + UE, MME, VLR [label="MSC/VLR"], HSS [label="HSS/HLR"], SMSC; + + UE box HSS [label="EPS/IMSI attach procedure"]; + ...; + UE box MME [label="UE triggered Service Request"]; + UE => MME [label="UL NAS Transport"]; + MME => VLR [label="SGsAP UPLINK UNITDATA\n(CP-DATA/RP-DATA/TPDU)"]; + VLR => SMSC [label="MAP/GSUP Forward SM"]; + MME <= VLR [label="SGsAP DOWNLINK UNITDATA"]; + UE <= MME [label="DL NAS Transport"]; + ...; + + VLR <= SMSC [label="Delivery Report"]; + MME <= VLR [label="SGsAP DOWNLINK UNITDATA"]; + UE <= MME [label="DL NAS Transport"]; + UE => MME [label="UL NAS Transport"]; + MME => VLR [label="SGsAP UPLINK UNITDATA"]; + MME <= VLR [label="SGsAP RELEASE REQ"]; +} diff --git a/OsmoMSC/images/sgs-mt_call_idle.msc b/OsmoMSC/images/sgs-mt_call_idle.msc new file mode 100644 index 0000000..b3cff3c --- /dev/null +++ b/OsmoMSC/images/sgs-mt_call_idle.msc @@ -0,0 +1,17 @@ +msc { + hscale=2; + UE, ENB [label="eNodeB"], BSS, MME, VLR [label="MSC/VLR"], PSTN; + + VLR <= PSTN [label="ISUP IAM or SIP INVITE"]; + MME <= VLR [label="SGsAP PAGING REQUEST"]; + ENB <= MME [label="Paging"]; + UE <= MME [label="Paging"]; + + UE => MME [label="Extended Service Req"]; + MME => VLR [label="SGsAP SERVICE REQUEST"]; + ENB <= MME [label="Initial UE Ctx Setup"]; + + UE => BSS [label="Paging Response"]; + BSS => VLR [label="COMPL L3 (PAGING RESP)"]; + UE <=> VLR [label="Normal 2G Voice Call"]; +} diff --git a/OsmoMSC/images/sgs-mt_sms_idle.msc b/OsmoMSC/images/sgs-mt_sms_idle.msc new file mode 100644 index 0000000..7b453e0 --- /dev/null +++ b/OsmoMSC/images/sgs-mt_sms_idle.msc @@ -0,0 +1,22 @@ +msc { + hscale=2; + UE, MME, VLR [label="MSC/VLR"], HSS [label="HSS/HLR"], SMSC; + + UE box HSS [label="EPS/IMSI attach procedure"]; + ...; + + VLR <= SMSC [label="MAP/GSUP ForwardSM"]; + MME <= VLR [label="SGsAP PAGING"]; + UE <= MME [label="Paging"]; + UE box MME [label="Service Request"]; + MME => VLR [label="SGsAP SERVICE REQ"]; + MME <= VLR [label="SGsAP DL UNITDATA\n(CP-DATA/RP-DATA/TPDU)"]; + UE <= MME [label="DL NAS Transport"]; + UE => MME [label="UL NAS Transport"]; + MME => VLR [label="SGsAP UL UNITDATA"]; + ...; + UE => MME [label="UL NAS Transport"]; + MME => VLR [label="SGsAP UL UNITDATA"]; + VLR => SMSC [label="Delivery report"]; + MME <= VLR [label="SGsAP RELEASE REQ"]; +} diff --git a/common/images/lte-eps-sgs.dot b/common/images/lte-eps-sgs.dot new file mode 100644 index 0000000..a9a714d --- /dev/null +++ b/common/images/lte-eps-sgs.dot @@ -0,0 +1,28 @@ +digraph G { + rankdir=LR; + + HSS [label="HSS/HLR"]; + + { rank=same; MME; MSC; } + + SGW [label="S-GW"]; + PGW [label="P-GW"]; + + UE -> eNodeB [label="Radio"]; + eNodeB -> MME [label="S1-MME\nControl Plane"]; + eNodeB -> SGW [label="S1-U\nUser Plane"]; + MME -> HSS [label="S6a\nDIAMETER"]; + MME -> SGW [label="S11"]; + SGW -> PGW [label="S5/S8\nGTP"]; + PGW -> Internet [label="SGi"]; + + UE -> GERAN [label="Um"]; + UE -> UTRAN [label="Uu"]; + GERAN-> MSC [label="A"]; + UTRAN-> MSC [label="IuCS"]; + + MME -> MSC [label="SGs"]; + + MSC -> HSS [label="MAP"]; + MSC -> SMSC [label="MAP"]; +} diff --git a/common/images/lte-eps.dot b/common/images/lte-eps.dot new file mode 100644 index 0000000..d48bce2 --- /dev/null +++ b/common/images/lte-eps.dot @@ -0,0 +1,14 @@ +digraph G { + rankdir=LR; + + SGW [label="S-GW"]; + PGW [label="P-GW"]; + + UE -> eNodeB [label="Radio"]; + eNodeB -> MME [label="S1-MME\nControl Plane"]; + eNodeB -> SGW [label="S1-U\nUser Plane"]; + MME -> HSS [label="S6a\nDIAMETER"]; + MME -> SGW [label="S11"]; + SGW -> PGW [label="S5/S8\nGTP"]; + PGW -> Internet [label="SGi"]; +} -- To view, visit https://gerrit.osmocom.org/11245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idfd3a66c18131b5458d183b8e66f62eaaab65991 Gerrit-Change-Number: 11245 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 10:16:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 6 Oct 2018 10:16:09 +0000 Subject: Change in osmo-msc[master]: GSUP client: send CN domain IE on LU request In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11244 ) Change subject: GSUP client: send CN domain IE on LU request ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0c2d33fbfdb4728e480679120d06b7f3a2ccfd76 Gerrit-Change-Number: 11244 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 06 Oct 2018 10:16:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 10:16:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 6 Oct 2018 10:16:12 +0000 Subject: Change in osmo-msc[master]: GSUP client: send CN domain IE on LU request In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11244 ) Change subject: GSUP client: send CN domain IE on LU request ...................................................................... GSUP client: send CN domain IE on LU request Give the HLR a chance to send us updated subscriber data by indicating the CN domain to be Circuit Switched, only during a LU Request GSUP message. Adjust msc_vlr_tests to expect the added GSUP CN domain IE to indicate CS, i.e. append '280102'. Related: OS#3601 Change-Id: I0c2d33fbfdb4728e480679120d06b7f3a2ccfd76 --- M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.c M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.c M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.c 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_ss.c M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_test_umts_authen.err 25 files changed, 176 insertions(+), 175 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index bfaf333..f7572f2 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -622,6 +622,7 @@ int rc; gsup_msg.message_type = OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST; + gsup_msg.cn_domain = vsub->vlr->cfg.is_ps ? OSMO_GSUP_CN_DOMAIN_PS : OSMO_GSUP_CN_DOMAIN_CS; rc = vlr_subscr_tx_gsup_message(vsub, &gsup_msg); return rc; diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c b/tests/msc_vlr/msc_vlr_test_authen_reuse.c index 3b80e83..6591557 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c @@ -85,7 +85,7 @@ if (via_ran == RAN_GERAN_A) { btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0"); + gsup_expect_tx("04010809710000000156f0280102"); ms_sends_msg("0554" "e229c19e" "2104" "791f2e41"); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -98,7 +98,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0"); + gsup_expect_tx("04010809710000000156f0280102"); ms_sends_security_mode_complete(); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.err b/tests/msc_vlr/msc_vlr_test_authen_reuse.err index e25396d..5f5db2f 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.err +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.err @@ -72,8 +72,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000010650: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000010650){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -506,8 +506,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -948,8 +948,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000010650: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000010650){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -1462,8 +1462,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -1997,8 +1997,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000010650: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000010650){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -2337,8 +2337,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 50bf174..5819e51 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -122,7 +122,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0"); + gsup_expect_tx("04010809710000000156f0280102"); ms_sends_security_mode_complete(); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index 7a70b4b..19cb25d 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -88,8 +88,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -466,8 +466,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -849,8 +849,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -1200,8 +1200,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -1544,8 +1544,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c index 6555fbd..8129781 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c @@ -75,7 +75,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -269,7 +269,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -446,7 +446,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("05545afc8d72"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -551,7 +551,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -654,7 +654,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -785,7 +785,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0"); + gsup_expect_tx("04010809710000000156f0280102"); ms_sends_msg("0554" "9b36efdf"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index 954934a..51f7367 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -90,8 +90,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -541,8 +541,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -961,8 +961,8 @@ DVLR upd_hlr_vlr_fsm(LU:50462976){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:50462976){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:50462976) DVLR upd_hlr_vlr_fsm(LU:50462976){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:50462976){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:50462976){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -1201,8 +1201,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -1438,8 +1438,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -1688,8 +1688,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000010650: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000010650){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c index 4254066..8f256b1 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c @@ -77,7 +77,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -292,7 +292,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -531,7 +531,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -641,7 +641,7 @@ vlr_subscr_put(vsub); btw("MS sends Ciphering Mode Complete with IMEISV, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("063217094b32244332244372f5"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -736,7 +736,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -915,7 +915,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0"); + gsup_expect_tx("04010809710000000156f0280102"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -1109,7 +1109,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -1330,7 +1330,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0632"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 4a13b68..cc8659c 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -97,8 +97,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT @@ -601,8 +601,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT @@ -1140,8 +1140,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT @@ -1388,8 +1388,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - Subscriber has the IMEISV @@ -1611,8 +1611,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT @@ -1873,8 +1873,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT @@ -2353,8 +2353,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT @@ -2853,8 +2853,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA lu_result_sent == 0 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.c b/tests/msc_vlr/msc_vlr_test_hlr_reject.c index 8dfe1f4..13bed42 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.c +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.c @@ -114,7 +114,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -203,7 +203,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -326,7 +326,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -371,7 +371,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -400,7 +400,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -424,7 +424,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err index f151838..505a3b4 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err @@ -233,8 +233,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -388,8 +388,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -546,8 +546,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -783,8 +783,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -1055,8 +1055,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -1137,8 +1137,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c index ce3f3d0..a237695 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c +++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c @@ -73,7 +73,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err index dab8e2c..c6cbeab 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err @@ -117,8 +117,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.c b/tests/msc_vlr/msc_vlr_test_ms_timeout.c index ddb6324..a4851b3 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.c +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.c @@ -125,7 +125,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -198,7 +198,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index 43eb3d4..d2b7ef3 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -180,8 +180,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -383,8 +383,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c index afa03c3..b34ddd7 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.c +++ b/tests/msc_vlr/msc_vlr_test_no_authen.c @@ -35,7 +35,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -177,7 +177,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -327,7 +327,7 @@ BTW("subscriber sends LU Request, this time with the TMSI"); btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130" "05f4" "03020100"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -400,7 +400,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -471,7 +471,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -555,7 +555,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0559094332244332244372f5"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -618,7 +618,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0559094332244332244372f5"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -698,7 +698,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0559094332244332244372f5"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -754,7 +754,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0559095332244332244372f6"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -840,7 +840,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0559094332244332244372f5"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -934,7 +934,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index f2453af..fb0582b 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -28,8 +28,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -351,8 +351,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -674,8 +674,8 @@ DVLR upd_hlr_vlr_fsm(LU:50462976){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:50462976){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:50462976) DVLR upd_hlr_vlr_fsm(LU:50462976){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:50462976){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:50462976){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:50462976){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -866,8 +866,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -1055,8 +1055,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -1286,8 +1286,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -1461,8 +1461,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -1668,8 +1668,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -1836,8 +1836,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -2046,8 +2046,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -2266,8 +2266,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c index 580135a..d206571 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c @@ -30,7 +30,7 @@ btw("Location Update Request on one connection"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -73,7 +73,7 @@ { btw("Location Update Request"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 84436d3..0a964ac 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -28,8 +28,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -187,8 +187,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -317,8 +317,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -454,8 +454,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -586,8 +586,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -783,8 +783,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -983,8 +983,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -1171,8 +1171,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -1398,8 +1398,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -1645,8 +1645,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH diff --git a/tests/msc_vlr/msc_vlr_test_rest.c b/tests/msc_vlr/msc_vlr_test_rest.c index aef1df5..247e7ae 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.c +++ b/tests/msc_vlr/msc_vlr_test_rest.c @@ -85,7 +85,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -116,7 +116,7 @@ BTW("verify that the MS can send another LU request"); btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -168,7 +168,7 @@ thwart_rx_non_initial_requests(); btw("MS tells us the IMSI, causes a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("0559089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index 395a138..fc3a85d 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -120,8 +120,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -241,8 +241,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -425,8 +425,8 @@ DVLR upd_hlr_vlr_fsm(LU:591536962){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:591536962){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:591536962) DVLR upd_hlr_vlr_fsm(LU:591536962){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:591536962){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:591536962){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED diff --git a/tests/msc_vlr/msc_vlr_test_ss.c b/tests/msc_vlr/msc_vlr_test_ss.c index 88e8036..34aa634 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.c +++ b/tests/msc_vlr/msc_vlr_test_ss.c @@ -47,7 +47,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0"); + gsup_expect_tx("04010809710000004026f0280102"); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err index 7255e7d..0f10910 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.err +++ b/tests/msc_vlr/msc_vlr_test_ss.err @@ -28,8 +28,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH @@ -232,8 +232,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000004026f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR GSUP tx: 04010809710000004026f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c index 03f516f..62e280e 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.c +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c @@ -124,7 +124,7 @@ if (via_ran == RAN_GERAN_A) { btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0"); + gsup_expect_tx("04010809710000000156f0280102"); ms_sends_msg("0554" "e229c19e" "2104" "791f2e41"); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -137,7 +137,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0"); + gsup_expect_tx("04010809710000000156f0280102"); ms_sends_security_mode_complete(); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -493,7 +493,7 @@ if (via_ran == RAN_GERAN_A) { btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0"); + gsup_expect_tx("04010809710000000156f0280102"); ms_sends_msg("0554" "1df5f0b4" "2104" "f22b696e"); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -506,7 +506,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0"); + gsup_expect_tx("04010809710000000156f0280102"); ms_sends_security_mode_complete(); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index 4a060af..538a3d9 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -72,8 +72,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000010650: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000010650){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -552,8 +552,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 @@ -1071,8 +1071,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA DREF IMSI:901700000010650: MSC conn use - dtap == 0 (0x0: ) DMM Subscr_Conn(LU:901700000010650){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED @@ -1305,8 +1305,8 @@ DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Allocated DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START -DVLR GSUP tx: 04010809710000000156f0 -GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0 +DVLR GSUP tx: 04010809710000000156f0280102 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102 DVLR upd_hlr_vlr_fsm(LU:901700000010650){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA gsup_tx_confirmed == 1 lu_result_sent == 0 -- To view, visit https://gerrit.osmocom.org/11244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0c2d33fbfdb4728e480679120d06b7f3a2ccfd76 Gerrit-Change-Number: 11244 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 10:20:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 6 Oct 2018 10:20:05 +0000 Subject: Change in osmo-bsc[master]: codec_pref: check codec configuration before start In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11243 ) Change subject: codec_pref: check codec configuration before start ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11243/1/src/osmo-bsc/osmo_bsc_main.c File src/osmo-bsc/osmo_bsc_main.c: https://gerrit.osmocom.org/#/c/11243/1/src/osmo-bsc/osmo_bsc_main.c at 885 PS1, Line 885: rc = check_codec_pref(&bsc_gsmnet->bsc_data->mscs); I think it's not only sufficient to do this here. It should also be verified whenever any of the related input data changes, i.e. if the MSC codec preferences are changed, or if the BTS related settings change. However, we then run into a bit of a chicken-and-egg situation on initial startup. So those checks should be executed on any VTY change at runtime, but not during initial config file parse, as at that time not both BTS and MSC settings are already present. This cold be a follow-up patch. -- To view, visit https://gerrit.osmocom.org/11243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice827896bab1a2330741e0fccc731a04f1a07d38 Gerrit-Change-Number: 11243 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 06 Oct 2018 10:20:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 10:20:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 6 Oct 2018 10:20:07 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_msc: Set reasonable codec list defaults In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11237 ) Change subject: osmo_bsc_msc: Set reasonable codec list defaults ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3749a65828c788f38c22f0a5314533f4516da3ed Gerrit-Change-Number: 11237 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 06 Oct 2018 10:20:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 10:20:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 6 Oct 2018 10:20:11 +0000 Subject: Change in osmo-bsc[master]: gsm_08_08: abort complete L3 3 msg gen when no codecs are set In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11236 ) Change subject: gsm_08_08: abort complete L3 3 msg gen when no codecs are set ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I119607047a132b75b3077bbe56c97936d8ae6c96 Gerrit-Change-Number: 11236 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 06 Oct 2018 10:20:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 10:20:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 6 Oct 2018 10:20:13 +0000 Subject: Change in osmo-bsc[master]: gsm_08_08: abort complete L3 3 msg gen when no codecs are set In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11236 ) Change subject: gsm_08_08: abort complete L3 3 msg gen when no codecs are set ...................................................................... gsm_08_08: abort complete L3 3 msg gen when no codecs are set The COMPLETE LAYER 3 INFORMATION message should contain a Codec List (BSS Supported) IE. The contents of this list depend on the BTS capabilities and of the MSC configuration (allowed codecs). There may be cases where (due to miss-configuration) the list is empty. In those cases the BSC hits an assertion because the encoding of the overall message fails when the codec list is empty. A check is needed. - Check codec list before message generation, abort if the coded list is empty. Change-Id: I119607047a132b75b3077bbe56c97936d8ae6c96 Related: OS#3625 --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 807eb8c..6e1e502 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -495,7 +495,12 @@ if (gscon_is_aoip(conn)) { gen_bss_supported_codec_list(&scl, msc, conn_get_bts(conn)); - resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), &scl); + if (scl.len > 0) + resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), &scl); + else { + LOGP(DMSC, LOGL_ERROR, "Failed to create layer3 message due to empty speech codec list.\n"); + return false; + } } else resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), NULL); -- To view, visit https://gerrit.osmocom.org/11236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I119607047a132b75b3077bbe56c97936d8ae6c96 Gerrit-Change-Number: 11236 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 10:20:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 6 Oct 2018 10:20:14 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_msc: Set reasonable codec list defaults In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11237 ) Change subject: osmo_bsc_msc: Set reasonable codec list defaults ...................................................................... osmo_bsc_msc: Set reasonable codec list defaults When the user sets no codec-list in the msc node, the configuration will end up with an empty codec list. This is a useless configuration. There should be a sane default setting. - Set all possible codecs as default for codec-list Change-Id: I3749a65828c788f38c22f0a5314533f4516da3ed Related: OS#3625 --- M src/osmo-bsc/osmo_bsc_msc.c 1 file changed, 22 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index e00c9ef..71931e6 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -64,6 +64,7 @@ struct bsc_msc_data *osmo_msc_data_alloc(struct gsm_network *net, int nr) { struct bsc_msc_data *msc_data; + unsigned int i; /* check if there is already one */ msc_data = osmo_msc_data_find(net, nr); @@ -94,6 +95,27 @@ /* Defaults for the audio setup */ msc_data->amr_conf.m5_90 = 1; + /* Allow the full set of possible codecs by default */ + msc_data->audio_length = 5; + msc_data->audio_support = + talloc_zero_array(msc_data, struct gsm_audio_support *, + msc_data->audio_length); + for (i = 0; i < msc_data->audio_length; i++) { + msc_data->audio_support[i] = + talloc_zero(msc_data->audio_support, + struct gsm_audio_support); + } + msc_data->audio_support[0]->ver = 1; + msc_data->audio_support[0]->hr = 0; + msc_data->audio_support[1]->ver = 1; + msc_data->audio_support[1]->hr = 1; + msc_data->audio_support[2]->ver = 2; + msc_data->audio_support[2]->hr = 0; + msc_data->audio_support[3]->ver = 3; + msc_data->audio_support[3]->hr = 0; + msc_data->audio_support[4]->ver = 3; + msc_data->audio_support[4]->hr = 1; + return msc_data; } -- To view, visit https://gerrit.osmocom.org/11237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3749a65828c788f38c22f0a5314533f4516da3ed Gerrit-Change-Number: 11237 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Oct 6 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 6 Oct 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#268?= Message-ID: <931338620.3.1538838606640.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 2.22 KB...] checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat Oct 6 19:26:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 6 Oct 2018 19:26:21 +0000 Subject: Change in osmo-sgsn[master]: fix build: remove unused variable Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11256 Change subject: fix build: remove unused variable ...................................................................... fix build: remove unused variable fix: "src/gprs/gprs_gmm_attach.c:240:6: error: unused variable ?rc?" introduced by "gprs_gmm: Fix missing Security Command for 3G when attaching" Change Id I1e12b0a32e58c6f78dba7b548f7d7016567229db Change-Id: I4837c10fed915c558a5374d448af813219087f36 --- M src/gprs/gprs_gmm_attach.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/56/11256/1 diff --git a/src/gprs/gprs_gmm_attach.c b/src/gprs/gprs_gmm_attach.c index 60c4398..6fdb3af 100644 --- a/src/gprs/gprs_gmm_attach.c +++ b/src/gprs/gprs_gmm_attach.c @@ -237,7 +237,6 @@ { #ifdef BUILD_IU struct sgsn_mm_ctx *ctx = fi->priv; - int rc = 0; /* TODO: shouldn't this set always? not only when the integrity_active? */ if (ctx->iu.ue_ctx->integrity_active) { -- To view, visit https://gerrit.osmocom.org/11256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4837c10fed915c558a5374d448af813219087f36 Gerrit-Change-Number: 11256 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 21:12:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 6 Oct 2018 21:12:29 +0000 Subject: Change in osmo-bsc[master]: nanoBTS: Allow BCCH with CBCH on TS0 Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11257 Change subject: nanoBTS: Allow BCCH with CBCH on TS0 ...................................................................... nanoBTS: Allow BCCH with CBCH on TS0 Change-Id: I111c7f14e5f70ecbf6c660c1de24c6a5796b2eef Closes: OS#3630 --- M src/osmo-bsc/abis_nm.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/57/11257/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 25b2c38..f75470d 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -1781,6 +1781,7 @@ /* only on TRX0 */ switch (chan_comb) { case NM_CHANC_BCCH: + case NM_CHANC_BCCH_CBCH: case NM_CHANC_mainBCCH: case NM_CHANC_BCCHComb: return 0; -- To view, visit https://gerrit.osmocom.org/11257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I111c7f14e5f70ecbf6c660c1de24c6a5796b2eef Gerrit-Change-Number: 11257 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 6 21:24:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 6 Oct 2018 21:24:23 +0000 Subject: Change in osmo-bts[master]: common/pcu_sock.c: cosmetic: explicitly address lchan Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11258 Change subject: common/pcu_sock.c: cosmetic: explicitly address lchan ...................................................................... common/pcu_sock.c: cosmetic: explicitly address lchan In the most cases a PDCH time-slot has only one logical channel allocated. In case of both osmo-bts-trx and osmo-bts-virtual, there are two kinds of logical channels: PDTCH and PTCCH, but since they share the same chan_nr value, deactivating one of them would trigger deactivation of another one. Let's explicitly address the first logical channel in array. Change-Id: I8edcb46e887c4db63a425eba89cec4374165763e Closes: OS#3023 --- M src/common/pcu_sock.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/58/11258/1 diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 7f32f32..60e0f7a 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -738,9 +738,9 @@ ts = &trx->ts[j]; if (ts->mo.nm_state.operational == NM_OPSTATE_ENABLED && ts->pchan == GSM_PCHAN_PDCH) { - ts->lchan->rel_act_kind = LCHAN_REL_ACT_PCU; + ts->lchan[0].rel_act_kind = LCHAN_REL_ACT_PCU; l1sap_chan_rel(trx, - gsm_lchan2chan_nr(ts->lchan)); + gsm_lchan2chan_nr(&ts->lchan[0])); } } } -- To view, visit https://gerrit.osmocom.org/11258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8edcb46e887c4db63a425eba89cec4374165763e Gerrit-Change-Number: 11258 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 00:29:34 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 7 Oct 2018 00:29:34 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: add extended (11-bit) RACH support In-Reply-To: References: Message-ID: Vadim Yanitskiy has uploaded a new patch set (#3) to the change originally created by Max. ( https://gerrit.osmocom.org/6315 ) Change subject: osmo-bts-trx: add extended (11-bit) RACH support ...................................................................... osmo-bts-trx: add extended (11-bit) RACH support Attempt to decode incoming RACH burst as 11-bit first and fallback to 8-bit if unsuccessful. Change-Id: Ia28741603636406744e5e22ffff1fb7a9689955a Related: OS#1854 --- M src/osmo-bts-trx/scheduler_trx.c 1 file changed, 29 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/15/6315/3 -- To view, visit https://gerrit.osmocom.org/6315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia28741603636406744e5e22ffff1fb7a9689955a Gerrit-Change-Number: 6315 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 07:36:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 7 Oct 2018 07:36:48 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: add extended (11-bit) RACH support In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/6315 ) Change subject: osmo-bts-trx: add extended (11-bit) RACH support ...................................................................... Patch Set 3: @fixeria: What's the statsu now? Before your re-upload, max wrote that it breaks operation. Now the "-1" is gone.. I'm marking it as WIP meanwhile, until clarification. -- To view, visit https://gerrit.osmocom.org/6315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia28741603636406744e5e22ffff1fb7a9689955a Gerrit-Change-Number: 6315 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 07 Oct 2018 07:36:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 07:37:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 7 Oct 2018 07:37:05 +0000 Subject: Change in osmo-bts[master]: common/pcu_sock.c: cosmetic: explicitly address lchan In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11258 ) Change subject: common/pcu_sock.c: cosmetic: explicitly address lchan ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8edcb46e887c4db63a425eba89cec4374165763e Gerrit-Change-Number: 11258 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 07 Oct 2018 07:37:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 07:37:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 7 Oct 2018 07:37:06 +0000 Subject: Change in osmo-bts[master]: common/pcu_sock.c: cosmetic: explicitly address lchan In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11258 ) Change subject: common/pcu_sock.c: cosmetic: explicitly address lchan ...................................................................... common/pcu_sock.c: cosmetic: explicitly address lchan In the most cases a PDCH time-slot has only one logical channel allocated. In case of both osmo-bts-trx and osmo-bts-virtual, there are two kinds of logical channels: PDTCH and PTCCH, but since they share the same chan_nr value, deactivating one of them would trigger deactivation of another one. Let's explicitly address the first logical channel in array. Change-Id: I8edcb46e887c4db63a425eba89cec4374165763e Closes: OS#3023 --- M src/common/pcu_sock.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 7f32f32..60e0f7a 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -738,9 +738,9 @@ ts = &trx->ts[j]; if (ts->mo.nm_state.operational == NM_OPSTATE_ENABLED && ts->pchan == GSM_PCHAN_PDCH) { - ts->lchan->rel_act_kind = LCHAN_REL_ACT_PCU; + ts->lchan[0].rel_act_kind = LCHAN_REL_ACT_PCU; l1sap_chan_rel(trx, - gsm_lchan2chan_nr(ts->lchan)); + gsm_lchan2chan_nr(&ts->lchan[0])); } } } -- To view, visit https://gerrit.osmocom.org/11258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8edcb46e887c4db63a425eba89cec4374165763e Gerrit-Change-Number: 11258 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 07:37:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 7 Oct 2018 07:37:15 +0000 Subject: Change in osmo-bsc[master]: nanoBTS: Allow BCCH with CBCH on TS0 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11257 ) Change subject: nanoBTS: Allow BCCH with CBCH on TS0 ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I111c7f14e5f70ecbf6c660c1de24c6a5796b2eef Gerrit-Change-Number: 11257 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: roox Gerrit-Comment-Date: Sun, 07 Oct 2018 07:37:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 07:37:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 7 Oct 2018 07:37:17 +0000 Subject: Change in osmo-bsc[master]: nanoBTS: Allow BCCH with CBCH on TS0 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11257 ) Change subject: nanoBTS: Allow BCCH with CBCH on TS0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I111c7f14e5f70ecbf6c660c1de24c6a5796b2eef Gerrit-Change-Number: 11257 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: roox Gerrit-Comment-Date: Sun, 07 Oct 2018 07:37:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 07:37:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 7 Oct 2018 07:37:30 +0000 Subject: Change in osmo-bsc[master]: nanoBTS: Allow BCCH with CBCH on TS0 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11257 ) Change subject: nanoBTS: Allow BCCH with CBCH on TS0 ...................................................................... Patch Set 1: works according to roox. -- To view, visit https://gerrit.osmocom.org/11257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I111c7f14e5f70ecbf6c660c1de24c6a5796b2eef Gerrit-Change-Number: 11257 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: roox Gerrit-Comment-Date: Sun, 07 Oct 2018 07:37:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 07:37:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 7 Oct 2018 07:37:31 +0000 Subject: Change in osmo-bsc[master]: nanoBTS: Allow BCCH with CBCH on TS0 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11257 ) Change subject: nanoBTS: Allow BCCH with CBCH on TS0 ...................................................................... nanoBTS: Allow BCCH with CBCH on TS0 Change-Id: I111c7f14e5f70ecbf6c660c1de24c6a5796b2eef Closes: OS#3630 --- M src/osmo-bsc/abis_nm.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 25b2c38..f75470d 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -1781,6 +1781,7 @@ /* only on TRX0 */ switch (chan_comb) { case NM_CHANC_BCCH: + case NM_CHANC_BCCH_CBCH: case NM_CHANC_mainBCCH: case NM_CHANC_BCCHComb: return 0; -- To view, visit https://gerrit.osmocom.org/11257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I111c7f14e5f70ecbf6c660c1de24c6a5796b2eef Gerrit-Change-Number: 11257 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: roox -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 09:13:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 7 Oct 2018 09:13:43 +0000 Subject: Change in docker-playground[master]: redmine: Fix openid Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11259 Change subject: redmine: Fix openid ...................................................................... redmine: Fix openid For some reason, redmine:3.4 ships with ancient (2014) ruby-openid, which is no longer compatible with the way how ruby handles HMAC. Change-Id: I60f6f1ede059accf6b29891abcfe3b2529744e8a --- M redmine/Dockerfile 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/59/11259/1 diff --git a/redmine/Dockerfile b/redmine/Dockerfile index 25f6308..488d6f4 100644 --- a/redmine/Dockerfile +++ b/redmine/Dockerfile @@ -7,3 +7,6 @@ mscgen \ patch && \ apt-get clean + +ADD hmac.diff /tmp/hmac.diff +RUN cd / && patch -p0 < /tmp/hmac.diff -- To view, visit https://gerrit.osmocom.org/11259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I60f6f1ede059accf6b29891abcfe3b2529744e8a Gerrit-Change-Number: 11259 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 09:15:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 7 Oct 2018 09:15:07 +0000 Subject: Change in docker-playground[master]: redmine: Fix openid In-Reply-To: References: Message-ID: Harald Welte has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11259 ) Change subject: redmine: Fix openid ...................................................................... redmine: Fix openid For some reason, redmine:3.4 ships with ancient (2014) ruby-openid, which is no longer compatible with the way how ruby handles HMAC. Change-Id: I60f6f1ede059accf6b29891abcfe3b2529744e8a --- M redmine/Dockerfile A redmine/hmac.diff 2 files changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/59/11259/2 -- To view, visit https://gerrit.osmocom.org/11259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I60f6f1ede059accf6b29891abcfe3b2529744e8a Gerrit-Change-Number: 11259 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 09:17:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 7 Oct 2018 09:17:39 +0000 Subject: Change in docker-playground[master]: redmine: Fix openid In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11259 ) Change subject: redmine: Fix openid ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I60f6f1ede059accf6b29891abcfe3b2529744e8a Gerrit-Change-Number: 11259 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 07 Oct 2018 09:17:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 09:17:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 7 Oct 2018 09:17:40 +0000 Subject: Change in docker-playground[master]: redmine: Fix openid In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11259 ) Change subject: redmine: Fix openid ...................................................................... redmine: Fix openid For some reason, redmine:3.4 ships with ancient (2014) ruby-openid, which is no longer compatible with the way how ruby handles HMAC. Change-Id: I60f6f1ede059accf6b29891abcfe3b2529744e8a --- M redmine/Dockerfile A redmine/hmac.diff 2 files changed, 24 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/redmine/Dockerfile b/redmine/Dockerfile index 25f6308..488d6f4 100644 --- a/redmine/Dockerfile +++ b/redmine/Dockerfile @@ -7,3 +7,6 @@ mscgen \ patch && \ apt-get clean + +ADD hmac.diff /tmp/hmac.diff +RUN cd / && patch -p0 < /tmp/hmac.diff diff --git a/redmine/hmac.diff b/redmine/hmac.diff new file mode 100644 index 0000000..197960b --- /dev/null +++ b/redmine/hmac.diff @@ -0,0 +1,21 @@ +--- usr/local/bundle/gems/ruby-openid-2.3.0/lib/openid/cryptutil.rb.old 2018-10-07 08:53:33.612724431 +0000 ++++ usr/local/bundle/gems/ruby-openid-2.3.0/lib/openid/cryptutil.rb 2018-10-07 08:54:03.016525355 +0000 +@@ -39,6 +39,6 @@ + def CryptUtil.hmac_sha1(key, text) +- if Digest.const_defined? :HMAC +- Digest::HMAC.new(key,Digest::SHA1).update(text).digest ++ if defined? OpenSSL ++ OpenSSL::HMAC.digest(OpenSSL::Digest::SHA1.new, key, text) + else + return HMAC::SHA1.digest(key, text) + end +@@ -50,7 +50,7 @@ + + def CryptUtil.hmac_sha256(key, text) +- if Digest.const_defined? :HMAC +- Digest::HMAC.new(key,Digest::SHA256).update(text).digest ++ if defined? OpenSSL ++ OpenSSL::HMAC.digest(OpenSSL::Digest::SHA256.new, key, text) + else + return HMAC::SHA256.digest(key, text) + end -- To view, visit https://gerrit.osmocom.org/11259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I60f6f1ede059accf6b29891abcfe3b2529744e8a Gerrit-Change-Number: 11259 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 09:43:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 7 Oct 2018 09:43:18 +0000 Subject: Change in osmo-sgsn[master]: fix build: remove unused variable In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11256 ) Change subject: fix build: remove unused variable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4837c10fed915c558a5374d448af813219087f36 Gerrit-Change-Number: 11256 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 07 Oct 2018 09:43:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 09:43:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 7 Oct 2018 09:43:22 +0000 Subject: Change in osmo-sgsn[master]: fix build: remove unused variable In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11256 ) Change subject: fix build: remove unused variable ...................................................................... fix build: remove unused variable fix: "src/gprs/gprs_gmm_attach.c:240:6: error: unused variable ?rc?" introduced by "gprs_gmm: Fix missing Security Command for 3G when attaching" Change Id I1e12b0a32e58c6f78dba7b548f7d7016567229db Change-Id: I4837c10fed915c558a5374d448af813219087f36 --- M src/gprs/gprs_gmm_attach.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/gprs/gprs_gmm_attach.c b/src/gprs/gprs_gmm_attach.c index 60c4398..6fdb3af 100644 --- a/src/gprs/gprs_gmm_attach.c +++ b/src/gprs/gprs_gmm_attach.c @@ -237,7 +237,6 @@ { #ifdef BUILD_IU struct sgsn_mm_ctx *ctx = fi->priv; - int rc = 0; /* TODO: shouldn't this set always? not only when the integrity_active? */ if (ctx->iu.ue_ctx->integrity_active) { -- To view, visit https://gerrit.osmocom.org/11256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4837c10fed915c558a5374d448af813219087f36 Gerrit-Change-Number: 11256 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 09:47:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 7 Oct 2018 09:47:03 +0000 Subject: Change in osmocom-bb[master]: layer23/common: introduce L23SAP API for L1CTL In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11246 ) Change subject: layer23/common: introduce L23SAP API for L1CTL ...................................................................... Patch Set 1: I'm not sure I'm following you here. The existing "Layer2/3" SAP is the RSL/RSLms SAP boundary on top of LAPDm, as provided by libosmocore. If thre are some helpers missing, fine. But calling that a new SAP (which is basically 90% only using the existing RSLms SAP) seems more confusing to me? -- To view, visit https://gerrit.osmocom.org/11246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I22d7932ddc03c692f2616726ced53b6e8eef822d Gerrit-Change-Number: 11246 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sun, 07 Oct 2018 09:47:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 09:49:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 7 Oct 2018 09:49:11 +0000 Subject: Change in osmocom-bb[master]: layer23/l23sap.c: fix: use host byte order for dl->frame_nr In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11252 ) Change subject: layer23/l23sap.c: fix: use host byte order for dl->frame_nr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic72b04b4bb6990413578b1e9f4499fe98acf5d85 Gerrit-Change-Number: 11252 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 07 Oct 2018 09:49:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 09:49:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 7 Oct 2018 09:49:18 +0000 Subject: Change in osmocom-bb[master]: layer23/l23sap.c: use the CHAN_IS_SACCH() macro In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11253 ) Change subject: layer23/l23sap.c: use the CHAN_IS_SACCH() macro ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I25200bbcd174882b37e7c628e7f1204c488aa258 Gerrit-Change-Number: 11253 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 07 Oct 2018 09:49:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 09:50:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 7 Oct 2018 09:50:32 +0000 Subject: Change in osmocom-bb[master]: layer23/l23sap.c: use safe wrapper around rsl_dec_chan_nr() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11254 ) Change subject: layer23/l23sap.c: use safe wrapper around rsl_dec_chan_nr() ...................................................................... Patch Set 1: one coudl simply put an OSMO_ASSERT() in the code. I mean, if this condition is hit, it for sure is a serious bug in the program that should be fixed, rather than hidden behind uninitialized memory accesses or log messages that most users won't read as they scroll by ;) -- To view, visit https://gerrit.osmocom.org/11254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id78304f494be70aa05e2da11c785ba5d9aeaf6db Gerrit-Change-Number: 11254 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sun, 07 Oct 2018 09:50:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Oct 7 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 7 Oct 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#269?= In-Reply-To: <931338620.3.1538838606640.JavaMail.jenkins@jenkins.osmocom.org> References: <931338620.3.1538838606640.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <564588616.1.1538925007396.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.92 KB...] checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists mkdir: cannot create directory '.libs': File exists mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun Oct 7 15:13:16 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 7 Oct 2018 15:13:16 +0000 Subject: Change in osmocom-bb[master]: layer23/common: introduce L23SAP API for L1CTL In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11246 ) Change subject: layer23/common: introduce L23SAP API for L1CTL ...................................................................... Patch Set 1: > I'm not sure I'm following you here. The existing "Layer2/3" SAP > is the RSL/RSLms SAP boundary on top of LAPDm, as provided by > libosmocore. > > If thre are some helpers missing, fine. But calling that a new SAP > (which is basically 90% only using the existing RSLms SAP) seems > more confusing to me? TBH, I was not sure how to call this new layer properly. The main idea is to clean up and abstract the L1CTL code from the things (e.g. GSMTAP) that are not related to L1CTL at all. How would you call this? :) And do you support the idea of introducing this layer? -- To view, visit https://gerrit.osmocom.org/11246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I22d7932ddc03c692f2616726ced53b6e8eef822d Gerrit-Change-Number: 11246 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sun, 07 Oct 2018 15:13:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 15:26:45 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 7 Oct 2018 15:26:45 +0000 Subject: Change in osmocom-bb[master]: layer23/l23sap.c: use safe wrapper around rsl_dec_chan_nr() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11254 ) Change subject: layer23/l23sap.c: use safe wrapper around rsl_dec_chan_nr() ...................................................................... Patch Set 1: > one coudl simply put an OSMO_ASSERT() in the code. [...] > I mean, if this condition is hit, it for sure is a serious > bug in the program that should be fixed I don't consider this as a bug, since there are Osmocom specific cbits (e.g. CBCH and PDCH), and rsl_dec_chan_nr() is not able to decode such "out of the specs." chan_nr values. Crashing the whole L23 application just because an unknown (yet) kind of L2 frame is received doesn't look like a good idea for me... -- To view, visit https://gerrit.osmocom.org/11254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id78304f494be70aa05e2da11c785ba5d9aeaf6db Gerrit-Change-Number: 11254 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sun, 07 Oct 2018 15:26:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 16:28:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 7 Oct 2018 16:28:57 +0000 Subject: Change in docker-playground[master]: add "public-inbox" Dockerfile + Makefiel Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11260 Change subject: add "public-inbox" Dockerfile + Makefiel ...................................................................... add "public-inbox" Dockerfile + Makefiel this is just for playing around with it. It might be a good alternative mailing list archive + access technology in parallel to pipermail (or soon hyperkitty). Change-Id: I5882d7637fe8d0ea15040d75709e95b170789c09 --- A public-inbox/Dockerfile A public-inbox/Makefile 2 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/60/11260/1 diff --git a/public-inbox/Dockerfile b/public-inbox/Dockerfile new file mode 100644 index 0000000..a0d60f7 --- /dev/null +++ b/public-inbox/Dockerfile @@ -0,0 +1,20 @@ +FROM debian:stable + +ENV DEBIAN_FRONTEND noninteractive + +RUN apt-get update && \ + apt-get -y install \ + git libtimedate-perl libemail-mime-perl libemail-mime-contenttype-perl \ + make perl libplack-perl libmail-thread-perl liburi-perl libdanga-socket-perl \ + libnet-server-perl libsearch-xapian-perl libdbi-perl libdbd-sqlite3-perl + +RUN git clone https://public-inbox.org ~/public-inbox && \ + cd ~/public-inbox && \ + perl Makefile.PL && \ + make && \ + make install && \ + rm -rf ~/public-inbox + +CMD (cd /srv; for NAME in *; do CONF="/srv/${NAME}/config"; public-inbox-init "${NAME}" "/srv/${NAME}" $(git config -f "${CONF}" publicinbox.http) $(git config -f "${CONF}" publicinbox.email); done) && public-inbox-index /srv/* && public-inbox-httpd + +EXPOSE 8080 diff --git a/public-inbox/Makefile b/public-inbox/Makefile new file mode 100644 index 0000000..0744814 --- /dev/null +++ b/public-inbox/Makefile @@ -0,0 +1,3 @@ +IMAGE=registry.sysmocom.de/public-inbox + +include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/11260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5882d7637fe8d0ea15040d75709e95b170789c09 Gerrit-Change-Number: 11260 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 16:30:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 7 Oct 2018 16:30:20 +0000 Subject: Change in docker-playground[master]: add "public-inbox" Dockerfile + Makefiel In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11260 ) Change subject: add "public-inbox" Dockerfile + Makefiel ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5882d7637fe8d0ea15040d75709e95b170789c09 Gerrit-Change-Number: 11260 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 07 Oct 2018 16:30:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 16:30:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 7 Oct 2018 16:30:21 +0000 Subject: Change in docker-playground[master]: add "public-inbox" Dockerfile + Makefiel In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11260 ) Change subject: add "public-inbox" Dockerfile + Makefiel ...................................................................... add "public-inbox" Dockerfile + Makefiel this is just for playing around with it. It might be a good alternative mailing list archive + access technology in parallel to pipermail (or soon hyperkitty). Change-Id: I5882d7637fe8d0ea15040d75709e95b170789c09 --- A public-inbox/Dockerfile A public-inbox/Makefile 2 files changed, 23 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/public-inbox/Dockerfile b/public-inbox/Dockerfile new file mode 100644 index 0000000..a0d60f7 --- /dev/null +++ b/public-inbox/Dockerfile @@ -0,0 +1,20 @@ +FROM debian:stable + +ENV DEBIAN_FRONTEND noninteractive + +RUN apt-get update && \ + apt-get -y install \ + git libtimedate-perl libemail-mime-perl libemail-mime-contenttype-perl \ + make perl libplack-perl libmail-thread-perl liburi-perl libdanga-socket-perl \ + libnet-server-perl libsearch-xapian-perl libdbi-perl libdbd-sqlite3-perl + +RUN git clone https://public-inbox.org ~/public-inbox && \ + cd ~/public-inbox && \ + perl Makefile.PL && \ + make && \ + make install && \ + rm -rf ~/public-inbox + +CMD (cd /srv; for NAME in *; do CONF="/srv/${NAME}/config"; public-inbox-init "${NAME}" "/srv/${NAME}" $(git config -f "${CONF}" publicinbox.http) $(git config -f "${CONF}" publicinbox.email); done) && public-inbox-index /srv/* && public-inbox-httpd + +EXPOSE 8080 diff --git a/public-inbox/Makefile b/public-inbox/Makefile new file mode 100644 index 0000000..0744814 --- /dev/null +++ b/public-inbox/Makefile @@ -0,0 +1,3 @@ +IMAGE=registry.sysmocom.de/public-inbox + +include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/11260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5882d7637fe8d0ea15040d75709e95b170789c09 Gerrit-Change-Number: 11260 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 18:28:58 2018 From: gerrit-no-reply at lists.osmocom.org (Shinjo Park) Date: Sun, 7 Oct 2018 18:28:58 +0000 Subject: Change in libosmocore[master]: GSMTAP: add definitions for new LTE RRC channels Message-ID: Shinjo Park has uploaded this change for review. ( https://gerrit.osmocom.org/11261 Change subject: GSMTAP: add definitions for new LTE RRC channels ...................................................................... GSMTAP: add definitions for new LTE RRC channels Later release of 3GPP TS 36.331 added new LTE RRC channels. This commit additionally defines LTE RRC message types existing in Release V15.3.0. Change-Id: Ifa48b2227be15af04c9a4702d2025abcc660f0df --- M include/osmocom/core/gsmtap.h 1 file changed, 24 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/61/11261/1 diff --git a/include/osmocom/core/gsmtap.h b/include/osmocom/core/gsmtap.h index 9f5049f..9e3db0b 100644 --- a/include/osmocom/core/gsmtap.h +++ b/include/osmocom/core/gsmtap.h @@ -245,16 +245,31 @@ /* LTE RRC message types */ enum { - GSMTAP_LTE_RRC_SUB_DL_CCCH_Message = 0, - GSMTAP_LTE_RRC_SUB_DL_DCCH_Message, - GSMTAP_LTE_RRC_SUB_UL_CCCH_Message, - GSMTAP_LTE_RRC_SUB_UL_DCCH_Message, - GSMTAP_LTE_RRC_SUB_BCCH_BCH_Message, - GSMTAP_LTE_RRC_SUB_BCCH_DL_SCH_Message, - GSMTAP_LTE_RRC_SUB_PCCH_Message, - GSMTAP_LTE_RRC_SUB_MCCH_Message, + GSMTAP_LTE_RRC_SUB_DL_CCCH_Message = 0, + GSMTAP_LTE_RRC_SUB_DL_DCCH_Message, + GSMTAP_LTE_RRC_SUB_UL_CCCH_Message, + GSMTAP_LTE_RRC_SUB_UL_DCCH_Message, + GSMTAP_LTE_RRC_SUB_BCCH_BCH_Message, + GSMTAP_LTE_RRC_SUB_BCCH_DL_SCH_Message, + GSMTAP_LTE_RRC_SUB_PCCH_Message, + GSMTAP_LTE_RRC_SUB_MCCH_Message, + GSMTAP_LTE_RRC_SUB_BCCH_BCH_Message_MBMS, + GSMTAP_LTE_RRC_SUB_BCCH_DL_SCH_Message_BR, + GSMTAP_LTE_RRC_SUB_BCCH_DL_SCH_Message_MBMS, + GSMTAP_LTE_RRC_SUB_SC_MCCH_Message, + GSMTAP_LTE_RRC_SUB_SBCCH_SL_BCH_Message, + GSMTAP_LTE_RRC_SUB_SBCCH_SL_BCH_Message_V2X, + GSMTAP_LTE_RRC_SUB_DL_CCCH_Message_NB, + GSMTAP_LTE_RRC_SUB_DL_DCCH_Message_NB, + GSMTAP_LTE_RRC_SUB_UL_CCCH_Message_NB, + GSMTAP_LTE_RRC_SUB_UL_DCCH_Message_NB, + GSMTAP_LTE_RRC_SUB_BCCH_BCH_Message_NB, + GSMTAP_LTE_RRC_SUB_BCCH_BCH_Message_TDD_NB, + GSMTAP_LTE_RRC_SUB_BCCH_DL_SCH_Message_NB, + GSMTAP_LTE_RRC_SUB_PCCH_Message_NB, + GSMTAP_LTE_RRC_SUB_SC_MCCH_Message_NB, - GSMTAP_LTE_RRC_SUB_MAX + GSMTAP_LTE_RRC_SUB_MAX }; /* ====== DO NOT MAKE UNAPPROVED MODIFICATIONS HERE ===== */ -- To view, visit https://gerrit.osmocom.org/11261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa48b2227be15af04c9a4702d2025abcc660f0df Gerrit-Change-Number: 11261 Gerrit-PatchSet: 1 Gerrit-Owner: Shinjo Park -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 18:28:59 2018 From: gerrit-no-reply at lists.osmocom.org (Shinjo Park) Date: Sun, 7 Oct 2018 18:28:59 +0000 Subject: Change in libosmocore[master]: GSMTAP: add definitions for LTE NAS subtypes Message-ID: Shinjo Park has uploaded this change for review. ( https://gerrit.osmocom.org/11262 Change subject: GSMTAP: add definitions for LTE NAS subtypes ...................................................................... GSMTAP: add definitions for LTE NAS subtypes Wireshark GSMTAP dissector has LTE NAS subtypes for plain NAS messages and NAS messages with security header. This commit adds definition for these subtypes. Change-Id: I49d15fb13299c1bcbe0fb7e50bf222294c7a49ef --- M include/osmocom/core/gsmtap.h 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/62/11262/1 diff --git a/include/osmocom/core/gsmtap.h b/include/osmocom/core/gsmtap.h index 9e3db0b..9c2965b 100644 --- a/include/osmocom/core/gsmtap.h +++ b/include/osmocom/core/gsmtap.h @@ -272,6 +272,14 @@ GSMTAP_LTE_RRC_SUB_MAX }; +/* LTE NAS message types */ +enum { + GSMTAP_LTE_NAS_PLAIN = 0, + GSMTAP_LTE_NAS_SEC_HEADER, + + GSMTAP_LTE_NAS_SUB_MAX +}; + /* ====== DO NOT MAKE UNAPPROVED MODIFICATIONS HERE ===== */ /*! Structure of the GTMTAP pseudo-header */ struct gsmtap_hdr { -- To view, visit https://gerrit.osmocom.org/11262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I49d15fb13299c1bcbe0fb7e50bf222294c7a49ef Gerrit-Change-Number: 11262 Gerrit-PatchSet: 1 Gerrit-Owner: Shinjo Park -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 7 18:29:00 2018 From: gerrit-no-reply at lists.osmocom.org (Shinjo Park) Date: Sun, 7 Oct 2018 18:29:00 +0000 Subject: Change in libosmocore[master]: GSMTAP: fix typos in comments Message-ID: Shinjo Park has uploaded this change for review. ( https://gerrit.osmocom.org/11263 Change subject: GSMTAP: fix typos in comments ...................................................................... GSMTAP: fix typos in comments Change-Id: I2e710141ee90ddc8b5336d5f81e99bd918d10106 --- M include/osmocom/core/gsmtap.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/63/11263/1 diff --git a/include/osmocom/core/gsmtap.h b/include/osmocom/core/gsmtap.h index 9c2965b..35ba71e 100644 --- a/include/osmocom/core/gsmtap.h +++ b/include/osmocom/core/gsmtap.h @@ -281,7 +281,7 @@ }; /* ====== DO NOT MAKE UNAPPROVED MODIFICATIONS HERE ===== */ -/*! Structure of the GTMTAP pseudo-header */ +/*! Structure of the GSMTAP pseudo-header */ struct gsmtap_hdr { uint8_t version; /*!< version, set to 0x01 currently */ uint8_t hdr_len; /*!< length in number of 32bit words */ @@ -301,7 +301,7 @@ } __attribute__((packed)); -/*! Structure of the GTMTAP libosmocore logging header */ +/*! Structure of the GSMTAP libosmocore logging header */ struct gsmtap_osmocore_log_hdr { struct { uint32_t sec; -- To view, visit https://gerrit.osmocom.org/11263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2e710141ee90ddc8b5336d5f81e99bd918d10106 Gerrit-Change-Number: 11263 Gerrit-PatchSet: 1 Gerrit-Owner: Shinjo Park -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 06:28:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 06:28:38 +0000 Subject: Change in libosmocore[master]: GSMTAP: add definitions for new LTE RRC channels In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11261 ) Change subject: GSMTAP: add definitions for new LTE RRC channels ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifa48b2227be15af04c9a4702d2025abcc660f0df Gerrit-Change-Number: 11261 Gerrit-PatchSet: 1 Gerrit-Owner: Shinjo Park Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Shinjo Park Gerrit-Comment-Date: Mon, 08 Oct 2018 06:28:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 06:28:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 06:28:39 +0000 Subject: Change in libosmocore[master]: GSMTAP: add definitions for new LTE RRC channels In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11261 ) Change subject: GSMTAP: add definitions for new LTE RRC channels ...................................................................... GSMTAP: add definitions for new LTE RRC channels Later release of 3GPP TS 36.331 added new LTE RRC channels. This commit additionally defines LTE RRC message types existing in Release V15.3.0. Change-Id: Ifa48b2227be15af04c9a4702d2025abcc660f0df --- M include/osmocom/core/gsmtap.h 1 file changed, 24 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/core/gsmtap.h b/include/osmocom/core/gsmtap.h index 9f5049f..9e3db0b 100644 --- a/include/osmocom/core/gsmtap.h +++ b/include/osmocom/core/gsmtap.h @@ -245,16 +245,31 @@ /* LTE RRC message types */ enum { - GSMTAP_LTE_RRC_SUB_DL_CCCH_Message = 0, - GSMTAP_LTE_RRC_SUB_DL_DCCH_Message, - GSMTAP_LTE_RRC_SUB_UL_CCCH_Message, - GSMTAP_LTE_RRC_SUB_UL_DCCH_Message, - GSMTAP_LTE_RRC_SUB_BCCH_BCH_Message, - GSMTAP_LTE_RRC_SUB_BCCH_DL_SCH_Message, - GSMTAP_LTE_RRC_SUB_PCCH_Message, - GSMTAP_LTE_RRC_SUB_MCCH_Message, + GSMTAP_LTE_RRC_SUB_DL_CCCH_Message = 0, + GSMTAP_LTE_RRC_SUB_DL_DCCH_Message, + GSMTAP_LTE_RRC_SUB_UL_CCCH_Message, + GSMTAP_LTE_RRC_SUB_UL_DCCH_Message, + GSMTAP_LTE_RRC_SUB_BCCH_BCH_Message, + GSMTAP_LTE_RRC_SUB_BCCH_DL_SCH_Message, + GSMTAP_LTE_RRC_SUB_PCCH_Message, + GSMTAP_LTE_RRC_SUB_MCCH_Message, + GSMTAP_LTE_RRC_SUB_BCCH_BCH_Message_MBMS, + GSMTAP_LTE_RRC_SUB_BCCH_DL_SCH_Message_BR, + GSMTAP_LTE_RRC_SUB_BCCH_DL_SCH_Message_MBMS, + GSMTAP_LTE_RRC_SUB_SC_MCCH_Message, + GSMTAP_LTE_RRC_SUB_SBCCH_SL_BCH_Message, + GSMTAP_LTE_RRC_SUB_SBCCH_SL_BCH_Message_V2X, + GSMTAP_LTE_RRC_SUB_DL_CCCH_Message_NB, + GSMTAP_LTE_RRC_SUB_DL_DCCH_Message_NB, + GSMTAP_LTE_RRC_SUB_UL_CCCH_Message_NB, + GSMTAP_LTE_RRC_SUB_UL_DCCH_Message_NB, + GSMTAP_LTE_RRC_SUB_BCCH_BCH_Message_NB, + GSMTAP_LTE_RRC_SUB_BCCH_BCH_Message_TDD_NB, + GSMTAP_LTE_RRC_SUB_BCCH_DL_SCH_Message_NB, + GSMTAP_LTE_RRC_SUB_PCCH_Message_NB, + GSMTAP_LTE_RRC_SUB_SC_MCCH_Message_NB, - GSMTAP_LTE_RRC_SUB_MAX + GSMTAP_LTE_RRC_SUB_MAX }; /* ====== DO NOT MAKE UNAPPROVED MODIFICATIONS HERE ===== */ -- To view, visit https://gerrit.osmocom.org/11261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifa48b2227be15af04c9a4702d2025abcc660f0df Gerrit-Change-Number: 11261 Gerrit-PatchSet: 1 Gerrit-Owner: Shinjo Park Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Shinjo Park -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 06:28:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 06:28:53 +0000 Subject: Change in libosmocore[master]: GSMTAP: add definitions for LTE NAS subtypes In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11262 ) Change subject: GSMTAP: add definitions for LTE NAS subtypes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I49d15fb13299c1bcbe0fb7e50bf222294c7a49ef Gerrit-Change-Number: 11262 Gerrit-PatchSet: 1 Gerrit-Owner: Shinjo Park Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Shinjo Park Gerrit-Comment-Date: Mon, 08 Oct 2018 06:28:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 06:29:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 06:29:02 +0000 Subject: Change in libosmocore[master]: GSMTAP: fix typos in comments In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11263 ) Change subject: GSMTAP: fix typos in comments ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2e710141ee90ddc8b5336d5f81e99bd918d10106 Gerrit-Change-Number: 11263 Gerrit-PatchSet: 1 Gerrit-Owner: Shinjo Park Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Shinjo Park Gerrit-Comment-Date: Mon, 08 Oct 2018 06:29:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 06:29:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 06:29:04 +0000 Subject: Change in libosmocore[master]: GSMTAP: add definitions for LTE NAS subtypes In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11262 ) Change subject: GSMTAP: add definitions for LTE NAS subtypes ...................................................................... GSMTAP: add definitions for LTE NAS subtypes Wireshark GSMTAP dissector has LTE NAS subtypes for plain NAS messages and NAS messages with security header. This commit adds definition for these subtypes. Change-Id: I49d15fb13299c1bcbe0fb7e50bf222294c7a49ef --- M include/osmocom/core/gsmtap.h 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/core/gsmtap.h b/include/osmocom/core/gsmtap.h index 9e3db0b..9c2965b 100644 --- a/include/osmocom/core/gsmtap.h +++ b/include/osmocom/core/gsmtap.h @@ -272,6 +272,14 @@ GSMTAP_LTE_RRC_SUB_MAX }; +/* LTE NAS message types */ +enum { + GSMTAP_LTE_NAS_PLAIN = 0, + GSMTAP_LTE_NAS_SEC_HEADER, + + GSMTAP_LTE_NAS_SUB_MAX +}; + /* ====== DO NOT MAKE UNAPPROVED MODIFICATIONS HERE ===== */ /*! Structure of the GTMTAP pseudo-header */ struct gsmtap_hdr { -- To view, visit https://gerrit.osmocom.org/11262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I49d15fb13299c1bcbe0fb7e50bf222294c7a49ef Gerrit-Change-Number: 11262 Gerrit-PatchSet: 1 Gerrit-Owner: Shinjo Park Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Shinjo Park -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 06:29:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 06:29:04 +0000 Subject: Change in libosmocore[master]: GSMTAP: fix typos in comments In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11263 ) Change subject: GSMTAP: fix typos in comments ...................................................................... GSMTAP: fix typos in comments Change-Id: I2e710141ee90ddc8b5336d5f81e99bd918d10106 --- M include/osmocom/core/gsmtap.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/core/gsmtap.h b/include/osmocom/core/gsmtap.h index 9c2965b..35ba71e 100644 --- a/include/osmocom/core/gsmtap.h +++ b/include/osmocom/core/gsmtap.h @@ -281,7 +281,7 @@ }; /* ====== DO NOT MAKE UNAPPROVED MODIFICATIONS HERE ===== */ -/*! Structure of the GTMTAP pseudo-header */ +/*! Structure of the GSMTAP pseudo-header */ struct gsmtap_hdr { uint8_t version; /*!< version, set to 0x01 currently */ uint8_t hdr_len; /*!< length in number of 32bit words */ @@ -301,7 +301,7 @@ } __attribute__((packed)); -/*! Structure of the GTMTAP libosmocore logging header */ +/*! Structure of the GSMTAP libosmocore logging header */ struct gsmtap_osmocore_log_hdr { struct { uint32_t sec; -- To view, visit https://gerrit.osmocom.org/11263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2e710141ee90ddc8b5336d5f81e99bd918d10106 Gerrit-Change-Number: 11263 Gerrit-PatchSet: 1 Gerrit-Owner: Shinjo Park Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Shinjo Park -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 07:55:39 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 8 Oct 2018 07:55:39 +0000 Subject: Change in osmo-bsc[master]: codec_pref: check codec configuration before start In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11243 ) Change subject: codec_pref: check codec configuration before start ...................................................................... Patch Set 1: > (1 comment) I think we should keep the check so the problem can be found in the logs. For the interactive VTY we could accept the values but print a warning if the configuration is problematic. -- To view, visit https://gerrit.osmocom.org/11243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice827896bab1a2330741e0fccc731a04f1a07d38 Gerrit-Change-Number: 11243 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 08 Oct 2018 07:55:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 09:50:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 09:50:12 +0000 Subject: Change in osmo-bsc[master]: codec_pref: check codec configuration before start In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11243 ) Change subject: codec_pref: check codec configuration before start ...................................................................... codec_pref: check codec configuration before start In networks with a couple of different BTSs it may be likely that one accidently sets up a codec configuration (codec-support)) that will be mutually exclusive towards the codec configuration for the MSC (codec-list). We need a check that validates the configuration before start to catch such configuration flaws quickly. - Add a check that checks each MSC codec-list against each BTS codec-support setting. Change-Id: Ice827896bab1a2330741e0fccc731a04f1a07d38 Related: OS#3625 --- M include/osmocom/bsc/codec_pref.h M src/osmo-bsc/codec_pref.c M src/osmo-bsc/osmo_bsc_main.c 3 files changed, 33 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/codec_pref.h b/include/osmocom/bsc/codec_pref.h index 3085ad4..d62d29f 100644 --- a/include/osmocom/bsc/codec_pref.h +++ b/include/osmocom/bsc/codec_pref.h @@ -21,3 +21,5 @@ void gen_bss_supported_codec_list(struct gsm0808_speech_codec_list *scl, const struct bsc_msc_data *msc, const struct gsm_bts *bts); + +int check_codec_pref(struct llist_head *mscs); diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index afecaa3..0f0ffa5 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -348,3 +348,29 @@ } } +/*! Visit the codec settings for the MSC and for each BTS in order to make sure + * that the configuration does not contain any combinations that lead into a + * mutually exclusive codec configuration (empty intersection). + * \param[in] mscs list head of the msc list. + * \returns 0 on success, -1 in case an invalid setting is found. */ +int check_codec_pref(struct llist_head *mscs) +{ + struct bsc_msc_data *msc; + struct gsm_bts *bts; + struct gsm0808_speech_codec_list scl; + int rc = 0; + + llist_for_each_entry(msc, mscs, entry) { + llist_for_each_entry(bts, &msc->network->bts_list, list) { + gen_bss_supported_codec_list(&scl, msc, bts); + if (scl.len <= 0) { + LOGP(DMSC, LOGL_FATAL, + "codec-support of BTS %u does not intersect with codec-list of MSC %u\n", + bts->nr, msc->nr); + rc = -1; + } + } + } + + return rc; +} diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 468b58e..67fccd3 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -59,6 +59,7 @@ #include #include #include +#include #include @@ -881,6 +882,10 @@ exit(1); } + rc = check_codec_pref(&bsc_gsmnet->bsc_data->mscs); + if (rc < 0) + LOGP(DMSC, LOGL_ERROR, "Configuration contains mutually exclusive codec settings -- check configuration!\n"); + llist_for_each_entry(msc, &bsc_gsmnet->bsc_data->mscs, entry) { if (osmo_bsc_msc_init(msc) != 0) { LOGP(DNAT, LOGL_ERROR, "Failed to start up. Exiting.\n"); -- To view, visit https://gerrit.osmocom.org/11243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ice827896bab1a2330741e0fccc731a04f1a07d38 Gerrit-Change-Number: 11243 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 10:37:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 8 Oct 2018 10:37:06 +0000 Subject: Change in osmo-pcap[master]: client: Set snaplen to MAXIMUM_SNAPLEN Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11264 Change subject: client: Set snaplen to MAXIMUM_SNAPLEN ...................................................................... client: Set snaplen to MAXIMUM_SNAPLEN Despite this value not being exported publicly, the truth is that tcpdump and wireshark nowadays avoid processing any file with snaplen bigger than this value: "tcpdump: pcap_loop: invalid packet capture length 861244, bigger than snaplen of 262144" It also fails to set snaplen to values bigger than that: "tcpdump -s 262145" --> "tcpdump: invalid snaplen 262145" pcapfix also warns about wrong packet length if bigger than same value (defined as PCAP_MAX_SNAPLEN there). MAXIMUM_SPANPLEN is defined in tcpdump's netdissect.h and libpcap's pcap-int.h. It is also defined as WTAP_MAX_PACKET_SIZE in wireshark/wiretap/wtap.h (this one being the only publicly available). Change-Id: Ib7449d5aba9da342c150704ebd0e1f09e7f7276c --- M src/osmo_client_network.c 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/64/11264/1 diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c index ec03b09..6b84337 100644 --- a/src/osmo_client_network.c +++ b/src/osmo_client_network.c @@ -42,6 +42,11 @@ #include #include +/* defined in libpcap's pcap-int.h, which is not public */ +#ifndef MAXIMUM_SNAPLEN +#define MAXIMUM_SNAPLEN 262144 +#endif + static void _osmo_client_connect(void *_data) { @@ -257,7 +262,7 @@ hdr->version_minor = 4; hdr->thiszone = 0; hdr->sigfigs = 0; - hdr->snaplen = UINT_MAX; + hdr->snaplen = MAXIMUM_SNAPLEN; hdr->linktype = pcap_datalink(conn->client->handle); write_data(conn, msg); -- To view, visit https://gerrit.osmocom.org/11264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7449d5aba9da342c150704ebd0e1f09e7f7276c Gerrit-Change-Number: 11264 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 11:04:31 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 8 Oct 2018 11:04:31 +0000 Subject: Change in osmo-msc[master]: mncc: protect against non responsive MNCC during setup Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11265 Change subject: mncc: protect against non responsive MNCC during setup ...................................................................... mncc: protect against non responsive MNCC during setup When the SETUP is sent throgh the MNCC socket to the remote entity (e.g. osmo-sip-connector) we expect an almost immediate response that tells us if the call was accepted or rejected. However, there may be cases where the remote entity becomes unresponsive. In those cases the MNCC handling on the msc side would hang. Lets schedule a timer to make sure that osmo-msc can not hang if the setup is not answered. - Add timeout in gsm48_cc_rx_setup(), hard-clear the call when the timeout expires (CLEAR COMMAND to BSC) Change-Id: Ieaf6015d78ddef68827be107d3722c9d089f7c66 Related: OS#3599 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/65/11265/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 19e6cba..42f1b76 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -71,6 +71,8 @@ #include +#define MNCC_SETUP_TIMEOUT_T10303 25, 0 + static uint32_t new_callref = 0x80000001; @@ -351,6 +353,13 @@ static int gsm48_cc_tx_release(struct gsm_trans *trans, void *arg); static int gsm48_cc_tx_disconnect(struct gsm_trans *trans, void *arg); +static void gsm48_cc_hard_clear(struct gsm_trans *trans) +{ + gsm48_stop_cc_timer(trans); + new_cc_state(trans, GSM_CSTATE_NULL); + trans_free(trans); +} + static void gsm48_cc_timeout(void *arg) { struct gsm_trans *trans = arg; @@ -400,6 +409,9 @@ case 0x323: disconnect = 1; break; + case 0x10303: + gsm48_cc_hard_clear(trans); + break; default: release = 1; } @@ -557,6 +569,10 @@ /* indicate setup to MNCC */ mncc_recvmsg(trans->net, trans, MNCC_SETUP_IND, &setup); + /* Normally MNCC should answer immediately, in order to protect + * against non responsive MNCC we schedule a timer. */ + gsm48_start_cc_timer(trans, 0x10303, MNCC_SETUP_TIMEOUT_T10303); + /* MNCC code will modify the channel asynchronously, we should * ipaccess-bind only after the modification has been made to the * lchan->tch_mode */ -- To view, visit https://gerrit.osmocom.org/11265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ieaf6015d78ddef68827be107d3722c9d089f7c66 Gerrit-Change-Number: 11265 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 11:36:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 8 Oct 2018 11:36:38 +0000 Subject: Change in osmo-pcap[master]: cosmetic: client: rename forward_packet function Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11266 Change subject: cosmetic: client: rename forward_packet function ...................................................................... cosmetic: client: rename forward_packet function Function only checks if packet should be forwarded, it doesn't forward any packet. Change-Id: I87cd64290245db134b17bc0d6665c58f1cde17b6 --- M src/osmo_client_core.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/66/11266/1 diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index 5208744..e19ae89 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -100,7 +100,7 @@ return 1; } -static int forward_packet( +static int can_forward_packet( struct osmo_pcap_client *client, struct pcap_pkthdr *hdr, const u_char *data) @@ -165,7 +165,7 @@ return -1; } - if (!forward_packet(client, &hdr, data)) + if (!can_forward_packet(client, &hdr, data)) return 0; osmo_client_send_data(&client->conn, &hdr, data); -- To view, visit https://gerrit.osmocom.org/11266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I87cd64290245db134b17bc0d6665c58f1cde17b6 Gerrit-Change-Number: 11266 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 11:36:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 8 Oct 2018 11:36:38 +0000 Subject: Change in osmo-pcap[master]: vty: skip installing cmds now always installed by default Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11267 Change subject: vty: skip installing cmds now always installed by default ...................................................................... vty: skip installing cmds now always installed by default Fixes following compilation warning: osmo-pcap/src/osmo_client_vty.c:511:2: warning: ?install_default? is deprecated: Now happens implicitly with install_node() [-Wdeprecated-declarations] Depends: libosmocore I5021c64a787b63314e0f2f1cba0b8fc7bff4f09b Change-Id: I943f68dbafd7906313ad9e59f4adb289ae23cdec --- M src/osmo_client_vty.c M src/osmo_server_vty.c 2 files changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/67/11267/1 diff --git a/src/osmo_client_vty.c b/src/osmo_client_vty.c index 29f7051..e50099f 100644 --- a/src/osmo_client_vty.c +++ b/src/osmo_client_vty.c @@ -508,10 +508,8 @@ { install_element(CONFIG_NODE, &cfg_client_cmd); install_node(&client_node, config_write_client); - install_default(CLIENT_NODE); install_node(&server_node, config_write_server); - install_default(CLIENT_SERVER_NODE); install_element(CLIENT_NODE, &cfg_client_device_cmd); install_element(CLIENT_NODE, &cfg_client_filter_cmd); diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index b2919ae..d10ff51 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -506,7 +506,6 @@ { install_element(CONFIG_NODE, &cfg_server_cmd); install_node(&server_node, config_write_server); - install_default(SERVER_NODE); install_element(SERVER_NODE, &cfg_server_base_cmd); install_element(SERVER_NODE, &cfg_server_ip_cmd); -- To view, visit https://gerrit.osmocom.org/11267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I943f68dbafd7906313ad9e59f4adb289ae23cdec Gerrit-Change-Number: 11267 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 11:36:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 8 Oct 2018 11:36:40 +0000 Subject: Change in osmo-pcap[master]: client: Properly name main talloc ctx Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11268 Change subject: client: Properly name main talloc ctx ...................................................................... client: Properly name main talloc ctx Change-Id: Ibaa7f0e0add5f5e61cc0bb82341ee3b6b5c0cf07 --- M src/osmo_client_main.c 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/68/11268/1 diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c index 46a49b5..43de544 100644 --- a/src/osmo_client_main.c +++ b/src/osmo_client_main.c @@ -48,7 +48,7 @@ static const char *config_file = "osmo-pcap-client.cfg"; static int daemonize = 0; -void *tall_bsc_ctx; +void *tall_cli_ctx; struct osmo_pcap_client *pcap_client; extern void *tall_msgb_ctx; extern void *tall_ctr_ctx; @@ -163,7 +163,7 @@ * and then return to the caller, who will abort the process */ case SIGUSR1: talloc_report(tall_vty_ctx, stderr); - talloc_report_full(tall_bsc_ctx, stderr); + talloc_report_full(tall_cli_ctx, stderr); break; default: break; @@ -172,9 +172,9 @@ static void talloc_init_ctx() { - tall_bsc_ctx = talloc_named_const(NULL, 0, "nat"); - tall_msgb_ctx = talloc_named_const(tall_bsc_ctx, 0, "msgb"); - tall_ctr_ctx = talloc_named_const(tall_bsc_ctx, 0, "counter"); + tall_cli_ctx = talloc_named_const(NULL, 0, "client"); + tall_msgb_ctx = talloc_named_const(tall_cli_ctx, 0, "msgb"); + tall_ctr_ctx = talloc_named_const(tall_cli_ctx, 0, "counter"); } int main(int argc, char **argv) @@ -192,8 +192,8 @@ /* parse options */ handle_options(argc, argv); - rate_ctr_init(tall_bsc_ctx); - osmo_stats_init(tall_bsc_ctx); + rate_ctr_init(tall_cli_ctx); + osmo_stats_init(tall_cli_ctx); /* seed the PRNG */ srand(time(NULL)); @@ -206,13 +206,13 @@ osmo_tls_init(); - rc = telnet_init(tall_bsc_ctx, NULL, OSMO_VTY_PORT_PCAP_CLIENT); + rc = telnet_init(tall_cli_ctx, NULL, OSMO_VTY_PORT_PCAP_CLIENT); if (rc < 0) { LOGP(DCLIENT, LOGL_ERROR, "Failed to bind telnet interface\n"); exit(1); } - pcap_client = talloc_zero(tall_bsc_ctx, struct osmo_pcap_client); + pcap_client = talloc_zero(tall_cli_ctx, struct osmo_pcap_client); if (!pcap_client) { LOGP(DCLIENT, LOGL_ERROR, "Failed to allocate osmo_pcap_client.\n"); exit(1); -- To view, visit https://gerrit.osmocom.org/11268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibaa7f0e0add5f5e61cc0bb82341ee3b6b5c0cf07 Gerrit-Change-Number: 11268 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 11:36:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 8 Oct 2018 11:36:40 +0000 Subject: Change in osmo-pcap[master]: server: Properly name main talloc ctx Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11269 Change subject: server: Properly name main talloc ctx ...................................................................... server: Properly name main talloc ctx Change-Id: I810417d84c6a6ebcbc4b75a9bc41607bb0637228 --- M src/osmo_server_main.c 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/69/11269/1 diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c index 95f3ce1..20928cd 100644 --- a/src/osmo_server_main.c +++ b/src/osmo_server_main.c @@ -49,7 +49,7 @@ static const char *config_file = "osmo-pcap-server.cfg"; static int daemonize = 0; -void *tall_bsc_ctx; +void *tall_srv_ctx; struct osmo_pcap_server *pcap_server; extern void *tall_msgb_ctx; extern void *tall_ctr_ctx; @@ -173,7 +173,7 @@ * and then return to the caller, who will abort the process */ case SIGUSR1: talloc_report(tall_vty_ctx, stderr); - talloc_report_full(tall_bsc_ctx, stderr); + talloc_report_full(tall_srv_ctx, stderr); break; case SIGHUP: osmo_pcap_server_reopen(pcap_server); @@ -185,9 +185,9 @@ static void talloc_init_ctx() { - tall_bsc_ctx = talloc_named_const(NULL, 0, "server"); - tall_msgb_ctx = talloc_named_const(tall_bsc_ctx, 0, "msgb"); - tall_ctr_ctx = talloc_named_const(tall_bsc_ctx, 0, "counter"); + tall_srv_ctx = talloc_named_const(NULL, 0, "server"); + tall_msgb_ctx = talloc_named_const(tall_srv_ctx, 0, "msgb"); + tall_ctr_ctx = talloc_named_const(tall_srv_ctx, 0, "counter"); } int main(int argc, char **argv) @@ -205,8 +205,8 @@ /* parse options */ handle_options(argc, argv); - rate_ctr_init(tall_bsc_ctx); - osmo_stats_init(tall_bsc_ctx); + rate_ctr_init(tall_srv_ctx); + osmo_stats_init(tall_srv_ctx); /* seed the PRNG */ srand(time(NULL)); @@ -219,13 +219,13 @@ osmo_tls_init(); - rc = telnet_init(tall_bsc_ctx, NULL, OSMO_VTY_PORT_PCAP_SERVER); + rc = telnet_init(tall_srv_ctx, NULL, OSMO_VTY_PORT_PCAP_SERVER); if (rc < 0) { LOGP(DCLIENT, LOGL_ERROR, "Failed to bind telnet interface\n"); exit(1); } - pcap_server = talloc_zero(tall_bsc_ctx, struct osmo_pcap_server); + pcap_server = talloc_zero(tall_srv_ctx, struct osmo_pcap_server); if (!pcap_server) { LOGP(DSERVER, LOGL_ERROR, "Failed to allocate osmo_pcap_server.\n"); exit(1); -- To view, visit https://gerrit.osmocom.org/11269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I810417d84c6a6ebcbc4b75a9bc41607bb0637228 Gerrit-Change-Number: 11269 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 11:36:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 8 Oct 2018 11:36:40 +0000 Subject: Change in osmo-pcap[master]: Drop osmo_init_logging and use osmo_init_logging2 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11270 Change subject: Drop osmo_init_logging and use osmo_init_logging2 ...................................................................... Drop osmo_init_logging and use osmo_init_logging2 Change-Id: Ib1c38f6134b3c1988477caa0f2c281b1ef01d5e0 --- M src/osmo_client_main.c M src/osmo_server_main.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/70/11270/1 diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c index 43de544..b491a25 100644 --- a/src/osmo_client_main.c +++ b/src/osmo_client_main.c @@ -182,7 +182,7 @@ int rc; talloc_init_ctx(); - osmo_init_logging(&log_info); + osmo_init_logging2(tall_cli_ctx, &log_info); vty_info.copyright = osmopcap_copyright; vty_init(&vty_info); diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c index 20928cd..5c4f1cb 100644 --- a/src/osmo_server_main.c +++ b/src/osmo_server_main.c @@ -195,7 +195,7 @@ int rc; talloc_init_ctx(); - osmo_init_logging(&log_info); + osmo_init_logging2(tall_srv_ctx, &log_info); vty_info.copyright = osmopcap_copyright; vty_init(&vty_info); -- To view, visit https://gerrit.osmocom.org/11270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1c38f6134b3c1988477caa0f2c281b1ef01d5e0 Gerrit-Change-Number: 11270 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 11:36:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 8 Oct 2018 11:36:40 +0000 Subject: Change in osmo-pcap[master]: osmo_client_send_data: Fix wrong log format Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11271 Change subject: osmo_client_send_data: Fix wrong log format ...................................................................... osmo_client_send_data: Fix wrong log format According to pcap.h, type bpf_u_int32 can be 32 bits on some systems, so better cast explicitly to size_t to make sure always correct size is used by log function. Fixes warning: osmo-pcap/src/osmo_client_network.c:175:4: warning: format ?%zu? expects argument of type ?size_t?, but argument 7 has type ?bpf_u_int32? {aka ?unsigned int?} [-Wformat=] "Capture len too big %zu\n", in_hdr->caplen); ^~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~ Change-Id: I98654da143218d3e57da4e57781252eb3d3f3d5b --- M src/osmo_client_network.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/71/11271/1 diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c index ec03b09..3d741a8 100644 --- a/src/osmo_client_network.c +++ b/src/osmo_client_network.c @@ -172,7 +172,7 @@ if (in_hdr->caplen > 9000) { LOGP(DCLIENT, LOGL_ERROR, - "Capture len too big %zu\n", in_hdr->caplen); + "Capture len too big %zu\n", (size_t) in_hdr->caplen); rate_ctr_inc(&conn->client->ctrg->ctr[CLIENT_CTR_2BIG]); return; } -- To view, visit https://gerrit.osmocom.org/11271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I98654da143218d3e57da4e57781252eb3d3f3d5b Gerrit-Change-Number: 11271 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 11:41:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 8 Oct 2018 11:41:52 +0000 Subject: Change in osmo-pcap[master]: configure.ac: Add --enable-werror flag Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11272 Change subject: configure.ac: Add --enable-werror flag ...................................................................... configure.ac: Add --enable-werror flag Change-Id: I387a3365fb5b7340bf67fb945df434442924a4c7 --- M configure.ac 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/72/11272/1 diff --git a/configure.ac b/configure.ac index b370e0d..5032255 100644 --- a/configure.ac +++ b/configure.ac @@ -22,6 +22,24 @@ dnl checks for header files AC_HEADER_STDC +AC_ARG_ENABLE(werror, + [AS_HELP_STRING( + [--enable-werror], + [Turn all compiler warnings into errors, with exceptions: + a) deprecation (allow upstream to mark deprecation without breaking builds); + b) "#warning" pragmas (allow to remind ourselves of errors without breaking builds) + ] + )], + [werror=$enableval], [werror="no"]) +if test x"$werror" = x"yes" +then + WERROR_FLAGS="-Werror" + WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations" + WERROR_FLAGS+=" -Wno-error=cpp" # "#warning" + CFLAGS="$CFLAGS $WERROR_FLAGS" + CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" +fi + AC_ARG_ENABLE([external_tests], AC_HELP_STRING([--enable-external-tests], [Include the VTY tests in make check [default=no]]), -- To view, visit https://gerrit.osmocom.org/11272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I387a3365fb5b7340bf67fb945df434442924a4c7 Gerrit-Change-Number: 11272 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 11:41:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 8 Oct 2018 11:41:53 +0000 Subject: Change in osmo-pcap[master]: configure.ac: Add --enable-sanitize flag Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11273 Change subject: configure.ac: Add --enable-sanitize flag ...................................................................... configure.ac: Add --enable-sanitize flag Change-Id: I6a3bc49142b93a35988c8763f3125d7b5ffddaef --- M configure.ac 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/73/11273/1 diff --git a/configure.ac b/configure.ac index 5032255..b5468ee 100644 --- a/configure.ac +++ b/configure.ac @@ -22,6 +22,18 @@ dnl checks for header files AC_HEADER_STDC +AC_ARG_ENABLE(sanitize, + [AS_HELP_STRING( + [--enable-sanitize], + [Compile with address sanitizer enabled], + )], + [sanitize=$enableval], [sanitize="no"]) +if test x"$sanitize" = x"yes" +then + CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined" + CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined" +fi + AC_ARG_ENABLE(werror, [AS_HELP_STRING( [--enable-werror], -- To view, visit https://gerrit.osmocom.org/11273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6a3bc49142b93a35988c8763f3125d7b5ffddaef Gerrit-Change-Number: 11273 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 11:41:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 8 Oct 2018 11:41:53 +0000 Subject: Change in osmo-pcap[master]: jenkins.sh: enable werror and sanitize configure flags Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11274 Change subject: jenkins.sh: enable werror and sanitize configure flags ...................................................................... jenkins.sh: enable werror and sanitize configure flags Change-Id: Id8ad324ae9e1c57e1328bd1be04977e921125847 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/74/11274/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index b588bea..e099ceb 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -14,6 +14,6 @@ cd ../../ autoreconf --install --force -PCAP_LIBS="-lpcap" PCAP_CFLAGS="" PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig ./configure --with-pcap-config=/bin/true +PCAP_LIBS="-lpcap" PCAP_CFLAGS="" PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig ./configure --with-pcap-config=/bin/true --enable-sanitize --enable-werror PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig $MAKE $PARALLEL_MAKE DISTCHECK_CONFIGURE_FLAGS="--with-pcap-config=/bin/true" PCAP_LIBS="-lpcap" PCAP_CFLAGS="" PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig LD_LIBRARY_PATH=$PWD/deps/install/lib $MAKE distcheck -- To view, visit https://gerrit.osmocom.org/11274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id8ad324ae9e1c57e1328bd1be04977e921125847 Gerrit-Change-Number: 11274 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:03:32 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 8 Oct 2018 12:03:32 +0000 Subject: Change in osmo-msc[master]: mncc: protect against non responsive MNCC during setup In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11265 to look at the new patch set (#2). Change subject: mncc: protect against non responsive MNCC during setup ...................................................................... mncc: protect against non responsive MNCC during setup When the SETUP is sent throgh the MNCC socket to the remote entity (e.g. osmo-sip-connector) we expect an almost immediate response that tells us if the call was accepted or rejected. However, there may be cases where the remote entity becomes unresponsive. In those cases the MNCC handling on the msc side would hang. Lets schedule a timer to make sure that osmo-msc can not hang if the setup is not answered. - Add timeout in gsm48_cc_rx_setup(), hard-clear the call when the timeout expires (CLEAR COMMAND to BSC) Change-Id: Ieaf6015d78ddef68827be107d3722c9d089f7c66 Related: OS#3599 --- M src/libmsc/gsm_04_08_cc.c M tests/msc_vlr/msc_vlr_test_call.err 2 files changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/65/11265/2 -- To view, visit https://gerrit.osmocom.org/11265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ieaf6015d78ddef68827be107d3722c9d089f7c66 Gerrit-Change-Number: 11265 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:39:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:39:17 +0000 Subject: Change in osmo-msc[master]: mncc: protect against non responsive MNCC during setup In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11265 ) Change subject: mncc: protect against non responsive MNCC during setup ...................................................................... Patch Set 2: Code-Review+1 I wonder if it wouldn't rather make sense to have something like a global guard timer for all calls that don't go into established state? -- To view, visit https://gerrit.osmocom.org/11265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieaf6015d78ddef68827be107d3722c9d089f7c66 Gerrit-Change-Number: 11265 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 08 Oct 2018 12:39:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:40:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:40:18 +0000 Subject: Change in osmo-pcap[master]: cosmetic: client: rename forward_packet function In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11266 ) Change subject: cosmetic: client: rename forward_packet function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I87cd64290245db134b17bc0d6665c58f1cde17b6 Gerrit-Change-Number: 11266 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 08 Oct 2018 12:40:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:40:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:40:29 +0000 Subject: Change in osmo-pcap[master]: vty: skip installing cmds now always installed by default In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11267 ) Change subject: vty: skip installing cmds now always installed by default ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I943f68dbafd7906313ad9e59f4adb289ae23cdec Gerrit-Change-Number: 11267 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 08 Oct 2018 12:40:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:40:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:40:41 +0000 Subject: Change in osmo-pcap[master]: client: Properly name main talloc ctx In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11268 ) Change subject: client: Properly name main talloc ctx ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibaa7f0e0add5f5e61cc0bb82341ee3b6b5c0cf07 Gerrit-Change-Number: 11268 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 08 Oct 2018 12:40:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:40:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:40:47 +0000 Subject: Change in osmo-pcap[master]: server: Properly name main talloc ctx In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11269 ) Change subject: server: Properly name main talloc ctx ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I810417d84c6a6ebcbc4b75a9bc41607bb0637228 Gerrit-Change-Number: 11269 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 08 Oct 2018 12:40:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:40:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:40:56 +0000 Subject: Change in osmo-pcap[master]: Drop osmo_init_logging and use osmo_init_logging2 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11270 ) Change subject: Drop osmo_init_logging and use osmo_init_logging2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib1c38f6134b3c1988477caa0f2c281b1ef01d5e0 Gerrit-Change-Number: 11270 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 08 Oct 2018 12:40:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:41:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:41:17 +0000 Subject: Change in osmo-pcap[master]: osmo_client_send_data: Fix wrong log format In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11271 ) Change subject: osmo_client_send_data: Fix wrong log format ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I98654da143218d3e57da4e57781252eb3d3f3d5b Gerrit-Change-Number: 11271 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 08 Oct 2018 12:41:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:41:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:41:23 +0000 Subject: Change in osmo-pcap[master]: configure.ac: Add --enable-werror flag In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11272 ) Change subject: configure.ac: Add --enable-werror flag ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I387a3365fb5b7340bf67fb945df434442924a4c7 Gerrit-Change-Number: 11272 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 08 Oct 2018 12:41:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:41:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:41:28 +0000 Subject: Change in osmo-pcap[master]: configure.ac: Add --enable-sanitize flag In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11273 ) Change subject: configure.ac: Add --enable-sanitize flag ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6a3bc49142b93a35988c8763f3125d7b5ffddaef Gerrit-Change-Number: 11273 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 08 Oct 2018 12:41:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:41:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:41:34 +0000 Subject: Change in osmo-pcap[master]: jenkins.sh: enable werror and sanitize configure flags In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11274 ) Change subject: jenkins.sh: enable werror and sanitize configure flags ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id8ad324ae9e1c57e1328bd1be04977e921125847 Gerrit-Change-Number: 11274 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 08 Oct 2018 12:41:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:41:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:41:35 +0000 Subject: Change in osmo-pcap[master]: cosmetic: client: rename forward_packet function In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11266 ) Change subject: cosmetic: client: rename forward_packet function ...................................................................... cosmetic: client: rename forward_packet function Function only checks if packet should be forwarded, it doesn't forward any packet. Change-Id: I87cd64290245db134b17bc0d6665c58f1cde17b6 --- M src/osmo_client_core.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index 5208744..e19ae89 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -100,7 +100,7 @@ return 1; } -static int forward_packet( +static int can_forward_packet( struct osmo_pcap_client *client, struct pcap_pkthdr *hdr, const u_char *data) @@ -165,7 +165,7 @@ return -1; } - if (!forward_packet(client, &hdr, data)) + if (!can_forward_packet(client, &hdr, data)) return 0; osmo_client_send_data(&client->conn, &hdr, data); -- To view, visit https://gerrit.osmocom.org/11266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I87cd64290245db134b17bc0d6665c58f1cde17b6 Gerrit-Change-Number: 11266 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:41:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:41:35 +0000 Subject: Change in osmo-pcap[master]: vty: skip installing cmds now always installed by default In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11267 ) Change subject: vty: skip installing cmds now always installed by default ...................................................................... vty: skip installing cmds now always installed by default Fixes following compilation warning: osmo-pcap/src/osmo_client_vty.c:511:2: warning: ?install_default? is deprecated: Now happens implicitly with install_node() [-Wdeprecated-declarations] Depends: libosmocore I5021c64a787b63314e0f2f1cba0b8fc7bff4f09b Change-Id: I943f68dbafd7906313ad9e59f4adb289ae23cdec --- M src/osmo_client_vty.c M src/osmo_server_vty.c 2 files changed, 0 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo_client_vty.c b/src/osmo_client_vty.c index 29f7051..e50099f 100644 --- a/src/osmo_client_vty.c +++ b/src/osmo_client_vty.c @@ -508,10 +508,8 @@ { install_element(CONFIG_NODE, &cfg_client_cmd); install_node(&client_node, config_write_client); - install_default(CLIENT_NODE); install_node(&server_node, config_write_server); - install_default(CLIENT_SERVER_NODE); install_element(CLIENT_NODE, &cfg_client_device_cmd); install_element(CLIENT_NODE, &cfg_client_filter_cmd); diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index b2919ae..d10ff51 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -506,7 +506,6 @@ { install_element(CONFIG_NODE, &cfg_server_cmd); install_node(&server_node, config_write_server); - install_default(SERVER_NODE); install_element(SERVER_NODE, &cfg_server_base_cmd); install_element(SERVER_NODE, &cfg_server_ip_cmd); -- To view, visit https://gerrit.osmocom.org/11267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I943f68dbafd7906313ad9e59f4adb289ae23cdec Gerrit-Change-Number: 11267 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:41:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:41:36 +0000 Subject: Change in osmo-pcap[master]: client: Properly name main talloc ctx In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11268 ) Change subject: client: Properly name main talloc ctx ...................................................................... client: Properly name main talloc ctx Change-Id: Ibaa7f0e0add5f5e61cc0bb82341ee3b6b5c0cf07 --- M src/osmo_client_main.c 1 file changed, 9 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c index 46a49b5..43de544 100644 --- a/src/osmo_client_main.c +++ b/src/osmo_client_main.c @@ -48,7 +48,7 @@ static const char *config_file = "osmo-pcap-client.cfg"; static int daemonize = 0; -void *tall_bsc_ctx; +void *tall_cli_ctx; struct osmo_pcap_client *pcap_client; extern void *tall_msgb_ctx; extern void *tall_ctr_ctx; @@ -163,7 +163,7 @@ * and then return to the caller, who will abort the process */ case SIGUSR1: talloc_report(tall_vty_ctx, stderr); - talloc_report_full(tall_bsc_ctx, stderr); + talloc_report_full(tall_cli_ctx, stderr); break; default: break; @@ -172,9 +172,9 @@ static void talloc_init_ctx() { - tall_bsc_ctx = talloc_named_const(NULL, 0, "nat"); - tall_msgb_ctx = talloc_named_const(tall_bsc_ctx, 0, "msgb"); - tall_ctr_ctx = talloc_named_const(tall_bsc_ctx, 0, "counter"); + tall_cli_ctx = talloc_named_const(NULL, 0, "client"); + tall_msgb_ctx = talloc_named_const(tall_cli_ctx, 0, "msgb"); + tall_ctr_ctx = talloc_named_const(tall_cli_ctx, 0, "counter"); } int main(int argc, char **argv) @@ -192,8 +192,8 @@ /* parse options */ handle_options(argc, argv); - rate_ctr_init(tall_bsc_ctx); - osmo_stats_init(tall_bsc_ctx); + rate_ctr_init(tall_cli_ctx); + osmo_stats_init(tall_cli_ctx); /* seed the PRNG */ srand(time(NULL)); @@ -206,13 +206,13 @@ osmo_tls_init(); - rc = telnet_init(tall_bsc_ctx, NULL, OSMO_VTY_PORT_PCAP_CLIENT); + rc = telnet_init(tall_cli_ctx, NULL, OSMO_VTY_PORT_PCAP_CLIENT); if (rc < 0) { LOGP(DCLIENT, LOGL_ERROR, "Failed to bind telnet interface\n"); exit(1); } - pcap_client = talloc_zero(tall_bsc_ctx, struct osmo_pcap_client); + pcap_client = talloc_zero(tall_cli_ctx, struct osmo_pcap_client); if (!pcap_client) { LOGP(DCLIENT, LOGL_ERROR, "Failed to allocate osmo_pcap_client.\n"); exit(1); -- To view, visit https://gerrit.osmocom.org/11268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibaa7f0e0add5f5e61cc0bb82341ee3b6b5c0cf07 Gerrit-Change-Number: 11268 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:41:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:41:36 +0000 Subject: Change in osmo-pcap[master]: server: Properly name main talloc ctx In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11269 ) Change subject: server: Properly name main talloc ctx ...................................................................... server: Properly name main talloc ctx Change-Id: I810417d84c6a6ebcbc4b75a9bc41607bb0637228 --- M src/osmo_server_main.c 1 file changed, 9 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c index 95f3ce1..20928cd 100644 --- a/src/osmo_server_main.c +++ b/src/osmo_server_main.c @@ -49,7 +49,7 @@ static const char *config_file = "osmo-pcap-server.cfg"; static int daemonize = 0; -void *tall_bsc_ctx; +void *tall_srv_ctx; struct osmo_pcap_server *pcap_server; extern void *tall_msgb_ctx; extern void *tall_ctr_ctx; @@ -173,7 +173,7 @@ * and then return to the caller, who will abort the process */ case SIGUSR1: talloc_report(tall_vty_ctx, stderr); - talloc_report_full(tall_bsc_ctx, stderr); + talloc_report_full(tall_srv_ctx, stderr); break; case SIGHUP: osmo_pcap_server_reopen(pcap_server); @@ -185,9 +185,9 @@ static void talloc_init_ctx() { - tall_bsc_ctx = talloc_named_const(NULL, 0, "server"); - tall_msgb_ctx = talloc_named_const(tall_bsc_ctx, 0, "msgb"); - tall_ctr_ctx = talloc_named_const(tall_bsc_ctx, 0, "counter"); + tall_srv_ctx = talloc_named_const(NULL, 0, "server"); + tall_msgb_ctx = talloc_named_const(tall_srv_ctx, 0, "msgb"); + tall_ctr_ctx = talloc_named_const(tall_srv_ctx, 0, "counter"); } int main(int argc, char **argv) @@ -205,8 +205,8 @@ /* parse options */ handle_options(argc, argv); - rate_ctr_init(tall_bsc_ctx); - osmo_stats_init(tall_bsc_ctx); + rate_ctr_init(tall_srv_ctx); + osmo_stats_init(tall_srv_ctx); /* seed the PRNG */ srand(time(NULL)); @@ -219,13 +219,13 @@ osmo_tls_init(); - rc = telnet_init(tall_bsc_ctx, NULL, OSMO_VTY_PORT_PCAP_SERVER); + rc = telnet_init(tall_srv_ctx, NULL, OSMO_VTY_PORT_PCAP_SERVER); if (rc < 0) { LOGP(DCLIENT, LOGL_ERROR, "Failed to bind telnet interface\n"); exit(1); } - pcap_server = talloc_zero(tall_bsc_ctx, struct osmo_pcap_server); + pcap_server = talloc_zero(tall_srv_ctx, struct osmo_pcap_server); if (!pcap_server) { LOGP(DSERVER, LOGL_ERROR, "Failed to allocate osmo_pcap_server.\n"); exit(1); -- To view, visit https://gerrit.osmocom.org/11269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I810417d84c6a6ebcbc4b75a9bc41607bb0637228 Gerrit-Change-Number: 11269 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:41:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:41:36 +0000 Subject: Change in osmo-pcap[master]: Drop osmo_init_logging and use osmo_init_logging2 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11270 ) Change subject: Drop osmo_init_logging and use osmo_init_logging2 ...................................................................... Drop osmo_init_logging and use osmo_init_logging2 Change-Id: Ib1c38f6134b3c1988477caa0f2c281b1ef01d5e0 --- M src/osmo_client_main.c M src/osmo_server_main.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c index 43de544..b491a25 100644 --- a/src/osmo_client_main.c +++ b/src/osmo_client_main.c @@ -182,7 +182,7 @@ int rc; talloc_init_ctx(); - osmo_init_logging(&log_info); + osmo_init_logging2(tall_cli_ctx, &log_info); vty_info.copyright = osmopcap_copyright; vty_init(&vty_info); diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c index 20928cd..5c4f1cb 100644 --- a/src/osmo_server_main.c +++ b/src/osmo_server_main.c @@ -195,7 +195,7 @@ int rc; talloc_init_ctx(); - osmo_init_logging(&log_info); + osmo_init_logging2(tall_srv_ctx, &log_info); vty_info.copyright = osmopcap_copyright; vty_init(&vty_info); -- To view, visit https://gerrit.osmocom.org/11270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib1c38f6134b3c1988477caa0f2c281b1ef01d5e0 Gerrit-Change-Number: 11270 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:41:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:41:36 +0000 Subject: Change in osmo-pcap[master]: osmo_client_send_data: Fix wrong log format In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11271 ) Change subject: osmo_client_send_data: Fix wrong log format ...................................................................... osmo_client_send_data: Fix wrong log format According to pcap.h, type bpf_u_int32 can be 32 bits on some systems, so better cast explicitly to size_t to make sure always correct size is used by log function. Fixes warning: osmo-pcap/src/osmo_client_network.c:175:4: warning: format ?%zu? expects argument of type ?size_t?, but argument 7 has type ?bpf_u_int32? {aka ?unsigned int?} [-Wformat=] "Capture len too big %zu\n", in_hdr->caplen); ^~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~ Change-Id: I98654da143218d3e57da4e57781252eb3d3f3d5b --- M src/osmo_client_network.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c index ec03b09..3d741a8 100644 --- a/src/osmo_client_network.c +++ b/src/osmo_client_network.c @@ -172,7 +172,7 @@ if (in_hdr->caplen > 9000) { LOGP(DCLIENT, LOGL_ERROR, - "Capture len too big %zu\n", in_hdr->caplen); + "Capture len too big %zu\n", (size_t) in_hdr->caplen); rate_ctr_inc(&conn->client->ctrg->ctr[CLIENT_CTR_2BIG]); return; } -- To view, visit https://gerrit.osmocom.org/11271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I98654da143218d3e57da4e57781252eb3d3f3d5b Gerrit-Change-Number: 11271 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:41:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:41:37 +0000 Subject: Change in osmo-pcap[master]: configure.ac: Add --enable-werror flag In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11272 ) Change subject: configure.ac: Add --enable-werror flag ...................................................................... configure.ac: Add --enable-werror flag Change-Id: I387a3365fb5b7340bf67fb945df434442924a4c7 --- M configure.ac 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/configure.ac b/configure.ac index b370e0d..5032255 100644 --- a/configure.ac +++ b/configure.ac @@ -22,6 +22,24 @@ dnl checks for header files AC_HEADER_STDC +AC_ARG_ENABLE(werror, + [AS_HELP_STRING( + [--enable-werror], + [Turn all compiler warnings into errors, with exceptions: + a) deprecation (allow upstream to mark deprecation without breaking builds); + b) "#warning" pragmas (allow to remind ourselves of errors without breaking builds) + ] + )], + [werror=$enableval], [werror="no"]) +if test x"$werror" = x"yes" +then + WERROR_FLAGS="-Werror" + WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations" + WERROR_FLAGS+=" -Wno-error=cpp" # "#warning" + CFLAGS="$CFLAGS $WERROR_FLAGS" + CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" +fi + AC_ARG_ENABLE([external_tests], AC_HELP_STRING([--enable-external-tests], [Include the VTY tests in make check [default=no]]), -- To view, visit https://gerrit.osmocom.org/11272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I387a3365fb5b7340bf67fb945df434442924a4c7 Gerrit-Change-Number: 11272 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:41:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:41:37 +0000 Subject: Change in osmo-pcap[master]: configure.ac: Add --enable-sanitize flag In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11273 ) Change subject: configure.ac: Add --enable-sanitize flag ...................................................................... configure.ac: Add --enable-sanitize flag Change-Id: I6a3bc49142b93a35988c8763f3125d7b5ffddaef --- M configure.ac 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 5032255..b5468ee 100644 --- a/configure.ac +++ b/configure.ac @@ -22,6 +22,18 @@ dnl checks for header files AC_HEADER_STDC +AC_ARG_ENABLE(sanitize, + [AS_HELP_STRING( + [--enable-sanitize], + [Compile with address sanitizer enabled], + )], + [sanitize=$enableval], [sanitize="no"]) +if test x"$sanitize" = x"yes" +then + CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined" + CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined" +fi + AC_ARG_ENABLE(werror, [AS_HELP_STRING( [--enable-werror], -- To view, visit https://gerrit.osmocom.org/11273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6a3bc49142b93a35988c8763f3125d7b5ffddaef Gerrit-Change-Number: 11273 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:41:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:41:37 +0000 Subject: Change in osmo-pcap[master]: jenkins.sh: enable werror and sanitize configure flags In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11274 ) Change subject: jenkins.sh: enable werror and sanitize configure flags ...................................................................... jenkins.sh: enable werror and sanitize configure flags Change-Id: Id8ad324ae9e1c57e1328bd1be04977e921125847 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index b588bea..e099ceb 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -14,6 +14,6 @@ cd ../../ autoreconf --install --force -PCAP_LIBS="-lpcap" PCAP_CFLAGS="" PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig ./configure --with-pcap-config=/bin/true +PCAP_LIBS="-lpcap" PCAP_CFLAGS="" PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig ./configure --with-pcap-config=/bin/true --enable-sanitize --enable-werror PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig $MAKE $PARALLEL_MAKE DISTCHECK_CONFIGURE_FLAGS="--with-pcap-config=/bin/true" PCAP_LIBS="-lpcap" PCAP_CFLAGS="" PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig LD_LIBRARY_PATH=$PWD/deps/install/lib $MAKE distcheck -- To view, visit https://gerrit.osmocom.org/11274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id8ad324ae9e1c57e1328bd1be04977e921125847 Gerrit-Change-Number: 11274 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:42:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:42:56 +0000 Subject: Change in osmo-sip-connector[master]: vty: make 'show calls summary' more userfriendly In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11238 ) Change subject: vty: make 'show calls summary' more userfriendly ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2092d58d80a34e6083f618593b92bb9e838aa906 Gerrit-Change-Number: 11238 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 08 Oct 2018 12:42:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 12:42:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 12:42:57 +0000 Subject: Change in osmo-sip-connector[master]: vty: make 'show calls summary' more userfriendly In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11238 ) Change subject: vty: make 'show calls summary' more userfriendly ...................................................................... vty: make 'show calls summary' more userfriendly Display a table with one row per call (instead of two lines per call), and display the phone numbers of the people making the calls instead of internal IDs. This should make the VTY command friendlier for end users, especially if they have bigger networks. There is still the 'show calls' command with all the verbose output. Example output: OsmoSIPcon> show calls summary No active calls. OsmoSIPcon> show calls summary ID From To State ----- -------------------------------- -------------------------------- ---------- 5001 101 100 PROCEEDING OsmoSIPcon> show calls summary ID From To State ----- -------------------------------- -------------------------------- ---------- 5001 101 100 CONNECTED Relates: OS#1680 Change-Id: I2092d58d80a34e6083f618593b92bb9e838aa906 --- M src/vty.c 1 file changed, 28 insertions(+), 31 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/vty.c b/src/vty.c index 3c9ade1..c11a976 100644 --- a/src/vty.c +++ b/src/vty.c @@ -256,39 +256,36 @@ "show calls summary", SHOW_STR "Current calls\nBrief overview\n") { - struct call *call; - - llist_for_each_entry(call, &g_call_list, entry) { - char *initial_type, *initial_state; - char *remote_type, *remote_state; - - initial_type = initial_state = NULL; - remote_type = remote_state = NULL; - - if (call->initial) { - initial_type = talloc_strdup(tall_mncc_ctx, - call_leg_type(call->initial)); - initial_state = talloc_strdup(tall_mncc_ctx, - call_leg_state(call->initial)); - } - - if (call->remote) { - remote_type = talloc_strdup(tall_mncc_ctx, - call_leg_type(call->remote)); - remote_state = talloc_strdup(tall_mncc_ctx, - call_leg_state(call->remote)); - } - - vty_out(vty, "Call(%u) initial(type=%s,state=%s) remote(type=%s,state=%s)%s", - call->id, initial_type, initial_state, remote_type, remote_state, - VTY_NEWLINE); - - talloc_free(initial_type); - talloc_free(initial_state); - talloc_free(remote_type); - talloc_free(remote_state); + /* don't print a table for zero active calls */ + if(llist_empty(&g_call_list)) { + vty_out(vty, "No active calls.%s", VTY_NEWLINE); + return CMD_SUCCESS; } + /* table head */ + vty_out(vty, "ID From To State%s", VTY_NEWLINE); + vty_out(vty, "----- -------------------------------- -------------------------------- ----------%s", + VTY_NEWLINE); + + /* iterate over calls */ + struct call *call; + llist_for_each_entry(call, &g_call_list, entry) { + /* only look at the initial=MNCC call */ + if(call->initial->type == CALL_TYPE_MNCC) { + struct mncc_call_leg *leg = (struct mncc_call_leg *) call->initial; + + /* table row */ + char *called = talloc_strdup(tall_mncc_ctx, leg->called.number); + char *calling = talloc_strdup(tall_mncc_ctx, leg->calling.number); + char *state = talloc_strdup(tall_mncc_ctx, call_leg_state(call->initial)); + vty_out(vty, "%5u %-32s %-32s %s%s", call->id, calling, called, state, VTY_NEWLINE); + + /* clean up */ + talloc_free(called); + talloc_free(calling); + talloc_free(state); + } + } return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/11238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2092d58d80a34e6083f618593b92bb9e838aa906 Gerrit-Change-Number: 11238 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 13:23:44 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 8 Oct 2018 13:23:44 +0000 Subject: Change in osmo-msc[master]: mncc: protect against non responsive MNCC during setup In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11265 to look at the new patch set (#3). Change subject: mncc: protect against non responsive MNCC during setup ...................................................................... mncc: protect against non responsive MNCC during setup When the SETUP is sent throgh the MNCC socket to the remote entity (e.g. osmo-sip-connector) we expect an almost immediate response that tells us if the call was accepted or rejected. However, there may be cases where the remote entity becomes unresponsive. In those cases the MNCC handling on the msc side would hang. Lets schedule a timer to make sure that osmo-msc can not hang if the setup is not answered. - Add timeout in gsm48_cc_rx_setup(), hard-clear the call when the timeout expires (CLEAR COMMAND to BSC) Change-Id: Ieaf6015d78ddef68827be107d3722c9d089f7c66 Related: OS#3599 --- M src/libmsc/gsm_04_08_cc.c M tests/msc_vlr/msc_vlr_test_call.err 2 files changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/65/11265/3 -- To view, visit https://gerrit.osmocom.org/11265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ieaf6015d78ddef68827be107d3722c9d089f7c66 Gerrit-Change-Number: 11265 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 13:32:49 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 8 Oct 2018 13:32:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add a TTCN3 module for IPA protocol testing In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11241 to look at the new patch set (#2). Change subject: Add a TTCN3 module for IPA protocol testing ...................................................................... Add a TTCN3 module for IPA protocol testing This new module allows us to test IPA code in libosmocore and libosmo-netif. Currently only one test is implemented, which sends a chopped IPA ping message and expects to receive an IPA pong. The system under test is any IPA speaker on any TCP port. Any test suite can create an IPA_Testing.IPA_CT component and execute parametrized test functions. So far, one such test has been added to the BSC_Tests suite. Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Related: OS#2010 --- M Makefile M bsc/BSC_Tests.cfg M bsc/BSC_Tests.ttcn M bsc/gen_links.sh A library/IPA_Testing.ttcn 5 files changed, 142 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/11241/2 -- To view, visit https://gerrit.osmocom.org/11241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Gerrit-Change-Number: 11241 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 13:33:43 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 8 Oct 2018 13:33:43 +0000 Subject: Change in osmo-msc[master]: mncc: protect against non responsive MNCC during setup In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11265 ) Change subject: mncc: protect against non responsive MNCC during setup ...................................................................... Patch Set 3: > I wonder if it wouldn't rather make sense to have something like a > global guard timer for all calls that don't go into established > state? I like the idea and its probably also the simplest solution. However, it would limit the alerting time. -- To view, visit https://gerrit.osmocom.org/11265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieaf6015d78ddef68827be107d3722c9d089f7c66 Gerrit-Change-Number: 11265 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 08 Oct 2018 13:33:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 13:35:41 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 8 Oct 2018 13:35:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add a TTCN3 module for IPA protocol testing In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11241 ) Change subject: Add a TTCN3 module for IPA protocol testing ...................................................................... Patch Set 2: > Patch Set 1: > > this could go both ways: > > a) by having actual testcase in the library, but then the respective 'component' would have to be configued with the required ports, etc., or > > b) by having most of the test logic in functions, so that the TC_ipa_foo() in e.g. BSC_Tests.ttcn becomes a thin wrapper doing nothing much but calling the function provided by the library. > The new patch set introduces an IPA_Testing module which contains a test component and test functions which can be called on this component. Other test suites can instantiate a component and execute a test on it. This allows us to control execution of these tests from TTCN3 code. On IRC you mentioned another possibility: Let configuration files execute testcases from multiple components. Is the approach used in patch set 2 acceptable, or should it be adjusted? -- To view, visit https://gerrit.osmocom.org/11241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Gerrit-Change-Number: 11241 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 08 Oct 2018 13:35:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 13:37:30 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 8 Oct 2018 13:37:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add a TTCN3 module for IPA protocol testing In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11241 to look at the new patch set (#3). Change subject: Add a TTCN3 module for IPA protocol testing ...................................................................... Add a TTCN3 module for IPA protocol testing This new module allows us to test IPA code in libosmocore and libosmo-netif. Currently only one test is implemented, which sends a chopped IPA ping message and expects to receive an IPA pong. The system under test is any IPA speaker on any TCP port. Any test suite can create an IPA_Testing.IPA_CT component and execute parametrized test functions. So far, one such test has been added to the BSC_Tests suite. Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Related: OS#2010 --- M bsc/BSC_Tests.cfg M bsc/BSC_Tests.ttcn M bsc/gen_links.sh A library/IPA_Testing.ttcn 4 files changed, 141 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/11241/3 -- To view, visit https://gerrit.osmocom.org/11241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Gerrit-Change-Number: 11241 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 13:38:30 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 8 Oct 2018 13:38:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add a TTCN3 module for IPA protocol testing In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11241 ) Change subject: Add a TTCN3 module for IPA protocol testing ...................................................................... Patch Set 3: > Patch Set 3: > > Build Started https://jenkins.osmocom.org/jenkins/job/gerrit-osmo-ttcn3-hacks/1399/ Patch set 3 should fix the build failure when building all tests. There was a left-over Makefile fragment in patch set 2. -- To view, visit https://gerrit.osmocom.org/11241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Gerrit-Change-Number: 11241 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 08 Oct 2018 13:38:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 13:55:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 13:55:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add a TTCN3 module for IPA protocol testing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11241 ) Change subject: Add a TTCN3 module for IPA protocol testing ...................................................................... Patch Set 3: (1 comment) I think the TCP/IPA server side should also be implemented, and the tests executed against all related interfaces. Even for the client, in the BSC we have not only the RSL and OML ports, but also CTRL. For the server side on the test, I think SCCPlite would be the candidate in BSC_Tests: Configure the BSC to connect SCCPlite against the test case server. https://gerrit.osmocom.org/#/c/11241/3/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11241/3/bsc/BSC_Tests.ttcn at 2734 PS3, Line 2734: var IPA_Testing.IPA_CT vc_IPA_Testing := IPA_Testing.IPA_CT.create; : vc_IPA_Testing.start(IPA_Testing.f_TC_chopped_ipa_ping(mp_bsc_ip, mp_bsc_rsl_port)); : vc_IPA_Testing.done; you could move those three lines still into funnction in IPA_Tests.ttcn, right? Then there would basically only be a single function to be called here with arguments for ip and port? -- To view, visit https://gerrit.osmocom.org/11241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Gerrit-Change-Number: 11241 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 08 Oct 2018 13:55:00 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 13:55:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 13:55:59 +0000 Subject: Change in osmo-msc[master]: mncc: protect against non responsive MNCC during setup In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11265 ) Change subject: mncc: protect against non responsive MNCC during setup ...................................................................... Patch Set 3: I think this requires a study of 04.07 + 04.08 to check for any related timers in the specs. I'm sure also for alerting there's an upper bound? -- To view, visit https://gerrit.osmocom.org/11265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieaf6015d78ddef68827be107d3722c9d089f7c66 Gerrit-Change-Number: 11265 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 08 Oct 2018 13:55:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 14:06:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 14:06:38 +0000 Subject: Change in osmo-msc[master]: mncc: protect against non responsive MNCC during setup In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11265 ) Change subject: mncc: protect against non responsive MNCC during setup ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11265/3/src/libmsc/gsm_04_08_cc.c File src/libmsc/gsm_04_08_cc.c: https://gerrit.osmocom.org/#/c/11265/3/src/libmsc/gsm_04_08_cc.c at 74 PS3, Line 74: #define MNCC_SETUP_TIMEOUT_T10303 25, 0 as this is not an official timer, it definitely needs a comment describing what it is exactly guarding against, what start/stop conditions are, ... -- To view, visit https://gerrit.osmocom.org/11265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieaf6015d78ddef68827be107d3722c9d089f7c66 Gerrit-Change-Number: 11265 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 08 Oct 2018 14:06:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Oct 8 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 8 Oct 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#270?= In-Reply-To: <564588616.1.1538925007396.JavaMail.jenkins@jenkins.osmocom.org> References: <564588616.1.1538925007396.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1351985366.10.1539011407322.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Oct 8 15:19:14 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 8 Oct 2018 15:19:14 +0000 Subject: Change in osmo-msc[master]: msc_mgcp: move mncc struct initalization to where its actually needed Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11275 Change subject: msc_mgcp: move mncc struct initalization to where its actually needed ...................................................................... msc_mgcp: move mncc struct initalization to where its actually needed The function _handle_error() initalizes a struct gsm_mncc variable on startup. The initalization accesses mgcp_ctx->trans->callref. All this is done before the assertion on mgcp_ctx. Later in the code one finds an if which tests on mgcp_ctx->free_ctx. This is the only part of the code that accesses the mncc struct variable. We should move the initalization there as well. - Move initalization of struct gsm_mncc mncc into the if body that uses it. Change-Id: I86983eabd999c4275dcc0e4a169ef2aa1e33c747 Related: OS#3635 --- M src/libmsc/msc_mgcp.c 1 file changed, 11 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/75/11275/1 diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index acdb785..c2bbe5f 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -158,15 +158,7 @@ { bool dlcx_possible = true; struct osmo_fsm_inst *fi; - struct gsm_mncc mncc = { - .msg_type = MNCC_REL_REQ, - .callref = mgcp_ctx->trans->callref, - .cause = { - .location = GSM48_CAUSE_LOC_PRN_S_LU, - .coding = 0, /* FIXME */ - .value = GSM48_CC_CAUSE_RESOURCE_UNAVAIL - } - }; + struct gsm_mncc mncc; OSMO_ASSERT(mgcp_ctx); fi = mgcp_ctx->fsm; @@ -188,6 +180,16 @@ * silent because we already got informed and the higher layers might * already freed their context information (trans). */ if (!mgcp_ctx->free_ctx) { + mncc = (struct gsm_mncc) { + .msg_type = MNCC_REL_REQ, + .callref = mgcp_ctx->trans->callref, + .cause = { + .location = GSM48_CAUSE_LOC_PRN_S_LU, + .coding = 0, /* FIXME */ + .value = GSM48_CC_CAUSE_RESOURCE_UNAVAIL + } + }; + mncc_set_cause(&mncc, GSM48_CAUSE_LOC_TRANS_NET, GSM48_CC_CAUSE_RESOURCE_UNAVAIL); mncc_tx_to_cc(mgcp_ctx->trans->net, MNCC_REL_REQ, &mncc); -- To view, visit https://gerrit.osmocom.org/11275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I86983eabd999c4275dcc0e4a169ef2aa1e33c747 Gerrit-Change-Number: 11275 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 15:50:16 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 8 Oct 2018 15:50:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add a TTCN3 module for IPA protocol testing In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11241 to look at the new patch set (#4). Change subject: Add a TTCN3 module for IPA protocol testing ...................................................................... Add a TTCN3 module for IPA protocol testing This new module allows us to test IPA code in libosmocore and libosmo-netif. Currently only one test is implemented, which sends a chopped IPA ping message and expects to receive an IPA pong. The system under test is any IPA speaker on any TCP port. Any test suite may call parametrized functions to create an IPA testing component and run a particular test. So far, one such test has been added to the BSC_Tests suite. Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Related: OS#2010 --- M bsc/BSC_Tests.cfg M bsc/BSC_Tests.ttcn M bsc/gen_links.sh A library/IPA_Testing.ttcn 4 files changed, 183 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/11241/4 -- To view, visit https://gerrit.osmocom.org/11241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Gerrit-Change-Number: 11241 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 15:51:18 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 8 Oct 2018 15:51:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add a TTCN3 module for IPA protocol testing In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11241 ) Change subject: Add a TTCN3 module for IPA protocol testing ...................................................................... Patch Set 4: Patch set 4 should address all your points, except for this one: > For the server side on the test, I think SCCPlite would be the candidate in BSC_Tests: Configure the BSC to connect SCCPlite against the test case server. I still have to figure out what that means exactly, and how to achieve it. -- To view, visit https://gerrit.osmocom.org/11241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Gerrit-Change-Number: 11241 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 08 Oct 2018 15:51:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 15:57:26 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 8 Oct 2018 15:57:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add a TTCN3 module for IPA protocol testing In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11241 to look at the new patch set (#5). Change subject: Add a TTCN3 module for IPA protocol testing ...................................................................... Add a TTCN3 module for IPA protocol testing This new module allows us to test IPA code in libosmocore and libosmo-netif. Currently only one test is implemented, which sends a chopped IPA ping message and expects to receive an IPA pong. The system under test is any IPA speaker on any TCP port. Any test suite may call parametrized functions to create an IPA testing component and run a particular test. So far, one such test has been added to the BSC_Tests suite. Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Related: OS#2010 --- M bsc/BSC_Tests.cfg M bsc/BSC_Tests.ttcn M bsc/gen_links.sh A library/IPA_Testing.ttcn 4 files changed, 183 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/11241/5 -- To view, visit https://gerrit.osmocom.org/11241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Gerrit-Change-Number: 11241 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 15:59:42 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 8 Oct 2018 15:59:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add a TTCN3 module for IPA protocol testing In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11241 ) Change subject: Add a TTCN3 module for IPA protocol testing ...................................................................... Patch Set 5: > Patch Set 5: This patch set fixes a bug in server mode (which is so far unused): Any incoming message should now trigger a 'ping' to be sent to the client; the previous code was accidentally waiting for a 'pong' after binding the port. -- To view, visit https://gerrit.osmocom.org/11241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Gerrit-Change-Number: 11241 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 08 Oct 2018 15:59:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 18:24:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 8 Oct 2018 18:24:30 +0000 Subject: Change in osmo-pcap[master]: Replace '.' in counter names with ':' Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11276 Change subject: Replace '.' in counter names with ':' ...................................................................... Replace '.' in counter names with ':' The '.' is illegal character in counter names, as they are exported via CTRL interface, where '.' has a special meaning that cannot be used by strings comprising the variable name. Change-Id: Icec5338d3242137980fa05d2c7ae2db940afb542 --- M src/osmo_client_main.c M src/osmo_server_main.c M src/osmo_server_network.c 3 files changed, 23 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/76/11276/1 diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c index b491a25..f571b96 100644 --- a/src/osmo_client_main.c +++ b/src/osmo_client_main.c @@ -55,21 +55,21 @@ static const struct rate_ctr_desc pcap_client_ctr_desc[] = { - [CLIENT_CTR_CONNECT] = { "server.connect", "Connects to the server" }, - [CLIENT_CTR_BYTES] = { "captured.bytes", "Captured bytes " }, - [CLIENT_CTR_PKTS] = { "captured.pkts", "Captured packets " }, - [CLIENT_CTR_2BIG] = { "bpf.too_big", "Captured data too big " }, - [CLIENT_CTR_NOMEM] = { "client.no_mem", "No memory available " }, - [CLIENT_CTR_QERR] = { "client.queue_err", "Can not queue data " }, - [CLIENT_CTR_PERR] = { "client.pcap_err", "libpcap error " }, - [CLIENT_CTR_WERR] = { "client.write_err", "Write error " }, - [CLIENT_CTR_P_RECV] = { "pcap.recv", "PCAP received packets " }, - [CLIENT_CTR_P_DROP] = { "pcap.drop", "PCAP dropped packets " }, - [CLIENT_CTR_P_IFDROP] = { "pcap.ifdrop", "iface dropped packets " }, + [CLIENT_CTR_CONNECT] = { "server:connect", "Connects to the server" }, + [CLIENT_CTR_BYTES] = { "captured:bytes", "Captured bytes " }, + [CLIENT_CTR_PKTS] = { "captured:pkts", "Captured packets " }, + [CLIENT_CTR_2BIG] = { "bpf:too_big", "Captured data too big " }, + [CLIENT_CTR_NOMEM] = { "client:no_mem", "No memory available " }, + [CLIENT_CTR_QERR] = { "client:queue_err", "Can not queue data " }, + [CLIENT_CTR_PERR] = { "client:pcap_err", "libpcap error " }, + [CLIENT_CTR_WERR] = { "client:write_err", "Write error " }, + [CLIENT_CTR_P_RECV] = { "pcap:recv", "PCAP received packets " }, + [CLIENT_CTR_P_DROP] = { "pcap:drop", "PCAP dropped packets " }, + [CLIENT_CTR_P_IFDROP] = { "pcap:ifdrop", "iface dropped packets " }, }; static const struct rate_ctr_group_desc pcap_client_ctr_group_desc = { - .group_name_prefix = "pcap.client", + .group_name_prefix = "pcap:client", .group_description = "PCAP Client statistics", .num_ctr = ARRAY_SIZE(pcap_client_ctr_desc), .ctr_desc = pcap_client_ctr_desc, diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c index 5c4f1cb..d95c994 100644 --- a/src/osmo_server_main.c +++ b/src/osmo_server_main.c @@ -56,18 +56,18 @@ static const struct rate_ctr_desc pcap_peer_ctr_desc[] = { - [PEER_CTR_CONNECT] = { "peer.connect", "Connect of a peer " }, - [PEER_CTR_BYTES] = { "peer.bytes", "Received bytes " }, - [PEER_CTR_PKTS] = { "peer.pkts", "Received packets " }, - [PEER_CTR_PROTATE] = { "peer.file_rotated","Capture file rotated" }, + [PEER_CTR_CONNECT] = { "peer:connect", "Connect of a peer " }, + [PEER_CTR_BYTES] = { "peer:bytes", "Received bytes " }, + [PEER_CTR_PKTS] = { "peer:pkts", "Received packets " }, + [PEER_CTR_PROTATE] = { "peer:file_rotated","Capture file rotated" }, }; static const struct rate_ctr_desc pcap_server_ctr_desc[] = { - [SERVER_CTR_CONNECT] = { "server.connect", "Connect of a peer " }, - [SERVER_CTR_BYTES] = { "server.bytes", "Received bytes " }, - [SERVER_CTR_PKTS] = { "server.pkts", "Received packets " }, - [SERVER_CTR_PROTATE] = { "server.file_rotated", "Capture file rotated" }, - [SERVER_CTR_NOCLIENT] = { "server.no_client", "Unknown connected " }, + [SERVER_CTR_CONNECT] = { "server:connect", "Connect of a peer " }, + [SERVER_CTR_BYTES] = { "server:bytes", "Received bytes " }, + [SERVER_CTR_PKTS] = { "server:pkts", "Received packets " }, + [SERVER_CTR_PROTATE] = { "server:file_rotated", "Capture file rotated" }, + [SERVER_CTR_NOCLIENT] = { "server:no_client", "Unknown connected " }, }; const struct rate_ctr_group_desc pcap_peer_group_desc = { @@ -79,7 +79,7 @@ }; static const struct rate_ctr_group_desc pcap_server_group_desc = { - .group_name_prefix = "pcap.server", + .group_name_prefix = "pcap:server", .group_description = "PCAP Server global statistics", .num_ctr = ARRAY_SIZE(pcap_server_ctr_desc), .ctr_desc = pcap_server_ctr_desc, diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index a854223..695090d 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -285,7 +285,7 @@ return NULL; } memcpy(desc, &pcap_peer_group_desc, sizeof(pcap_peer_group_desc)); - desc->group_name_prefix = talloc_asprintf(desc, "pcap.peer.%s", name); + desc->group_name_prefix = talloc_asprintf(desc, "pcap:peer:%s", name); if (!desc->group_name_prefix) { LOGP(DSERVER, LOGL_ERROR, "Failed to allocate group name prefix peer=%s\n", name); -- To view, visit https://gerrit.osmocom.org/11276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icec5338d3242137980fa05d2c7ae2db940afb542 Gerrit-Change-Number: 11276 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 18:24:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 8 Oct 2018 18:24:30 +0000 Subject: Change in osmo-pcap[master]: Use enum for PKT_LINK_* Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11277 Change subject: Use enum for PKT_LINK_* ...................................................................... Use enum for PKT_LINK_* Makes it easier to understand different types and how they relate to same field. Change-Id: I1bec4d5d132a1476f9c418502ad808b7c778cee2 --- M include/osmo-pcap/wireformat.h 1 file changed, 4 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/77/11277/1 diff --git a/include/osmo-pcap/wireformat.h b/include/osmo-pcap/wireformat.h index 3f92ee8..54dce22 100644 --- a/include/osmo-pcap/wireformat.h +++ b/include/osmo-pcap/wireformat.h @@ -26,15 +26,10 @@ #include #include -/* - * Should send an entire pcap header - */ -#define PKT_LINK_HDR 0 - -/* - * Should send one packet... - */ -#define PKT_LINK_DATA 1 +enum OsmoPcapDataType { + PKT_LINK_HDR, /* Should send an entire pcap header */ + PKT_LINK_DATA /* Should send one packet */ +}; struct osmo_pcap_data { uint8_t type; -- To view, visit https://gerrit.osmocom.org/11277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1bec4d5d132a1476f9c418502ad808b7c778cee2 Gerrit-Change-Number: 11277 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 18:24:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 8 Oct 2018 18:24:31 +0000 Subject: Change in osmo-pcap[master]: client: Add pcap snaplen VTY cmd Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11278 Change subject: client: Add pcap snaplen VTY cmd ...................................................................... client: Add pcap snaplen VTY cmd Change-Id: I84fda9f27b725e031c218187ab679392dfa7ec3d --- M include/osmo-pcap/common.h M include/osmo-pcap/osmo_pcap_client.h M src/osmo_client_core.c M src/osmo_client_main.c M src/osmo_client_network.c M src/osmo_client_vty.c 6 files changed, 41 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/78/11278/1 diff --git a/include/osmo-pcap/common.h b/include/osmo-pcap/common.h index 5d977f1..79080a2 100644 --- a/include/osmo-pcap/common.h +++ b/include/osmo-pcap/common.h @@ -63,4 +63,6 @@ #define MAXIMUM_SNAPLEN 262144 #endif +#define DEFAULT_SNAPLEN 9000 + #endif diff --git a/include/osmo-pcap/osmo_pcap_client.h b/include/osmo-pcap/osmo_pcap_client.h index 7888dfe..70be8db 100644 --- a/include/osmo-pcap/osmo_pcap_client.h +++ b/include/osmo-pcap/osmo_pcap_client.h @@ -94,6 +94,7 @@ char *filter_string; int filter_itself; int gprs_filtering; + int snaplen; struct osmo_fd fd; struct osmo_pcap_client_conn conn; @@ -105,6 +106,7 @@ extern struct osmo_pcap_client *pcap_client; +struct osmo_pcap_client *osmo_pcap_client_alloc(void *tall_ctx); int vty_client_init(struct osmo_pcap_client *); int osmo_client_capture(struct osmo_pcap_client *client, const char *device); diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index e19ae89..6414552 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -287,7 +287,9 @@ return 1; } - client->handle = pcap_open_live(client->device, 9000, 0, + LOGP(DCLIENT, LOGL_INFO, "Opening device %s for capture with snaplen %zu\n", + client->device, (size_t) client->snaplen); + client->handle = pcap_open_live(client->device, client->snaplen, 0, 1000, client->errbuf); if (!client->handle) { LOGP(DCLIENT, LOGL_ERROR, @@ -346,6 +348,16 @@ conn->wqueue.bfd.fd = -1; } +struct osmo_pcap_client *osmo_pcap_client_alloc(void *tall_ctx) +{ + struct osmo_pcap_client *client; + client = talloc_zero(tall_ctx, struct osmo_pcap_client); + if (!client) + return NULL; + client->fd.fd = -1; + client->snaplen = DEFAULT_SNAPLEN; + return client; +} void osmo_client_free(struct osmo_pcap_client_conn *conn) { diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c index f571b96..a28c4b7 100644 --- a/src/osmo_client_main.c +++ b/src/osmo_client_main.c @@ -212,12 +212,11 @@ exit(1); } - pcap_client = talloc_zero(tall_cli_ctx, struct osmo_pcap_client); + pcap_client = osmo_pcap_client_alloc(tall_cli_ctx); if (!pcap_client) { LOGP(DCLIENT, LOGL_ERROR, "Failed to allocate osmo_pcap_client.\n"); exit(1); } - pcap_client->fd.fd = -1; vty_client_init(pcap_client); /* initialize the queue */ diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c index e900ef4..7073d6c 100644 --- a/src/osmo_client_network.c +++ b/src/osmo_client_network.c @@ -169,14 +169,14 @@ struct msgb *msg; int offset, ip_len; - if (in_hdr->caplen > 9000) { + if (in_hdr->len > in_hdr->caplen) { LOGP(DCLIENT, LOGL_ERROR, - "Capture len too big %zu\n", (size_t) in_hdr->caplen); + "Recording truncated packet, len %zu > snaplen %zu\n", + (size_t) in_hdr->len, (size_t) in_hdr->caplen); rate_ctr_inc(&conn->client->ctrg->ctr[CLIENT_CTR_2BIG]); - return; } - msg = msgb_alloc(9000 + sizeof(*om_hdr) + sizeof(*hdr), "data-data"); + msg = msgb_alloc(in_hdr->caplen + sizeof(*om_hdr) + sizeof(*hdr), "data-data"); if (!msg) { LOGP(DCLIENT, LOGL_ERROR, "Failed to allocate.\n"); rate_ctr_inc(&conn->client->ctrg->ctr[CLIENT_CTR_NOMEM]); @@ -239,7 +239,7 @@ return; } - msg = msgb_alloc(9000 + sizeof(*om_hdr) + sizeof(*hdr), "link-data"); + msg = msgb_alloc(conn->client->snaplen + sizeof(*om_hdr) + sizeof(*hdr), "link-data"); if (!msg) { LOGP(DCLIENT, LOGL_ERROR, "Failed to allocate data.\n"); return; @@ -256,7 +256,7 @@ hdr->version_minor = 4; hdr->thiszone = 0; hdr->sigfigs = 0; - hdr->snaplen = MAXIMUM_SNAPLEN; + hdr->snaplen = conn->client->snaplen; hdr->linktype = pcap_datalink(conn->client->handle); write_data(conn, msg); diff --git a/src/osmo_client_vty.c b/src/osmo_client_vty.c index e50099f..30158c5 100644 --- a/src/osmo_client_vty.c +++ b/src/osmo_client_vty.c @@ -125,7 +125,9 @@ if (pcap_client->device) vty_out(vty, " pcap device %s%s", pcap_client->device, VTY_NEWLINE); - + if (pcap_client->snaplen != DEFAULT_SNAPLEN) + vty_out(vty, " pcap snaplen %d%s", + pcap_client->snaplen, VTY_NEWLINE); if (pcap_client->filter_string) vty_out(vty, " pcap filter %s%s", pcap_client->filter_string, VTY_NEWLINE); @@ -148,6 +150,19 @@ return CMD_SUCCESS; } +DEFUN(cfg_client_snaplen, + cfg_client_snaplen_cmd, + "pcap snaplen <1-262144>", /* MAXIMUM_SNAPLEN */ + PCAP_STRING "snapshot length\n" "Bytes\n") +{ + if (pcap_client->handle) { + vty_out(vty, "'pcap snaplen' must be set before 'pcap device' to take effect!%s", VTY_NEWLINE); + return CMD_WARNING; + } + pcap_client->snaplen = atoi(argv[0]); + return CMD_SUCCESS; +} + DEFUN(cfg_client_add_gprs, cfg_client_add_gprs_cmd, "pcap add-filter gprs", @@ -512,6 +527,7 @@ install_node(&server_node, config_write_server); install_element(CLIENT_NODE, &cfg_client_device_cmd); + install_element(CLIENT_NODE, &cfg_client_snaplen_cmd); install_element(CLIENT_NODE, &cfg_client_filter_cmd); install_element(CLIENT_NODE, &cfg_client_loop_cmd); -- To view, visit https://gerrit.osmocom.org/11278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I84fda9f27b725e031c218187ab679392dfa7ec3d Gerrit-Change-Number: 11278 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 18:24:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 8 Oct 2018 18:24:31 +0000 Subject: Change in osmo-pcap[master]: client_send_link: snaplen not needed during allocation Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11279 Change subject: client_send_link: snaplen not needed during allocation ...................................................................... client_send_link: snaplen not needed during allocation We don't send any pkt data, so no need to allocate snaplen bytes extra. Change-Id: I8d6385f6ff265564492121812a7a9f2bcfea3d5f --- M src/osmo_client_network.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/79/11279/1 diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c index 7073d6c..2ace22e 100644 --- a/src/osmo_client_network.c +++ b/src/osmo_client_network.c @@ -239,7 +239,7 @@ return; } - msg = msgb_alloc(conn->client->snaplen + sizeof(*om_hdr) + sizeof(*hdr), "link-data"); + msg = msgb_alloc(sizeof(*om_hdr) + sizeof(*hdr), "link-data"); if (!msg) { LOGP(DCLIENT, LOGL_ERROR, "Failed to allocate data.\n"); return; -- To view, visit https://gerrit.osmocom.org/11279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8d6385f6ff265564492121812a7a9f2bcfea3d5f Gerrit-Change-Number: 11279 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 18:24:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 8 Oct 2018 18:24:31 +0000 Subject: Change in osmo-pcap[master]: server: Improve verification of messages from client Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11280 Change subject: server: Improve verification of messages from client ...................................................................... server: Improve verification of messages from client Take the chance to define SERVER_MAX_DATA_SIZE as pcap payload, which we can later match to configurable snaplen parameter. Change-Id: I45d4c59026faf1108c0976eb6ad8c270e3577dbf --- M include/osmo-pcap/osmo_pcap_server.h M src/osmo_server_network.c 2 files changed, 38 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/80/11280/1 diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h index c1d318e..cdcdb70 100644 --- a/include/osmo-pcap/osmo_pcap_server.h +++ b/include/osmo-pcap/osmo_pcap_server.h @@ -91,7 +91,7 @@ int state; int pend; int reopen; - char buf[SERVER_MAX_DATA_SIZE + sizeof(struct osmo_pcap_data)]; + char buf[sizeof(struct osmo_pcap_data) + sizeof(struct osmo_pcap_pkthdr) + SERVER_MAX_DATA_SIZE]; struct osmo_pcap_data *data; /* statistics */ diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 695090d..8eb7567 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -192,12 +192,15 @@ { struct pcap_file_header *hdr; - if (data->len != sizeof(*hdr)) { - LOGP(DSERVER, LOGL_ERROR, "The pcap_file_header does not fit.\n"); + hdr = (struct pcap_file_header *) &data->data[0]; + + if (hdr->snaplen > SERVER_MAX_DATA_SIZE) { + LOGP(DSERVER, LOGL_ERROR, + "The recvd pcap_file_header contains too big snaplen %zu > %zu\n", + (size_t) hdr->snaplen, (size_t) SERVER_MAX_DATA_SIZE); return -1; } - hdr = (struct pcap_file_header *) &data->data[0]; if (!conn->no_store && conn->local_fd < 0) { conn->file_hdr = *hdr; restart_pcap(conn); @@ -335,6 +338,36 @@ return do_read_tls(conn, buf, size); } +static bool pcap_data_valid(struct osmo_pcap_conn *conn) +{ + unsigned int min_len, max_len; + switch ((enum OsmoPcapDataType) conn->data->type) { + case PKT_LINK_HDR: + if (conn->data->len != sizeof(struct pcap_file_header)) { + LOGP(DSERVER, LOGL_ERROR, + "Implausible llink_hdr length: %u != %zu\n", + conn->data->len, sizeof(struct osmo_pcap_pkthdr)); + return false; + } + break; + case PKT_LINK_DATA: + min_len = sizeof(struct osmo_pcap_pkthdr); + max_len = SERVER_MAX_DATA_SIZE + sizeof(struct osmo_pcap_pkthdr); + if (conn->data->len < min_len || conn->data->len > max_len) { + LOGP(DSERVER, LOGL_ERROR, + "Implausible data length: %u < %u <= %u\n", + min_len, conn->data->len, max_len); + return false; + } + break; + default: + LOGP(DSERVER, LOGL_ERROR, "Unknown data type %" PRIx8 "\n", + conn->data->type); + return false; + } + return true; +} + static int read_cb_initial(struct osmo_pcap_conn *conn) { int rc; @@ -354,11 +387,8 @@ } else if (conn->pend == 0) { conn->data->len = ntohs(conn->data->len); - if (conn->data->len > SERVER_MAX_DATA_SIZE) { - LOGP(DSERVER, LOGL_ERROR, - "Implausible data length: %u\n", conn->data->len); + if (!pcap_data_valid(conn)) return -1; - } conn->state = STATE_DATA; conn->pend = conn->data->len; -- To view, visit https://gerrit.osmocom.org/11280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I45d4c59026faf1108c0976eb6ad8c270e3577dbf Gerrit-Change-Number: 11280 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 18:24:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 8 Oct 2018 18:24:31 +0000 Subject: Change in osmo-pcap[master]: server: Add pcap snaplen VTY cmd Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11281 Change subject: server: Add pcap snaplen VTY cmd ...................................................................... server: Add pcap snaplen VTY cmd Change-Id: I8fdcdc1a58926ec66a1dc5dc7a5e57ed4dceb4b4 --- M include/osmo-pcap/osmo_pcap_server.h M src/osmo_server_main.c M src/osmo_server_network.c M src/osmo_server_vty.c 4 files changed, 23 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/81/11281/1 diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h index cdcdb70..a983ec5 100644 --- a/include/osmo-pcap/osmo_pcap_server.h +++ b/include/osmo-pcap/osmo_pcap_server.h @@ -48,8 +48,6 @@ #define STATE_INITIAL 0 #define STATE_DATA 1 -#define SERVER_MAX_DATA_SIZE 10000 - enum { PEER_CTR_CONNECT, PEER_CTR_BYTES, @@ -91,7 +89,6 @@ int state; int pend; int reopen; - char buf[sizeof(struct osmo_pcap_data) + sizeof(struct osmo_pcap_pkthdr) + SERVER_MAX_DATA_SIZE]; struct osmo_pcap_data *data; /* statistics */ @@ -133,6 +130,7 @@ char *base_path; off_t max_size; + int max_snaplen; /* statistics */ struct rate_ctr_group *ctrg; diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c index d95c994..3e399af 100644 --- a/src/osmo_server_main.c +++ b/src/osmo_server_main.c @@ -239,6 +239,7 @@ INIT_LLIST_HEAD(&pcap_server->conn); pcap_server->base_path = talloc_strdup(pcap_server, "./"); pcap_server->max_size = 1073741824; + pcap_server->max_snaplen = DEFAULT_SNAPLEN; vty_server_init(pcap_server); if (vty_read_config_file(config_file, NULL) < 0) { diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 8eb7567..55934be 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -194,10 +194,10 @@ hdr = (struct pcap_file_header *) &data->data[0]; - if (hdr->snaplen > SERVER_MAX_DATA_SIZE) { + if (hdr->snaplen > conn->server->max_snaplen) { LOGP(DSERVER, LOGL_ERROR, "The recvd pcap_file_header contains too big snaplen %zu > %zu\n", - (size_t) hdr->snaplen, (size_t) SERVER_MAX_DATA_SIZE); + (size_t) hdr->snaplen, (size_t) conn->server->max_snaplen); return -1; } @@ -266,6 +266,7 @@ { struct rate_ctr_group_desc *desc; struct osmo_pcap_conn *conn; + size_t buf_size; llist_for_each_entry(conn, &server->conn, entry) { if (strcmp(conn->name, name) == 0) @@ -279,6 +280,10 @@ return NULL; } + buf_size = sizeof(struct osmo_pcap_data); + buf_size += OSMO_MAX(sizeof(struct pcap_file_header), + sizeof(struct osmo_pcap_pkthdr) + server->max_snaplen); + conn->data = talloc_zero_size(conn, buf_size); /* a bit nasty. we do not work with ids but names */ desc = talloc_zero(conn, struct rate_ctr_group_desc); if (!desc) { @@ -318,7 +323,6 @@ conn->rem_wq.bfd.fd = -1; conn->local_fd = -1; conn->server = server; - conn->data = (struct osmo_pcap_data *) &conn->buf[0]; llist_add_tail(&conn->entry, &server->conn); return conn; } @@ -352,7 +356,7 @@ break; case PKT_LINK_DATA: min_len = sizeof(struct osmo_pcap_pkthdr); - max_len = SERVER_MAX_DATA_SIZE + sizeof(struct osmo_pcap_pkthdr); + max_len = conn->server->max_snaplen + sizeof(struct osmo_pcap_pkthdr); if (conn->data->len < min_len || conn->data->len > max_len) { LOGP(DSERVER, LOGL_ERROR, "Implausible data length: %u < %u <= %u\n", @@ -372,7 +376,7 @@ { int rc; - rc = do_read(conn, &conn->buf[sizeof(*conn->data) - conn->pend], conn->pend); + rc = do_read(conn, ((uint8_t*)conn->data) + sizeof(*conn->data) - conn->pend, conn->pend); if (rc <= 0) { LOGP(DSERVER, LOGL_ERROR, "Too short packet. Got %d, wanted %d\n", rc, conn->data->len); diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index d10ff51..e9b54b1 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -94,6 +94,8 @@ vty_out(vty, " server port %d%s", pcap_server->port, VTY_NEWLINE); vty_out(vty, " max-file-size %llu%s", (unsigned long long) pcap_server->max_size, VTY_NEWLINE); + if (pcap_server->max_snaplen != DEFAULT_SNAPLEN) + vty_out(vty, " server max-snaplen %d%s", pcap_server->max_snaplen, VTY_NEWLINE); if (pcap_server->zmq_port > 0) vty_out(vty, " zeromq-publisher %s %d%s", pcap_server->zmq_ip, pcap_server->zmq_port, VTY_NEWLINE); @@ -158,6 +160,15 @@ return CMD_SUCCESS; } +DEFUN(cfg_server_max_snaplen, + cfg_server_max_snaplen_cmd, + "max-snaplen <1-262144>", /* MAXIMUM_SNAPLEN */ + "Maximum pcap snapshot length\n" "Bytes\n") +{ + pcap_server->max_snaplen = atoi(argv[0]); + return CMD_SUCCESS; +} + static int manage_client(struct osmo_pcap_server *pcap_server, struct vty *vty, const char *name, const char *remote_host, @@ -511,6 +522,7 @@ install_element(SERVER_NODE, &cfg_server_ip_cmd); install_element(SERVER_NODE, &cfg_server_port_cmd); install_element(SERVER_NODE, &cfg_server_max_size_cmd); + install_element(SERVER_NODE, &cfg_server_max_snaplen_cmd); install_element(SERVER_NODE, &cfg_server_zmq_ip_port_cmd); install_element(SERVER_NODE, &cfg_no_server_zmq_ip_port_cmd); -- To view, visit https://gerrit.osmocom.org/11281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8fdcdc1a58926ec66a1dc5dc7a5e57ed4dceb4b4 Gerrit-Change-Number: 11281 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 19:14:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 19:14:33 +0000 Subject: Change in osmo-pcap[master]: Use enum for PKT_LINK_* In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11277 ) Change subject: Use enum for PKT_LINK_* ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1bec4d5d132a1476f9c418502ad808b7c778cee2 Gerrit-Change-Number: 11277 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 08 Oct 2018 19:14:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 19:14:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 19:14:47 +0000 Subject: Change in osmo-pcap[master]: Replace '.' in counter names with ':' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11276 ) Change subject: Replace '.' in counter names with ':' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icec5338d3242137980fa05d2c7ae2db940afb542 Gerrit-Change-Number: 11276 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 08 Oct 2018 19:14:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 19:15:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 19:15:41 +0000 Subject: Change in osmo-pcap[master]: client: Add pcap snaplen VTY cmd In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11278 ) Change subject: client: Add pcap snaplen VTY cmd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I84fda9f27b725e031c218187ab679392dfa7ec3d Gerrit-Change-Number: 11278 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 08 Oct 2018 19:15:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 19:15:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 19:15:53 +0000 Subject: Change in osmo-pcap[master]: client_send_link: snaplen not needed during allocation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11279 ) Change subject: client_send_link: snaplen not needed during allocation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8d6385f6ff265564492121812a7a9f2bcfea3d5f Gerrit-Change-Number: 11279 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 08 Oct 2018 19:15:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 19:16:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 19:16:22 +0000 Subject: Change in osmo-pcap[master]: server: Improve verification of messages from client In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11280 ) Change subject: server: Improve verification of messages from client ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I45d4c59026faf1108c0976eb6ad8c270e3577dbf Gerrit-Change-Number: 11280 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 08 Oct 2018 19:16:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 19:16:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 19:16:43 +0000 Subject: Change in osmo-pcap[master]: server: Add pcap snaplen VTY cmd In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11281 ) Change subject: server: Add pcap snaplen VTY cmd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8fdcdc1a58926ec66a1dc5dc7a5e57ed4dceb4b4 Gerrit-Change-Number: 11281 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 08 Oct 2018 19:16:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 19:18:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 19:18:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add a TTCN3 module for IPA protocol testing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11241 ) Change subject: Add a TTCN3 module for IPA protocol testing ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Gerrit-Change-Number: 11241 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 08 Oct 2018 19:18:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 19:18:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 19:18:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add a TTCN3 module for IPA protocol testing In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11241 ) Change subject: Add a TTCN3 module for IPA protocol testing ...................................................................... Add a TTCN3 module for IPA protocol testing This new module allows us to test IPA code in libosmocore and libosmo-netif. Currently only one test is implemented, which sends a chopped IPA ping message and expects to receive an IPA pong. The system under test is any IPA speaker on any TCP port. Any test suite may call parametrized functions to create an IPA testing component and run a particular test. So far, one such test has been added to the BSC_Tests suite. Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Related: OS#2010 --- M bsc/BSC_Tests.cfg M bsc/BSC_Tests.ttcn M bsc/gen_links.sh A library/IPA_Testing.ttcn 4 files changed, 183 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc/BSC_Tests.cfg b/bsc/BSC_Tests.cfg index 175654a..4e6c40e 100644 --- a/bsc/BSC_Tests.cfg +++ b/bsc/BSC_Tests.cfg @@ -74,3 +74,4 @@ #BSC_Tests.TC_err_82_short_msg #BSC_Tests.TC_err_84_unknown_msg #BSC_Tests.TC_ho_int +#BSC_Tests.TC_chopped_ipa_ping diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 4a34310..28ade1e 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -30,6 +30,7 @@ import from IPA_Emulation all; import from IPA_CodecPort all; import from IPA_Types all; +import from IPA_Testing all; import from RSL_Types all; import from RSL_Emulation all; import from MGCP_Emulation all; @@ -2729,6 +2730,14 @@ setverdict(pass); } +testcase TC_chopped_ipa_ping() runs on test_CT { + const Integers bsc_ipa_ports := {mp_bsc_rsl_port, mp_bsc_oml_port + /* TOOD: This port is failing: mp_bsc_ctrl_port */ }; + for (var integer i := 0; i < lengthof(bsc_ipa_ports); i := i + 1) { + IPA_Testing.f_run_TC_chopped_ipa_ping(mp_bsc_ip, bsc_ipa_ports[i], CONNECT_TO_SERVER); + } +} + /* Dyn PDCH todo: * activate OSMO as TCH/F * activate OSMO as TCH/H @@ -2836,6 +2845,8 @@ execute( TC_dyn_pdch_osmo_act_deact() ); execute( TC_dyn_pdch_osmo_act_nack() ); + execute( TC_chopped_ipa_ping() ); + /* at bottom as they might crash OsmoBSC before OS#3182 is fixed */ execute( TC_early_conn_fail() ); execute( TC_late_conn_fail() ); diff --git a/bsc/gen_links.sh b/bsc/gen_links.sh index 3e27cb1..88983d7 100755 --- a/bsc/gen_links.sh +++ b/bsc/gen_links.sh @@ -67,7 +67,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn BSSMAP_Emulation.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn BSSAP_Adapter.ttcn Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn" +FILES="General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn BSSMAP_Emulation.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn BSSAP_Adapter.ttcn Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn" gen_links $DIR $FILES ignore_pp_results diff --git a/library/IPA_Testing.ttcn b/library/IPA_Testing.ttcn new file mode 100644 index 0000000..62aa143 --- /dev/null +++ b/library/IPA_Testing.ttcn @@ -0,0 +1,170 @@ +/* (C) 2018 by sysmocom s.f.m.c. GmbH + * Author: Stefan Sperling + * All Rights Reserved + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + */ + +/* + * This module provides functions which implement IPA protocol tests. + * There are no test cases defined here. Instead, there are test functions which + * can be called by test cases in our test suites. Each such function will create + * an IPA_CT component and execute a test on this component, and expects destination + * IP address, TCP port, and connection mode parameters. Depending on the connection + * mode, a test function will either connect to an IPA server on the specified + * address and port, or listen for an IPA client on the specified address and port. + * This allows IPA tests to be run against any IPA speakers used by various test suites. + */ + +module IPA_Testing { + +import from IPL4asp_Types all; +import from IPL4asp_PortType all; +import from IPA_Types all; +import from Osmocom_Types all; + +type enumerated IPA_ConnectionMode { + CONNECT_TO_SERVER, + LISTEN_FOR_CLIENT +}; + +/* Encoded IPA messages (network byte order) */ +const octetstring ipa_msg_ping := '0001FE00'O; +const octetstring ipa_msg_pong := '0001FE01'O; + +/* A component which represents the system on which the IPA speaker is running. */ +type component system_CT { + port IPL4asp_PT IPL4; +} + +/* Main component provided by this module. */ +type component IPA_CT { + port IPL4asp_PT IPL4; + timer g_Tguard; +} + +/* This guard timer prevents us from waiting too long if the IPA TCP connection hangs. */ +private altstep as_Tguard() runs on IPA_CT { + [] g_Tguard.timeout { + setverdict(fail, "Tguard timeout"); + mtc.stop; + } +} + +/* Send an encoded IPA message across an IPA TCP connection. */ +private function f_send_ipa_data(charstring ipa_ip, integer ipa_tcp_port, ConnectionId connId, + octetstring data) runs on IPA_CT { + var IPL4asp_Types.Result res; + var ASP_SendTo asp := { + connId := connId, + remName := ipa_ip, + remPort := ipa_tcp_port, + proto := {tcp := {}}, + msg := data + }; + IPL4.send(asp); +} + +/* Match an incoming IPA message. */ +private template ASP_RecvFrom t_recvfrom(template octetstring msg) := { + connId := ?, + remName := ?, + remPort := ?, + locName := ?, + locPort := ?, + proto := {tcp := {}}, + userData := ?, + msg := msg +} + +/* Perform set up steps for a test function. */ +private function f_init(charstring ipa_ip, integer ipa_tcp_port, + IPA_ConnectionMode conmode) runs on IPA_CT return ConnectionId { + var IPL4asp_Types.Result res; + var ConnectionId connId; + + map(self:IPL4, system:IPL4); + if (conmode == CONNECT_TO_SERVER) { + /* Create an IPA connection over TCP. */ + res := IPL4asp_PortType.f_IPL4_connect(IPL4, ipa_ip, ipa_tcp_port, "", -1, 0, {tcp := {}}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect IPA socket to ", ipa_ip, " port ", + ipa_tcp_port, "; check your configuration"); + mtc.stop; + } + } else { + /* Listen for an incoming IPA connection on TCP. */ + res := IPL4asp_PortType.f_IPL4_listen(IPL4, ipa_ip, ipa_tcp_port, {tcp := {}}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not listen on address ", ipa_ip, " port ", + ipa_tcp_port, "; check your configuration"); + mtc.stop; + } + } + + /* + * Activate guard timer. When changing the timeout value, keep in mind + * that test functions below may wait for some amount of time, which + * this guard timer should always exceed to avoid spurious failures. + */ + g_Tguard.start(60.0); + activate(as_Tguard()); + + return res.connId; +} + +/* + * Individual test case implementations. + */ + +private function f_send_chopped_ipa_msg(charstring ipa_ip, integer ipa_tcp_port, ConnectionId connId, + octetstring msg) runs on IPA_CT { + const float delay := 6.0; + for (var integer i := 0; i < lengthof(msg); i := i + 1) { + log("sending byte ", msg[i]); + f_send_ipa_data(ipa_ip, ipa_tcp_port, connId, msg[i]); + f_sleep(delay); + } +} + +/* Send a ping message one byte at a time, waiting for TCP buffer to flush between each byte. */ +private function f_TC_chopped_ipa_ping(charstring ipa_ip, integer ipa_tcp_port, + IPA_ConnectionMode conmode) runs on IPA_CT system system_CT { + var ConnectionId connId; + var ASP_RecvFrom asp_rx; + + connId := f_init(ipa_ip, ipa_tcp_port, conmode); + + if (conmode == CONNECT_TO_SERVER) { + f_send_chopped_ipa_msg(ipa_ip, ipa_tcp_port, connId, ipa_msg_ping); + } else { + IPL4.receive(t_recvfrom(omit)) -> value asp_rx { + f_send_chopped_ipa_msg(asp_rx.remName, asp_rx.remPort, connId, ipa_msg_ping); + } + } + + /* Expect a pong response. */ + alt { + [] IPL4.receive(t_recvfrom(ipa_msg_pong)) -> value asp_rx { + log("received pong from ", asp_rx.remName, " port ", asp_rx.remPort, ": ", asp_rx.msg); + setverdict(pass); + } + [] IPL4.receive { + repeat; + } + } +} + +/* + * Public functions. + * Test suites may call these functions to create an IPA_CT component and run a test to completion. + */ + +function f_run_TC_chopped_ipa_ping(charstring ipa_ip, integer ipa_tcp_port, IPA_ConnectionMode conmode) { + var IPA_Testing.IPA_CT vc_IPA_Testing := IPA_Testing.IPA_CT.create; + vc_IPA_Testing.start(IPA_Testing.f_TC_chopped_ipa_ping(ipa_ip, ipa_tcp_port, conmode)); + vc_IPA_Testing.done; +} + +} -- To view, visit https://gerrit.osmocom.org/11241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I246a405414e36a44dc1e308692faab8bf04da0e6 Gerrit-Change-Number: 11241 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 19:18:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 19:18:21 +0000 Subject: Change in osmo-pcap[master]: Replace '.' in counter names with ':' In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11276 ) Change subject: Replace '.' in counter names with ':' ...................................................................... Replace '.' in counter names with ':' The '.' is illegal character in counter names, as they are exported via CTRL interface, where '.' has a special meaning that cannot be used by strings comprising the variable name. Change-Id: Icec5338d3242137980fa05d2c7ae2db940afb542 --- M src/osmo_client_main.c M src/osmo_server_main.c M src/osmo_server_network.c 3 files changed, 23 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c index b491a25..f571b96 100644 --- a/src/osmo_client_main.c +++ b/src/osmo_client_main.c @@ -55,21 +55,21 @@ static const struct rate_ctr_desc pcap_client_ctr_desc[] = { - [CLIENT_CTR_CONNECT] = { "server.connect", "Connects to the server" }, - [CLIENT_CTR_BYTES] = { "captured.bytes", "Captured bytes " }, - [CLIENT_CTR_PKTS] = { "captured.pkts", "Captured packets " }, - [CLIENT_CTR_2BIG] = { "bpf.too_big", "Captured data too big " }, - [CLIENT_CTR_NOMEM] = { "client.no_mem", "No memory available " }, - [CLIENT_CTR_QERR] = { "client.queue_err", "Can not queue data " }, - [CLIENT_CTR_PERR] = { "client.pcap_err", "libpcap error " }, - [CLIENT_CTR_WERR] = { "client.write_err", "Write error " }, - [CLIENT_CTR_P_RECV] = { "pcap.recv", "PCAP received packets " }, - [CLIENT_CTR_P_DROP] = { "pcap.drop", "PCAP dropped packets " }, - [CLIENT_CTR_P_IFDROP] = { "pcap.ifdrop", "iface dropped packets " }, + [CLIENT_CTR_CONNECT] = { "server:connect", "Connects to the server" }, + [CLIENT_CTR_BYTES] = { "captured:bytes", "Captured bytes " }, + [CLIENT_CTR_PKTS] = { "captured:pkts", "Captured packets " }, + [CLIENT_CTR_2BIG] = { "bpf:too_big", "Captured data too big " }, + [CLIENT_CTR_NOMEM] = { "client:no_mem", "No memory available " }, + [CLIENT_CTR_QERR] = { "client:queue_err", "Can not queue data " }, + [CLIENT_CTR_PERR] = { "client:pcap_err", "libpcap error " }, + [CLIENT_CTR_WERR] = { "client:write_err", "Write error " }, + [CLIENT_CTR_P_RECV] = { "pcap:recv", "PCAP received packets " }, + [CLIENT_CTR_P_DROP] = { "pcap:drop", "PCAP dropped packets " }, + [CLIENT_CTR_P_IFDROP] = { "pcap:ifdrop", "iface dropped packets " }, }; static const struct rate_ctr_group_desc pcap_client_ctr_group_desc = { - .group_name_prefix = "pcap.client", + .group_name_prefix = "pcap:client", .group_description = "PCAP Client statistics", .num_ctr = ARRAY_SIZE(pcap_client_ctr_desc), .ctr_desc = pcap_client_ctr_desc, diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c index 5c4f1cb..d95c994 100644 --- a/src/osmo_server_main.c +++ b/src/osmo_server_main.c @@ -56,18 +56,18 @@ static const struct rate_ctr_desc pcap_peer_ctr_desc[] = { - [PEER_CTR_CONNECT] = { "peer.connect", "Connect of a peer " }, - [PEER_CTR_BYTES] = { "peer.bytes", "Received bytes " }, - [PEER_CTR_PKTS] = { "peer.pkts", "Received packets " }, - [PEER_CTR_PROTATE] = { "peer.file_rotated","Capture file rotated" }, + [PEER_CTR_CONNECT] = { "peer:connect", "Connect of a peer " }, + [PEER_CTR_BYTES] = { "peer:bytes", "Received bytes " }, + [PEER_CTR_PKTS] = { "peer:pkts", "Received packets " }, + [PEER_CTR_PROTATE] = { "peer:file_rotated","Capture file rotated" }, }; static const struct rate_ctr_desc pcap_server_ctr_desc[] = { - [SERVER_CTR_CONNECT] = { "server.connect", "Connect of a peer " }, - [SERVER_CTR_BYTES] = { "server.bytes", "Received bytes " }, - [SERVER_CTR_PKTS] = { "server.pkts", "Received packets " }, - [SERVER_CTR_PROTATE] = { "server.file_rotated", "Capture file rotated" }, - [SERVER_CTR_NOCLIENT] = { "server.no_client", "Unknown connected " }, + [SERVER_CTR_CONNECT] = { "server:connect", "Connect of a peer " }, + [SERVER_CTR_BYTES] = { "server:bytes", "Received bytes " }, + [SERVER_CTR_PKTS] = { "server:pkts", "Received packets " }, + [SERVER_CTR_PROTATE] = { "server:file_rotated", "Capture file rotated" }, + [SERVER_CTR_NOCLIENT] = { "server:no_client", "Unknown connected " }, }; const struct rate_ctr_group_desc pcap_peer_group_desc = { @@ -79,7 +79,7 @@ }; static const struct rate_ctr_group_desc pcap_server_group_desc = { - .group_name_prefix = "pcap.server", + .group_name_prefix = "pcap:server", .group_description = "PCAP Server global statistics", .num_ctr = ARRAY_SIZE(pcap_server_ctr_desc), .ctr_desc = pcap_server_ctr_desc, diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index a854223..695090d 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -285,7 +285,7 @@ return NULL; } memcpy(desc, &pcap_peer_group_desc, sizeof(pcap_peer_group_desc)); - desc->group_name_prefix = talloc_asprintf(desc, "pcap.peer.%s", name); + desc->group_name_prefix = talloc_asprintf(desc, "pcap:peer:%s", name); if (!desc->group_name_prefix) { LOGP(DSERVER, LOGL_ERROR, "Failed to allocate group name prefix peer=%s\n", name); -- To view, visit https://gerrit.osmocom.org/11276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icec5338d3242137980fa05d2c7ae2db940afb542 Gerrit-Change-Number: 11276 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 19:18:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 19:18:22 +0000 Subject: Change in osmo-pcap[master]: Use enum for PKT_LINK_* In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11277 ) Change subject: Use enum for PKT_LINK_* ...................................................................... Use enum for PKT_LINK_* Makes it easier to understand different types and how they relate to same field. Change-Id: I1bec4d5d132a1476f9c418502ad808b7c778cee2 --- M include/osmo-pcap/wireformat.h 1 file changed, 4 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmo-pcap/wireformat.h b/include/osmo-pcap/wireformat.h index 3f92ee8..54dce22 100644 --- a/include/osmo-pcap/wireformat.h +++ b/include/osmo-pcap/wireformat.h @@ -26,15 +26,10 @@ #include #include -/* - * Should send an entire pcap header - */ -#define PKT_LINK_HDR 0 - -/* - * Should send one packet... - */ -#define PKT_LINK_DATA 1 +enum OsmoPcapDataType { + PKT_LINK_HDR, /* Should send an entire pcap header */ + PKT_LINK_DATA /* Should send one packet */ +}; struct osmo_pcap_data { uint8_t type; -- To view, visit https://gerrit.osmocom.org/11277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1bec4d5d132a1476f9c418502ad808b7c778cee2 Gerrit-Change-Number: 11277 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 19:18:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 19:18:53 +0000 Subject: Change in osmo-msc[master]: msc_mgcp: move mncc struct initalization to where its actually needed In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11275 ) Change subject: msc_mgcp: move mncc struct initalization to where its actually needed ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I86983eabd999c4275dcc0e4a169ef2aa1e33c747 Gerrit-Change-Number: 11275 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 08 Oct 2018 19:18:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 8 19:18:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 8 Oct 2018 19:18:56 +0000 Subject: Change in osmo-msc[master]: msc_mgcp: move mncc struct initalization to where its actually needed In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11275 ) Change subject: msc_mgcp: move mncc struct initalization to where its actually needed ...................................................................... msc_mgcp: move mncc struct initalization to where its actually needed The function _handle_error() initalizes a struct gsm_mncc variable on startup. The initalization accesses mgcp_ctx->trans->callref. All this is done before the assertion on mgcp_ctx. Later in the code one finds an if which tests on mgcp_ctx->free_ctx. This is the only part of the code that accesses the mncc struct variable. We should move the initalization there as well. - Move initalization of struct gsm_mncc mncc into the if body that uses it. Change-Id: I86983eabd999c4275dcc0e4a169ef2aa1e33c747 Related: OS#3635 --- M src/libmsc/msc_mgcp.c 1 file changed, 11 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index acdb785..c2bbe5f 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -158,15 +158,7 @@ { bool dlcx_possible = true; struct osmo_fsm_inst *fi; - struct gsm_mncc mncc = { - .msg_type = MNCC_REL_REQ, - .callref = mgcp_ctx->trans->callref, - .cause = { - .location = GSM48_CAUSE_LOC_PRN_S_LU, - .coding = 0, /* FIXME */ - .value = GSM48_CC_CAUSE_RESOURCE_UNAVAIL - } - }; + struct gsm_mncc mncc; OSMO_ASSERT(mgcp_ctx); fi = mgcp_ctx->fsm; @@ -188,6 +180,16 @@ * silent because we already got informed and the higher layers might * already freed their context information (trans). */ if (!mgcp_ctx->free_ctx) { + mncc = (struct gsm_mncc) { + .msg_type = MNCC_REL_REQ, + .callref = mgcp_ctx->trans->callref, + .cause = { + .location = GSM48_CAUSE_LOC_PRN_S_LU, + .coding = 0, /* FIXME */ + .value = GSM48_CC_CAUSE_RESOURCE_UNAVAIL + } + }; + mncc_set_cause(&mncc, GSM48_CAUSE_LOC_TRANS_NET, GSM48_CC_CAUSE_RESOURCE_UNAVAIL); mncc_tx_to_cc(mgcp_ctx->trans->net, MNCC_REL_REQ, &mncc); -- To view, visit https://gerrit.osmocom.org/11275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I86983eabd999c4275dcc0e4a169ef2aa1e33c747 Gerrit-Change-Number: 11275 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 06:41:17 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 9 Oct 2018 06:41:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: document why ipa chopped ping fails with control interface Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11283 Change subject: document why ipa chopped ping fails with control interface ...................................................................... document why ipa chopped ping fails with control interface We cannot test the control interface with an IPA ping message. The control interface only supports osmocom-specific extensions, and the IPA ping message is not part of those extensions. Other tests will have to be devised for the control interface. Change-Id: Iae0f16394c78196de621c14b34d1b1905c0cb7c8 Related: OS#2010 --- M bsc/BSC_Tests.ttcn 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/11283/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 28ade1e..9a85a1f 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2731,8 +2731,9 @@ } testcase TC_chopped_ipa_ping() runs on test_CT { - const Integers bsc_ipa_ports := {mp_bsc_rsl_port, mp_bsc_oml_port - /* TOOD: This port is failing: mp_bsc_ctrl_port */ }; + /* The IPA control interface (mp_bsc_ctrl_port) won't work with this test because the control + * interface only implements IPAC_PROTO_OSMO, while the IPA PING request uses IPAC_PROTO_IPACCESS. */ + const Integers bsc_ipa_ports := {mp_bsc_rsl_port, mp_bsc_oml_port}; for (var integer i := 0; i < lengthof(bsc_ipa_ports); i := i + 1) { IPA_Testing.f_run_TC_chopped_ipa_ping(mp_bsc_ip, bsc_ipa_ports[i], CONNECT_TO_SERVER); } -- To view, visit https://gerrit.osmocom.org/11283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iae0f16394c78196de621c14b34d1b1905c0cb7c8 Gerrit-Change-Number: 11283 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 08:07:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 9 Oct 2018 08:07:47 +0000 Subject: Change in osmo-pcap[master]: client: Set snaplen to MAXIMUM_SNAPLEN In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11264 ) Change subject: client: Set snaplen to MAXIMUM_SNAPLEN ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib7449d5aba9da342c150704ebd0e1f09e7f7276c Gerrit-Change-Number: 11264 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 09 Oct 2018 08:07:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 08:07:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 9 Oct 2018 08:07:52 +0000 Subject: Change in osmo-pcap[master]: client: Set snaplen to MAXIMUM_SNAPLEN In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11264 ) Change subject: client: Set snaplen to MAXIMUM_SNAPLEN ...................................................................... client: Set snaplen to MAXIMUM_SNAPLEN Despite this value not being exported publicly, the truth is that tcpdump and wireshark nowadays avoid processing any file with snaplen bigger than this value: "tcpdump: pcap_loop: invalid packet capture length 861244, bigger than snaplen of 262144" It also fails to set snaplen to values bigger than that: "tcpdump -s 262145" --> "tcpdump: invalid snaplen 262145" pcapfix also warns about wrong packet length if bigger than same value (defined as PCAP_MAX_SNAPLEN there). MAXIMUM_SPANPLEN is defined in tcpdump's netdissect.h and libpcap's pcap-int.h. It is also defined as WTAP_MAX_PACKET_SIZE in wireshark/wiretap/wtap.h (this one being the only publicly available). Change-Id: Ib7449d5aba9da342c150704ebd0e1f09e7f7276c --- M include/osmo-pcap/common.h M src/osmo_client_network.c 2 files changed, 6 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmo-pcap/common.h b/include/osmo-pcap/common.h index 27fd514..5d977f1 100644 --- a/include/osmo-pcap/common.h +++ b/include/osmo-pcap/common.h @@ -58,4 +58,9 @@ extern int osmopcap_go_parent(struct vty *vty); extern int osmopcap_is_config_node(struct vty *vty, int node); +/* defined in libpcap's pcap-int.h, which is not public */ +#ifndef MAXIMUM_SNAPLEN +#define MAXIMUM_SNAPLEN 262144 +#endif + #endif diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c index 3d741a8..e900ef4 100644 --- a/src/osmo_client_network.c +++ b/src/osmo_client_network.c @@ -42,7 +42,6 @@ #include #include - static void _osmo_client_connect(void *_data) { osmo_client_connect((struct osmo_pcap_client_conn *) _data); @@ -257,7 +256,7 @@ hdr->version_minor = 4; hdr->thiszone = 0; hdr->sigfigs = 0; - hdr->snaplen = UINT_MAX; + hdr->snaplen = MAXIMUM_SNAPLEN; hdr->linktype = pcap_datalink(conn->client->handle); write_data(conn, msg); -- To view, visit https://gerrit.osmocom.org/11264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib7449d5aba9da342c150704ebd0e1f09e7f7276c Gerrit-Change-Number: 11264 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 08:07:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 9 Oct 2018 08:07:53 +0000 Subject: Change in osmo-pcap[master]: client: Add pcap snaplen VTY cmd In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11278 ) Change subject: client: Add pcap snaplen VTY cmd ...................................................................... client: Add pcap snaplen VTY cmd Change-Id: I84fda9f27b725e031c218187ab679392dfa7ec3d --- M include/osmo-pcap/common.h M include/osmo-pcap/osmo_pcap_client.h M src/osmo_client_core.c M src/osmo_client_main.c M src/osmo_client_network.c M src/osmo_client_vty.c 6 files changed, 41 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmo-pcap/common.h b/include/osmo-pcap/common.h index 5d977f1..79080a2 100644 --- a/include/osmo-pcap/common.h +++ b/include/osmo-pcap/common.h @@ -63,4 +63,6 @@ #define MAXIMUM_SNAPLEN 262144 #endif +#define DEFAULT_SNAPLEN 9000 + #endif diff --git a/include/osmo-pcap/osmo_pcap_client.h b/include/osmo-pcap/osmo_pcap_client.h index 7888dfe..70be8db 100644 --- a/include/osmo-pcap/osmo_pcap_client.h +++ b/include/osmo-pcap/osmo_pcap_client.h @@ -94,6 +94,7 @@ char *filter_string; int filter_itself; int gprs_filtering; + int snaplen; struct osmo_fd fd; struct osmo_pcap_client_conn conn; @@ -105,6 +106,7 @@ extern struct osmo_pcap_client *pcap_client; +struct osmo_pcap_client *osmo_pcap_client_alloc(void *tall_ctx); int vty_client_init(struct osmo_pcap_client *); int osmo_client_capture(struct osmo_pcap_client *client, const char *device); diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index e19ae89..6414552 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -287,7 +287,9 @@ return 1; } - client->handle = pcap_open_live(client->device, 9000, 0, + LOGP(DCLIENT, LOGL_INFO, "Opening device %s for capture with snaplen %zu\n", + client->device, (size_t) client->snaplen); + client->handle = pcap_open_live(client->device, client->snaplen, 0, 1000, client->errbuf); if (!client->handle) { LOGP(DCLIENT, LOGL_ERROR, @@ -346,6 +348,16 @@ conn->wqueue.bfd.fd = -1; } +struct osmo_pcap_client *osmo_pcap_client_alloc(void *tall_ctx) +{ + struct osmo_pcap_client *client; + client = talloc_zero(tall_ctx, struct osmo_pcap_client); + if (!client) + return NULL; + client->fd.fd = -1; + client->snaplen = DEFAULT_SNAPLEN; + return client; +} void osmo_client_free(struct osmo_pcap_client_conn *conn) { diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c index f571b96..a28c4b7 100644 --- a/src/osmo_client_main.c +++ b/src/osmo_client_main.c @@ -212,12 +212,11 @@ exit(1); } - pcap_client = talloc_zero(tall_cli_ctx, struct osmo_pcap_client); + pcap_client = osmo_pcap_client_alloc(tall_cli_ctx); if (!pcap_client) { LOGP(DCLIENT, LOGL_ERROR, "Failed to allocate osmo_pcap_client.\n"); exit(1); } - pcap_client->fd.fd = -1; vty_client_init(pcap_client); /* initialize the queue */ diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c index e900ef4..7073d6c 100644 --- a/src/osmo_client_network.c +++ b/src/osmo_client_network.c @@ -169,14 +169,14 @@ struct msgb *msg; int offset, ip_len; - if (in_hdr->caplen > 9000) { + if (in_hdr->len > in_hdr->caplen) { LOGP(DCLIENT, LOGL_ERROR, - "Capture len too big %zu\n", (size_t) in_hdr->caplen); + "Recording truncated packet, len %zu > snaplen %zu\n", + (size_t) in_hdr->len, (size_t) in_hdr->caplen); rate_ctr_inc(&conn->client->ctrg->ctr[CLIENT_CTR_2BIG]); - return; } - msg = msgb_alloc(9000 + sizeof(*om_hdr) + sizeof(*hdr), "data-data"); + msg = msgb_alloc(in_hdr->caplen + sizeof(*om_hdr) + sizeof(*hdr), "data-data"); if (!msg) { LOGP(DCLIENT, LOGL_ERROR, "Failed to allocate.\n"); rate_ctr_inc(&conn->client->ctrg->ctr[CLIENT_CTR_NOMEM]); @@ -239,7 +239,7 @@ return; } - msg = msgb_alloc(9000 + sizeof(*om_hdr) + sizeof(*hdr), "link-data"); + msg = msgb_alloc(conn->client->snaplen + sizeof(*om_hdr) + sizeof(*hdr), "link-data"); if (!msg) { LOGP(DCLIENT, LOGL_ERROR, "Failed to allocate data.\n"); return; @@ -256,7 +256,7 @@ hdr->version_minor = 4; hdr->thiszone = 0; hdr->sigfigs = 0; - hdr->snaplen = MAXIMUM_SNAPLEN; + hdr->snaplen = conn->client->snaplen; hdr->linktype = pcap_datalink(conn->client->handle); write_data(conn, msg); diff --git a/src/osmo_client_vty.c b/src/osmo_client_vty.c index e50099f..30158c5 100644 --- a/src/osmo_client_vty.c +++ b/src/osmo_client_vty.c @@ -125,7 +125,9 @@ if (pcap_client->device) vty_out(vty, " pcap device %s%s", pcap_client->device, VTY_NEWLINE); - + if (pcap_client->snaplen != DEFAULT_SNAPLEN) + vty_out(vty, " pcap snaplen %d%s", + pcap_client->snaplen, VTY_NEWLINE); if (pcap_client->filter_string) vty_out(vty, " pcap filter %s%s", pcap_client->filter_string, VTY_NEWLINE); @@ -148,6 +150,19 @@ return CMD_SUCCESS; } +DEFUN(cfg_client_snaplen, + cfg_client_snaplen_cmd, + "pcap snaplen <1-262144>", /* MAXIMUM_SNAPLEN */ + PCAP_STRING "snapshot length\n" "Bytes\n") +{ + if (pcap_client->handle) { + vty_out(vty, "'pcap snaplen' must be set before 'pcap device' to take effect!%s", VTY_NEWLINE); + return CMD_WARNING; + } + pcap_client->snaplen = atoi(argv[0]); + return CMD_SUCCESS; +} + DEFUN(cfg_client_add_gprs, cfg_client_add_gprs_cmd, "pcap add-filter gprs", @@ -512,6 +527,7 @@ install_node(&server_node, config_write_server); install_element(CLIENT_NODE, &cfg_client_device_cmd); + install_element(CLIENT_NODE, &cfg_client_snaplen_cmd); install_element(CLIENT_NODE, &cfg_client_filter_cmd); install_element(CLIENT_NODE, &cfg_client_loop_cmd); -- To view, visit https://gerrit.osmocom.org/11278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I84fda9f27b725e031c218187ab679392dfa7ec3d Gerrit-Change-Number: 11278 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 08:07:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 9 Oct 2018 08:07:54 +0000 Subject: Change in osmo-pcap[master]: client_send_link: snaplen not needed during allocation In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11279 ) Change subject: client_send_link: snaplen not needed during allocation ...................................................................... client_send_link: snaplen not needed during allocation We don't send any pkt data, so no need to allocate snaplen bytes extra. Change-Id: I8d6385f6ff265564492121812a7a9f2bcfea3d5f --- M src/osmo_client_network.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c index 7073d6c..2ace22e 100644 --- a/src/osmo_client_network.c +++ b/src/osmo_client_network.c @@ -239,7 +239,7 @@ return; } - msg = msgb_alloc(conn->client->snaplen + sizeof(*om_hdr) + sizeof(*hdr), "link-data"); + msg = msgb_alloc(sizeof(*om_hdr) + sizeof(*hdr), "link-data"); if (!msg) { LOGP(DCLIENT, LOGL_ERROR, "Failed to allocate data.\n"); return; -- To view, visit https://gerrit.osmocom.org/11279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8d6385f6ff265564492121812a7a9f2bcfea3d5f Gerrit-Change-Number: 11279 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 08:07:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 9 Oct 2018 08:07:55 +0000 Subject: Change in osmo-pcap[master]: server: Improve verification of messages from client In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11280 ) Change subject: server: Improve verification of messages from client ...................................................................... server: Improve verification of messages from client Take the chance to define SERVER_MAX_DATA_SIZE as pcap payload, which we can later match to configurable snaplen parameter. Change-Id: I45d4c59026faf1108c0976eb6ad8c270e3577dbf --- M include/osmo-pcap/osmo_pcap_server.h M src/osmo_server_network.c 2 files changed, 38 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h index c1d318e..cdcdb70 100644 --- a/include/osmo-pcap/osmo_pcap_server.h +++ b/include/osmo-pcap/osmo_pcap_server.h @@ -91,7 +91,7 @@ int state; int pend; int reopen; - char buf[SERVER_MAX_DATA_SIZE + sizeof(struct osmo_pcap_data)]; + char buf[sizeof(struct osmo_pcap_data) + sizeof(struct osmo_pcap_pkthdr) + SERVER_MAX_DATA_SIZE]; struct osmo_pcap_data *data; /* statistics */ diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 695090d..8eb7567 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -192,12 +192,15 @@ { struct pcap_file_header *hdr; - if (data->len != sizeof(*hdr)) { - LOGP(DSERVER, LOGL_ERROR, "The pcap_file_header does not fit.\n"); + hdr = (struct pcap_file_header *) &data->data[0]; + + if (hdr->snaplen > SERVER_MAX_DATA_SIZE) { + LOGP(DSERVER, LOGL_ERROR, + "The recvd pcap_file_header contains too big snaplen %zu > %zu\n", + (size_t) hdr->snaplen, (size_t) SERVER_MAX_DATA_SIZE); return -1; } - hdr = (struct pcap_file_header *) &data->data[0]; if (!conn->no_store && conn->local_fd < 0) { conn->file_hdr = *hdr; restart_pcap(conn); @@ -335,6 +338,36 @@ return do_read_tls(conn, buf, size); } +static bool pcap_data_valid(struct osmo_pcap_conn *conn) +{ + unsigned int min_len, max_len; + switch ((enum OsmoPcapDataType) conn->data->type) { + case PKT_LINK_HDR: + if (conn->data->len != sizeof(struct pcap_file_header)) { + LOGP(DSERVER, LOGL_ERROR, + "Implausible llink_hdr length: %u != %zu\n", + conn->data->len, sizeof(struct osmo_pcap_pkthdr)); + return false; + } + break; + case PKT_LINK_DATA: + min_len = sizeof(struct osmo_pcap_pkthdr); + max_len = SERVER_MAX_DATA_SIZE + sizeof(struct osmo_pcap_pkthdr); + if (conn->data->len < min_len || conn->data->len > max_len) { + LOGP(DSERVER, LOGL_ERROR, + "Implausible data length: %u < %u <= %u\n", + min_len, conn->data->len, max_len); + return false; + } + break; + default: + LOGP(DSERVER, LOGL_ERROR, "Unknown data type %" PRIx8 "\n", + conn->data->type); + return false; + } + return true; +} + static int read_cb_initial(struct osmo_pcap_conn *conn) { int rc; @@ -354,11 +387,8 @@ } else if (conn->pend == 0) { conn->data->len = ntohs(conn->data->len); - if (conn->data->len > SERVER_MAX_DATA_SIZE) { - LOGP(DSERVER, LOGL_ERROR, - "Implausible data length: %u\n", conn->data->len); + if (!pcap_data_valid(conn)) return -1; - } conn->state = STATE_DATA; conn->pend = conn->data->len; -- To view, visit https://gerrit.osmocom.org/11280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I45d4c59026faf1108c0976eb6ad8c270e3577dbf Gerrit-Change-Number: 11280 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 08:07:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 9 Oct 2018 08:07:55 +0000 Subject: Change in osmo-pcap[master]: server: Add pcap snaplen VTY cmd In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11281 ) Change subject: server: Add pcap snaplen VTY cmd ...................................................................... server: Add pcap snaplen VTY cmd Change-Id: I8fdcdc1a58926ec66a1dc5dc7a5e57ed4dceb4b4 --- M include/osmo-pcap/osmo_pcap_server.h M src/osmo_server_main.c M src/osmo_server_network.c M src/osmo_server_vty.c 4 files changed, 23 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h index cdcdb70..a983ec5 100644 --- a/include/osmo-pcap/osmo_pcap_server.h +++ b/include/osmo-pcap/osmo_pcap_server.h @@ -48,8 +48,6 @@ #define STATE_INITIAL 0 #define STATE_DATA 1 -#define SERVER_MAX_DATA_SIZE 10000 - enum { PEER_CTR_CONNECT, PEER_CTR_BYTES, @@ -91,7 +89,6 @@ int state; int pend; int reopen; - char buf[sizeof(struct osmo_pcap_data) + sizeof(struct osmo_pcap_pkthdr) + SERVER_MAX_DATA_SIZE]; struct osmo_pcap_data *data; /* statistics */ @@ -133,6 +130,7 @@ char *base_path; off_t max_size; + int max_snaplen; /* statistics */ struct rate_ctr_group *ctrg; diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c index d95c994..3e399af 100644 --- a/src/osmo_server_main.c +++ b/src/osmo_server_main.c @@ -239,6 +239,7 @@ INIT_LLIST_HEAD(&pcap_server->conn); pcap_server->base_path = talloc_strdup(pcap_server, "./"); pcap_server->max_size = 1073741824; + pcap_server->max_snaplen = DEFAULT_SNAPLEN; vty_server_init(pcap_server); if (vty_read_config_file(config_file, NULL) < 0) { diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 8eb7567..55934be 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -194,10 +194,10 @@ hdr = (struct pcap_file_header *) &data->data[0]; - if (hdr->snaplen > SERVER_MAX_DATA_SIZE) { + if (hdr->snaplen > conn->server->max_snaplen) { LOGP(DSERVER, LOGL_ERROR, "The recvd pcap_file_header contains too big snaplen %zu > %zu\n", - (size_t) hdr->snaplen, (size_t) SERVER_MAX_DATA_SIZE); + (size_t) hdr->snaplen, (size_t) conn->server->max_snaplen); return -1; } @@ -266,6 +266,7 @@ { struct rate_ctr_group_desc *desc; struct osmo_pcap_conn *conn; + size_t buf_size; llist_for_each_entry(conn, &server->conn, entry) { if (strcmp(conn->name, name) == 0) @@ -279,6 +280,10 @@ return NULL; } + buf_size = sizeof(struct osmo_pcap_data); + buf_size += OSMO_MAX(sizeof(struct pcap_file_header), + sizeof(struct osmo_pcap_pkthdr) + server->max_snaplen); + conn->data = talloc_zero_size(conn, buf_size); /* a bit nasty. we do not work with ids but names */ desc = talloc_zero(conn, struct rate_ctr_group_desc); if (!desc) { @@ -318,7 +323,6 @@ conn->rem_wq.bfd.fd = -1; conn->local_fd = -1; conn->server = server; - conn->data = (struct osmo_pcap_data *) &conn->buf[0]; llist_add_tail(&conn->entry, &server->conn); return conn; } @@ -352,7 +356,7 @@ break; case PKT_LINK_DATA: min_len = sizeof(struct osmo_pcap_pkthdr); - max_len = SERVER_MAX_DATA_SIZE + sizeof(struct osmo_pcap_pkthdr); + max_len = conn->server->max_snaplen + sizeof(struct osmo_pcap_pkthdr); if (conn->data->len < min_len || conn->data->len > max_len) { LOGP(DSERVER, LOGL_ERROR, "Implausible data length: %u < %u <= %u\n", @@ -372,7 +376,7 @@ { int rc; - rc = do_read(conn, &conn->buf[sizeof(*conn->data) - conn->pend], conn->pend); + rc = do_read(conn, ((uint8_t*)conn->data) + sizeof(*conn->data) - conn->pend, conn->pend); if (rc <= 0) { LOGP(DSERVER, LOGL_ERROR, "Too short packet. Got %d, wanted %d\n", rc, conn->data->len); diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index d10ff51..e9b54b1 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -94,6 +94,8 @@ vty_out(vty, " server port %d%s", pcap_server->port, VTY_NEWLINE); vty_out(vty, " max-file-size %llu%s", (unsigned long long) pcap_server->max_size, VTY_NEWLINE); + if (pcap_server->max_snaplen != DEFAULT_SNAPLEN) + vty_out(vty, " server max-snaplen %d%s", pcap_server->max_snaplen, VTY_NEWLINE); if (pcap_server->zmq_port > 0) vty_out(vty, " zeromq-publisher %s %d%s", pcap_server->zmq_ip, pcap_server->zmq_port, VTY_NEWLINE); @@ -158,6 +160,15 @@ return CMD_SUCCESS; } +DEFUN(cfg_server_max_snaplen, + cfg_server_max_snaplen_cmd, + "max-snaplen <1-262144>", /* MAXIMUM_SNAPLEN */ + "Maximum pcap snapshot length\n" "Bytes\n") +{ + pcap_server->max_snaplen = atoi(argv[0]); + return CMD_SUCCESS; +} + static int manage_client(struct osmo_pcap_server *pcap_server, struct vty *vty, const char *name, const char *remote_host, @@ -511,6 +522,7 @@ install_element(SERVER_NODE, &cfg_server_ip_cmd); install_element(SERVER_NODE, &cfg_server_port_cmd); install_element(SERVER_NODE, &cfg_server_max_size_cmd); + install_element(SERVER_NODE, &cfg_server_max_snaplen_cmd); install_element(SERVER_NODE, &cfg_server_zmq_ip_port_cmd); install_element(SERVER_NODE, &cfg_no_server_zmq_ip_port_cmd); -- To view, visit https://gerrit.osmocom.org/11281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8fdcdc1a58926ec66a1dc5dc7a5e57ed4dceb4b4 Gerrit-Change-Number: 11281 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 09:35:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 9 Oct 2018 09:35:42 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Simplify handling of ipaccess e1line ts In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11203 ) Change subject: ipaccess: Simplify handling of ipaccess e1line ts ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf251673bff95b7a0b066b19ef4dc6c0f94fff6b Gerrit-Change-Number: 11203 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 09 Oct 2018 09:35:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 10:22:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 9 Oct 2018 10:22:04 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf.prod: Update TRX host ip addr Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11284 Change subject: resources.conf.prod: Update TRX host ip addr ...................................................................... resources.conf.prod: Update TRX host ip addr The host was updated to have several IP address to be able to run several instances of osmo-trx in parallel. Change-Id: I3595b82a5d202caec7bc48a63e28ce0331e5abb7 --- M example/resources.conf.prod 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/84/11284/1 diff --git a/example/resources.conf.prod b/example/resources.conf.prod index 88358ac..e69726a 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -28,7 +28,7 @@ osmo_trx: launch_trx: true remote_user: jenkins - trx_ip: 10.42.42.230 + trx_ip: 10.42.42.116 clock_reference: external multi_arfcn: true -- To view, visit https://gerrit.osmocom.org/11284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3595b82a5d202caec7bc48a63e28ce0331e5abb7 Gerrit-Change-Number: 11284 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 10:28:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 9 Oct 2018 10:28:57 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Simplify handling of ipaccess e1line ts In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11203 ) Change subject: ipaccess: Simplify handling of ipaccess e1line ts ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf251673bff95b7a0b066b19ef4dc6c0f94fff6b Gerrit-Change-Number: 11203 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 09 Oct 2018 10:28:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 10:29:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 9 Oct 2018 10:29:09 +0000 Subject: Change in libosmo-abis[master]: e1_input.h: Set correct type for input_signal_data->link_type In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11207 ) Change subject: e1_input.h: Set correct type for input_signal_data->link_type ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaa33b793f89f2d16c9d949503c5ecc195bbcd2a4 Gerrit-Change-Number: 11207 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 09 Oct 2018 10:29:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 10:29:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 9 Oct 2018 10:29:10 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Simplify handling of ipaccess e1line ts In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11203 ) Change subject: ipaccess: Simplify handling of ipaccess e1line ts ...................................................................... ipaccess: Simplify handling of ipaccess e1line ts Handle encoding specifics behind a macro to make code easier to understand and follow. Change-Id: Ibf251673bff95b7a0b066b19ef4dc6c0f94fff6b --- M include/osmocom/abis/e1_input.h M src/input/ipaccess.c M tests/e1inp_ipa_bsc_test.c M tests/e1inp_ipa_bts_test.c 4 files changed, 36 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index 79455e1..f9b4850 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -201,6 +201,8 @@ struct e1inp_driver *driver; void *driver_data; }; +#define e1inp_line_ipa_oml_ts(line) (&line->ts[0]) +#define e1inp_line_ipa_rsl_ts(line, trx_id) (&line->ts[1 + (trx_id)]) /* SS_L_INPUT signals */ enum e1inp_signal_input { diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index f8e8e09..8c02996 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -62,8 +62,11 @@ static int ipaccess_drop(struct osmo_fd *bfd, struct e1inp_line *line) { int ret = 1; - unsigned int ts_nr = bfd->priv_nr; - struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1]; + struct e1inp_ts *e1i_ts; + if (bfd->priv_nr == E1INP_SIGN_OML) + e1i_ts = e1inp_line_ipa_oml_ts(line); + else + e1i_ts = e1inp_line_ipa_rsl_ts(line, bfd->priv_nr - E1INP_SIGN_RSL); /* Error case: we did not see any ID_RESP yet for this socket. */ if (bfd->fd != -1) { @@ -185,7 +188,7 @@ * this RSL link, attach it to this socket. */ bfd->data = new_line = sign_link->ts->line; e1inp_line_get(new_line); - ts = &new_line->ts[E1INP_SIGN_RSL+unit_data.trx_id-1]; + ts = e1inp_line_ipa_rsl_ts(new_line, unit_data.trx_id); newbfd = &ts->driver.ipaccess.fd; /* get rid of our old temporary bfd */ @@ -223,12 +226,17 @@ { struct e1inp_line *line = bfd->data; unsigned int ts_nr = bfd->priv_nr; - struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1]; + struct e1inp_ts *e1i_ts; struct e1inp_sign_link *link; struct ipaccess_head *hh; struct msgb *msg = NULL; int ret, rc; + if (bfd->priv_nr == E1INP_SIGN_OML) + e1i_ts = e1inp_line_ipa_oml_ts(line); + else + e1i_ts = e1inp_line_ipa_rsl_ts(line, bfd->priv_nr - E1INP_SIGN_RSL); + ret = ipa_msg_recv_buffered(bfd->fd, &msg, &e1i_ts->pending_msg); if (ret < 0) { if (ret == -EAGAIN) @@ -312,11 +320,16 @@ static int __handle_ts1_write(struct osmo_fd *bfd, struct e1inp_line *line) { unsigned int ts_nr = bfd->priv_nr; - struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1]; + struct e1inp_ts *e1i_ts; struct e1inp_sign_link *sign_link; struct msgb *msg; int ret; + if (bfd->priv_nr == E1INP_SIGN_OML) + e1i_ts = e1inp_line_ipa_oml_ts(line); + else + e1i_ts = e1inp_line_ipa_rsl_ts(line, bfd->priv_nr - E1INP_SIGN_RSL); + bfd->when &= ~BSC_FD_WRITE; /* get the next msg for this timeslot */ @@ -454,7 +467,6 @@ static int ipaccess_bsc_oml_cb(struct ipa_server_link *link, int fd) { int ret; - int idx = 0; int i; struct e1inp_line *line; struct e1inp_ts *e1i_ts; @@ -468,13 +480,13 @@ } /* create virrtual E1 timeslots for signalling */ - e1inp_ts_config_sign(&line->ts[E1INP_SIGN_OML-1], line); + e1inp_ts_config_sign(e1inp_line_ipa_oml_ts(line), line); /* initialize the fds */ for (i = 0; i < ARRAY_SIZE(line->ts); ++i) line->ts[i].driver.ipaccess.fd.fd = -1; - e1i_ts = &line->ts[idx]; + e1i_ts = e1inp_line_ipa_oml_ts(line); bfd = &e1i_ts->driver.ipaccess.fd; osmo_fd_setup(bfd, fd, BSC_FD_READ, ipaccess_fd_cb, line, E1INP_SIGN_OML); @@ -524,9 +536,9 @@ /* we need this to initialize this in case to avoid crashes in case * that the socket is closed before we've seen an ID_RESP. */ - e1inp_ts_config_sign(&line->ts[E1INP_SIGN_OML-1], line); + e1inp_ts_config_sign(e1inp_line_ipa_oml_ts(line), line); - e1i_ts = &line->ts[E1INP_SIGN_RSL-1]; + e1i_ts = e1inp_line_ipa_rsl_ts(line, 0); bfd = &e1i_ts->driver.ipaccess.fd; osmo_fd_setup(bfd, fd, BSC_FD_READ, ipaccess_fd_cb, line, E1INP_SIGN_RSL); @@ -763,9 +775,9 @@ msgb_free(msg); return ret; } else if (link->port == IPA_TCP_PORT_OML) - e1i_ts = &link->line->ts[0]; + e1i_ts = e1inp_line_ipa_oml_ts(link->line); else if (link->port == IPA_TCP_PORT_RSL) - e1i_ts = &link->line->ts[link->ofd->priv_nr-1]; + e1i_ts = e1inp_line_ipa_rsl_ts(link->line, link->ofd->priv_nr - E1INP_SIGN_RSL); OSMO_ASSERT(e1i_ts != NULL); @@ -870,7 +882,7 @@ IPA_TCP_PORT_OML); link = ipa_client_conn_create(tall_ipa_ctx, - &line->ts[E1INP_SIGN_OML-1], + e1inp_line_ipa_oml_ts(line), E1INP_SIGN_OML, line->ops->cfg.ipa.addr, IPA_TCP_PORT_OML, @@ -920,7 +932,7 @@ } rsl_link = ipa_client_conn_create(tall_ipa_ctx, - &line->ts[E1INP_SIGN_RSL+trx_nr-1], + e1inp_line_ipa_rsl_ts(line, trx_nr), E1INP_SIGN_RSL+trx_nr, rem_addr, rem_port, ipaccess_bts_updown_cb, diff --git a/tests/e1inp_ipa_bsc_test.c b/tests/e1inp_ipa_bsc_test.c index 9064d0a..a7317f8 100644 --- a/tests/e1inp_ipa_bsc_test.c +++ b/tests/e1inp_ipa_bsc_test.c @@ -30,9 +30,9 @@ switch(type) { case E1INP_SIGN_OML: LOGP(DBSCTEST, LOGL_NOTICE, "OML link up request received.\n"); - e1inp_ts_config_sign(&line->ts[E1INP_SIGN_OML - 1], line); + e1inp_ts_config_sign(e1inp_line_ipa_oml_ts(line), line); sign_link = oml_sign_link = - e1inp_sign_link_create(&line->ts[E1INP_SIGN_OML - 1], + e1inp_sign_link_create(e1inp_line_ipa_oml_ts(line), E1INP_SIGN_OML, NULL, 255, 0); break; case E1INP_SIGN_RSL: @@ -45,10 +45,10 @@ /* We have to use the same line that the OML link. */ oml_line = oml_sign_link->ts->line; - e1inp_ts_config_sign(&oml_line->ts[E1INP_SIGN_RSL - 1], + e1inp_ts_config_sign(e1inp_line_ipa_rsl_ts(oml_line, 0), oml_line); sign_link = rsl_sign_link = - e1inp_sign_link_create(&oml_line->ts[E1INP_SIGN_RSL - 1], + e1inp_sign_link_create(e1inp_line_ipa_rsl_ts(oml_line, 0), E1INP_SIGN_RSL, NULL, 0, 0); break; default: diff --git a/tests/e1inp_ipa_bts_test.c b/tests/e1inp_ipa_bts_test.c index 48a5c59..10fe0e8 100644 --- a/tests/e1inp_ipa_bts_test.c +++ b/tests/e1inp_ipa_bts_test.c @@ -51,9 +51,9 @@ case E1INP_SIGN_OML: LOGP(DBTSTEST, LOGL_NOTICE, "OML link up request received.\n"); - e1inp_ts_config_sign(&line->ts[E1INP_SIGN_OML - 1], line); + e1inp_ts_config_sign(e1inp_line_ipa_oml_ts(line), line); sign_link = oml_sign_link = - e1inp_sign_link_create(&line->ts[E1INP_SIGN_OML - 1], + e1inp_sign_link_create(e1inp_line_ipa_oml_ts(line), E1INP_SIGN_OML, NULL, 255, 0); if (!oml_sign_link) { LOGP(DBTSTEST, LOGL_ERROR, @@ -76,10 +76,10 @@ case E1INP_SIGN_RSL: LOGP(DBTSTEST, LOGL_NOTICE, "RSL link up request received.\n"); - e1inp_ts_config_sign(&line->ts[E1INP_SIGN_RSL - 1], line); + e1inp_ts_config_sign(e1inp_line_ipa_rsl_ts(line, 0), line); sign_link = rsl_sign_link = - e1inp_sign_link_create(&line->ts[E1INP_SIGN_RSL - 1], + e1inp_sign_link_create(e1inp_line_ipa_rsl_ts(line, 0), E1INP_SIGN_RSL, NULL, 0, 0); if (!rsl_sign_link) { LOGP(DBTSTEST, LOGL_ERROR, -- To view, visit https://gerrit.osmocom.org/11203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibf251673bff95b7a0b066b19ef4dc6c0f94fff6b Gerrit-Change-Number: 11203 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 10:29:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 9 Oct 2018 10:29:11 +0000 Subject: Change in libosmo-abis[master]: e1_input.h: Set correct type for input_signal_data->link_type In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11207 ) Change subject: e1_input.h: Set correct type for input_signal_data->link_type ...................................................................... e1_input.h: Set correct type for input_signal_data->link_type link_type field holds values from link->type as set in e1inp_int_snd_event(). Change-Id: Iaa33b793f89f2d16c9d949503c5ecc195bbcd2a4 --- M include/osmocom/abis/e1_input.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index f9b4850..e6d5154 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -314,7 +314,7 @@ /* XXX */ struct input_signal_data { - int link_type; + enum e1inp_sign_type link_type; uint8_t tei; uint8_t sapi; uint8_t ts_nr; -- To view, visit https://gerrit.osmocom.org/11207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaa33b793f89f2d16c9d949503c5ecc195bbcd2a4 Gerrit-Change-Number: 11207 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 10:29:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 9 Oct 2018 10:29:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: document why ipa chopped ping fails with control interface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11283 ) Change subject: document why ipa chopped ping fails with control interface ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iae0f16394c78196de621c14b34d1b1905c0cb7c8 Gerrit-Change-Number: 11283 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 09 Oct 2018 10:29:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 10:30:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 9 Oct 2018 10:30:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: document why ipa chopped ping fails with control interface In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11283 ) Change subject: document why ipa chopped ping fails with control interface ...................................................................... document why ipa chopped ping fails with control interface We cannot test the control interface with an IPA ping message. The control interface only supports osmocom-specific extensions, and the IPA ping message is not part of those extensions. Other tests will have to be devised for the control interface. Change-Id: Iae0f16394c78196de621c14b34d1b1905c0cb7c8 Related: OS#2010 --- M bsc/BSC_Tests.ttcn 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 28ade1e..9a85a1f 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2731,8 +2731,9 @@ } testcase TC_chopped_ipa_ping() runs on test_CT { - const Integers bsc_ipa_ports := {mp_bsc_rsl_port, mp_bsc_oml_port - /* TOOD: This port is failing: mp_bsc_ctrl_port */ }; + /* The IPA control interface (mp_bsc_ctrl_port) won't work with this test because the control + * interface only implements IPAC_PROTO_OSMO, while the IPA PING request uses IPAC_PROTO_IPACCESS. */ + const Integers bsc_ipa_ports := {mp_bsc_rsl_port, mp_bsc_oml_port}; for (var integer i := 0; i < lengthof(bsc_ipa_ports); i := i + 1) { IPA_Testing.f_run_TC_chopped_ipa_ping(mp_bsc_ip, bsc_ipa_ports[i], CONNECT_TO_SERVER); } -- To view, visit https://gerrit.osmocom.org/11283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iae0f16394c78196de621c14b34d1b1905c0cb7c8 Gerrit-Change-Number: 11283 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 10:42:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 9 Oct 2018 10:42:09 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf.prod: Update TRX host ip addr In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11284 ) Change subject: resources.conf.prod: Update TRX host ip addr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3595b82a5d202caec7bc48a63e28ce0331e5abb7 Gerrit-Change-Number: 11284 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 09 Oct 2018 10:42:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 10:42:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 9 Oct 2018 10:42:12 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf.prod: Update TRX host ip addr In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11284 ) Change subject: resources.conf.prod: Update TRX host ip addr ...................................................................... resources.conf.prod: Update TRX host ip addr The host was updated to have several IP address to be able to run several instances of osmo-trx in parallel. Change-Id: I3595b82a5d202caec7bc48a63e28ce0331e5abb7 --- M example/resources.conf.prod 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/example/resources.conf.prod b/example/resources.conf.prod index 88358ac..e69726a 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -28,7 +28,7 @@ osmo_trx: launch_trx: true remote_user: jenkins - trx_ip: 10.42.42.230 + trx_ip: 10.42.42.116 clock_reference: external multi_arfcn: true -- To view, visit https://gerrit.osmocom.org/11284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3595b82a5d202caec7bc48a63e28ce0331e5abb7 Gerrit-Change-Number: 11284 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 11:46:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 9 Oct 2018 11:46:15 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bts-trx: Add support for osmo-trx-lms Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11285 Change subject: osmo-bts-trx: Add support for osmo-trx-lms ...................................................................... osmo-bts-trx: Add support for osmo-trx-lms Change-Id: I44db0fe4592109ecb665e1880806d90379da64f7 --- M contrib/jenkins-build-osmo-trx.sh M example/resources.conf.prod A example/scenarios/trx-lms.conf M src/osmo_gsm_tester/bts_osmotrx.py 4 files changed, 57 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/85/11285/1 diff --git a/contrib/jenkins-build-osmo-trx.sh b/contrib/jenkins-build-osmo-trx.sh index 67fca35..f15a9e0 100755 --- a/contrib/jenkins-build-osmo-trx.sh +++ b/contrib/jenkins-build-osmo-trx.sh @@ -4,8 +4,34 @@ name="osmo-trx" . "$(dirname "$0")/jenkins-build-common.sh" +build_repo_limesuite() { +set +x; echo " + +====================== $dep + +"; set -x + +prev_git_url="${git_url}" +git_url="https://github.com/myriadrf/" +have_repo "LimeSuite" "master" +git_url="${prev_git_url}" +cd "LimeSuite" + +set +x; echo; echo; set -x +mkdir -p builddir && cd builddir +set +x; echo; echo; set -x +cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix ../ +set +x; echo; echo; set -x +make -j5 +set +x; echo; echo; set -x +make install +} + +# We want to use LimSuite installed by debian repos +# build_repo_limesuite + # AddressSanitizer is not enabled on purpose since overhead affects the clocking. build_repo libosmocore --disable-doxygen -build_repo osmo-trx --without-sse --with-uhd +build_repo osmo-trx --without-sse --with-uhd --with-lms -create_bin_tgz osmo-trx-uhd +create_bin_tgz "osmo-trx-uhd osmo-trx-lms" diff --git a/example/resources.conf.prod b/example/resources.conf.prod index e69726a..22134e7 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -26,12 +26,26 @@ band: GSM-1800 ciphers: [a5_0, a5_1] osmo_trx: + type: uhd launch_trx: true remote_user: jenkins trx_ip: 10.42.42.116 clock_reference: external multi_arfcn: true +- label: LimeSDR-USB + type: osmo-bts-trx + ipa_unit_id: 11 + addr: 10.42.42.53 + band: GSM-1800 + ciphers: [a5_0, a5_1] + osmo_trx: + type: lms + launch_trx: true + remote_user: jenkins + trx_ip: 10.42.42.117 + clock_reference: external + - label: sysmoCell 5000 type: osmo-bts-trx ipa_unit_id: 7 diff --git a/example/scenarios/trx-lms.conf b/example/scenarios/trx-lms.conf new file mode 100644 index 0000000..15802db --- /dev/null +++ b/example/scenarios/trx-lms.conf @@ -0,0 +1,4 @@ +resources: + bts: + - label: LimeSDR-USB + type: osmo-bts-trx diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 79c541d..92b726c 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -165,6 +165,7 @@ def get_instance_by_type(cls, type, suite_run, conf): KNOWN_OSMOTRX_TYPES = { 'uhd': OsmoTrxUHD, + 'lms': OsmoTrxLMS, } osmo_trx_class = KNOWN_OSMOTRX_TYPES.get(type) return osmo_trx_class(suite_run, conf) @@ -281,4 +282,14 @@ def binary_name(self): return OsmoTrxUHD.BIN_TRX +class OsmoTrxLMS(OsmoTrx): + BIN_TRX = 'osmo-trx-lms' + + def __init__(self, suite_run, conf): + super().__init__(suite_run, conf) + self.conf['osmo_trx']['channels'][0]['rx_path'] = 'LNAW' + + def binary_name(self): + return OsmoTrxLMS.BIN_TRX + # vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit https://gerrit.osmocom.org/11285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I44db0fe4592109ecb665e1880806d90379da64f7 Gerrit-Change-Number: 11285 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 12:04:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 9 Oct 2018 12:04:03 +0000 Subject: Change in osmo-ci[master]: ansible: Install liblimesuite-dev and setup limesdr rights in gsm-tester Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11286 Change subject: ansible: Install liblimesuite-dev and setup limesdr rights in gsm-tester ...................................................................... ansible: Install liblimesuite-dev and setup limesdr rights in gsm-tester Change-Id: I7fafae340221cac63e33bccabcce6fd8f4385514 --- A ansible/roles/gsm-tester/files/64-limesuite.rules M ansible/roles/gsm-tester/tasks/main.yml M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 3 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/86/11286/1 diff --git a/ansible/roles/gsm-tester/files/64-limesuite.rules b/ansible/roles/gsm-tester/files/64-limesuite.rules new file mode 100644 index 0000000..2b46d86 --- /dev/null +++ b/ansible/roles/gsm-tester/files/64-limesuite.rules @@ -0,0 +1,5 @@ +SUBSYSTEM=="usb", ATTR{idVendor}=="04b4", ATTR{idProduct}=="8613", SYMLINK+="stream-%k", TAG+="uaccess", GROUP="osmo-gsm-tester", MODE="660" +SUBSYSTEM=="usb", ATTR{idVendor}=="04b4", ATTR{idProduct}=="00f1", SYMLINK+="stream-%k", TAG+="uaccess", GROUP="osmo-gsm-tester", MODE="660" +SUBSYSTEM=="usb", ATTR{idVendor}=="0403", ATTR{idProduct}=="601f", SYMLINK+="stream-%k", TAG+="uaccess", GROUP="osmo-gsm-tester", MODE="660" +SUBSYSTEM=="usb", ATTR{idVendor}=="1d50", ATTR{idProduct}=="6108", SYMLINK+="stream-%k", TAG+="uaccess", GROUP="osmo-gsm-tester", MODE="660" +SUBSYSTEM=="xillybus", MODE="666", OPTIONS="last_rule" diff --git a/ansible/roles/gsm-tester/tasks/main.yml b/ansible/roles/gsm-tester/tasks/main.yml index 954953d..61db8e9 100644 --- a/ansible/roles/gsm-tester/tasks/main.yml +++ b/ansible/roles/gsm-tester/tasks/main.yml @@ -251,3 +251,9 @@ src: 60-sispmctl.rules dest: /etc/udev/rules.d/ notify: restart udev + +- name: allow group osmo-gsm-tester to access LMS devices + copy: + src: 64-limesuite.rules + dest: /etc/udev/rules.d/ + notify: restart udev diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index 71bf9f1..f6c256d 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -66,6 +66,7 @@ - libgnutls28-dev - libgps-dev - libgsm1-dev + - liblimesuite-dev - libmnl-dev - libncurses5-dev - libortp-dev -- To view, visit https://gerrit.osmocom.org/11286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7fafae340221cac63e33bccabcce6fd8f4385514 Gerrit-Change-Number: 11286 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 12:12:03 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 9 Oct 2018 12:12:03 +0000 Subject: Change in libosmocore[master]: add support for ipaccess messages on the ctrl interface Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11287 Change subject: add support for ipaccess messages on the ctrl interface ...................................................................... add support for ipaccess messages on the ctrl interface In ctrl_handle_msg(), check for IPACCESS protocol messages and respond to such messages in the same way as ipa_ccm_rcvmsg_base() does. This will allow the TTCN3 IPA "chopped ping" test to pass on control interfaces. Change-Id: I9d7137c830981ccad03806b30b776e2b1f1b4699 Related: OS#2010 --- M src/ctrl/control_if.c 1 file changed, 32 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/87/11287/1 diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index 5962f7e..ed18a2f 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -389,20 +389,44 @@ struct ipaccess_head_ext *iph_ext; int result; + if (msg->len < sizeof(*iph)) { + LOGP(DLCTRL, LOGL_ERROR, "The message is too short.\n"); + return -EINVAL; + } + iph = (struct ipaccess_head *) msg->data; + if (iph->proto == IPAC_PROTO_IPACCESS) { + uint8_t msg_type = *(msg->l2h); + switch (msg_type) { + case IPAC_MSGT_PING: + if (ipa_ccm_send_pong(ccon->write_queue.bfd.fd) < 0) + LOGP(DLINP, LOGL_ERROR, "Cannot send PONG message. Reason: %s\n", strerror(errno)); + break; + case IPAC_MSGT_PONG: + break; + case IPAC_MSGT_ID_ACK: + if (ipa_ccm_send_id_ack(ccon->write_queue.bfd.fd) < 0) + LOGP(DLINP, LOGL_ERROR, "Cannot send ID_ACK message. Reason: %s\n", strerror(errno)); + break; + default: + LOGP(DLCTRL, LOGL_DEBUG, "Received unhandled IPACCESS protocol message of type 0x%x: %s\n", + msg_type, msgb_hexdump(msg)); + break; + } + return 0; + } + if (iph->proto != IPAC_PROTO_OSMO) { + LOGP(DLCTRL, LOGL_ERROR, "Protocol mismatch. Received protocol 0x%x message: %s\n", + iph->proto, msgb_hexdump(msg)); + return -EINVAL; + } if (msg->len < sizeof(*iph) + sizeof(*iph_ext)) { LOGP(DLCTRL, LOGL_ERROR, "The message is too short.\n"); return -EINVAL; } - - iph = (struct ipaccess_head *) msg->data; - if (iph->proto != IPAC_PROTO_OSMO) { - LOGP(DLCTRL, LOGL_ERROR, "Protocol mismatch. We got 0x%x\n", iph->proto); - return -EINVAL; - } - iph_ext = (struct ipaccess_head_ext *) iph->data; if (iph_ext->proto != IPAC_PROTO_EXT_CTRL) { - LOGP(DLCTRL, LOGL_ERROR, "Extended protocol mismatch. We got 0x%x\n", iph_ext->proto); + LOGP(DLCTRL, LOGL_ERROR, "Extended protocol mismatch. Received protocol 0x%x message: %s\n", + iph_ext->proto, msgb_hexdump(msg)); return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/11287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9d7137c830981ccad03806b30b776e2b1f1b4699 Gerrit-Change-Number: 11287 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 12:15:20 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 9 Oct 2018 12:15:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: run TC_chopped_ipa_ping on BSC ctrl interface Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11288 Change subject: run TC_chopped_ipa_ping on BSC ctrl interface ...................................................................... run TC_chopped_ipa_ping on BSC ctrl interface With a related patch to libosmocore, this test will pass on osmo-bsc's ctrl interface. Change-Id: I20a4f251dbe3e75a5c53a0ff167998bbd1266f62 Depends: I9d7137c830981ccad03806b30b776e2b1f1b4699 Related: OS#2010 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/11288/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 9a85a1f..c78944d 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2731,9 +2731,7 @@ } testcase TC_chopped_ipa_ping() runs on test_CT { - /* The IPA control interface (mp_bsc_ctrl_port) won't work with this test because the control - * interface only implements IPAC_PROTO_OSMO, while the IPA PING request uses IPAC_PROTO_IPACCESS. */ - const Integers bsc_ipa_ports := {mp_bsc_rsl_port, mp_bsc_oml_port}; + const Integers bsc_ipa_ports := {mp_bsc_rsl_port, mp_bsc_oml_port, mp_bsc_ctrl_port}; for (var integer i := 0; i < lengthof(bsc_ipa_ports); i := i + 1) { IPA_Testing.f_run_TC_chopped_ipa_ping(mp_bsc_ip, bsc_ipa_ports[i], CONNECT_TO_SERVER); } -- To view, visit https://gerrit.osmocom.org/11288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I20a4f251dbe3e75a5c53a0ff167998bbd1266f62 Gerrit-Change-Number: 11288 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 13:53:22 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 9 Oct 2018 13:53:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: Use explicit AoIP flag Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11289 Change subject: MSC_ConnectionHandler: Use explicit AoIP flag ...................................................................... MSC_ConnectionHandler: Use explicit AoIP flag Most differences between sccplite and AoIP are visible during the assignment. The current implementation checks for the presence of a CIC in the ASSIGNMENT REQUEST in order to detect if the communication should be modeled by AoIP or sccplite. This method is error prone and does not work very well in situations where only signalling is used, because there in sccplite and AoIP no CIC or AoIP trasp. identifier is present, so there is nothing to check on. To resolve this we need an explicit way to tell the MSC_ConnectionHandler that it has to behave like an AoIP MSC or like an sccplite MSC. - Add an aoip flag to TestHdlrParams - Make sure BSC_Tests.ttcn sets the AoIP depending on mp_bssap_cfg.transport Change-Id: I800249e783deb018d99e81d814843e0574a5c69b Related: OS#3639 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 43 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/11289/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 28ade1e..cff1525 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -119,6 +119,18 @@ }; } +private function f_gen_test_hdlr_pars() return TestHdlrParams { + + var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_AoIP) { + pars.aoip := true; + } else { + pars.aoip := false; + } + + return pars; +} + private function f_shutdown_helper() runs on test_CT { all component.stop; setverdict(pass); @@ -1571,7 +1583,7 @@ } testcase TC_ciph_mode_a5_0() runs on test_CT { var MSC_ConnHdlr vc_conn; - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.encr := valueof(t_EncrParams('01'O, f_rnd_octstring(8))); f_init(1, true); @@ -1581,7 +1593,7 @@ } testcase TC_ciph_mode_a5_1() runs on test_CT { var MSC_ConnHdlr vc_conn; - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.encr := valueof(t_EncrParams('02'O, f_rnd_octstring(8))); f_init(1, true); @@ -1591,7 +1603,7 @@ } testcase TC_ciph_mode_a5_3() runs on test_CT { var MSC_ConnHdlr vc_conn; - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.encr := valueof(t_EncrParams('08'O, f_rnd_octstring(8))); f_init(1, true); @@ -1613,7 +1625,7 @@ } testcase TC_assignment_fr_a5_0() runs on test_CT { var MSC_ConnHdlr vc_conn; - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.encr := valueof(t_EncrParams('01'O, f_rnd_octstring(8))); f_init(1, true); @@ -1623,7 +1635,7 @@ } testcase TC_assignment_fr_a5_1() runs on test_CT { var MSC_ConnHdlr vc_conn; - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.encr := valueof(t_EncrParams('02'O, f_rnd_octstring(8))); f_init(1, true); @@ -1633,7 +1645,7 @@ } testcase TC_assignment_fr_a5_3() runs on test_CT { var MSC_ConnHdlr vc_conn; - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.encr := valueof(t_EncrParams('08'O, f_rnd_octstring(8))); f_init(1, true); @@ -1644,7 +1656,7 @@ /* Expect ASSIGNMENT FAIL if mandatory IE is missing */ private function f_tc_assignment_fr_a5_1_codec_missing(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); var template PDU_BSSAP exp_fail := tr_BSSMAP_AssignmentFail; var PDU_BSSAP ass_cmd := f_gen_ass_req(); const OCT8 kc := '0001020304050607'O; @@ -1665,7 +1677,7 @@ } private function f_tc_assignment_fr_a5_4(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); var template PDU_BSSAP exp_compl := f_gen_exp_compl(); var PDU_BSSAP ass_cmd := f_gen_ass_req(); const OCT8 kc := '0001020304050607'O; @@ -1689,10 +1701,9 @@ private function f_tc_assignment_sign(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, omit); - var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, omit)); - + var PDU_BSSAP ass_cmd := f_gen_ass_req(); ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeSIGNAL); f_establish_fully(ass_cmd, exp_compl); } @@ -1886,7 +1897,7 @@ } testcase TC_assignment_codec_fr() runs on test_CT { - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); var MSC_ConnHdlr vc_conn; f_init(1, true); @@ -1898,7 +1909,7 @@ } testcase TC_assignment_codec_hr() runs on test_CT { - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); var MSC_ConnHdlr vc_conn; f_init(1, true); @@ -1910,7 +1921,7 @@ } testcase TC_assignment_codec_efr() runs on test_CT { - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); var MSC_ConnHdlr vc_conn; f_init(1, true); @@ -1922,7 +1933,7 @@ } testcase TC_assignment_codec_amr_f() runs on test_CT { - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); var MSC_ConnHdlr vc_conn; /* Note: This setups the codec configuration. The parameter payload in @@ -1948,7 +1959,7 @@ } testcase TC_assignment_codec_amr_h() runs on test_CT { - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); var MSC_ConnHdlr vc_conn; /* See note above */ @@ -1975,7 +1986,8 @@ * a) BSSMAP Classmark Request should result in RR CLASSMARK ENQUIRY, * b) L3 RR CLASSMARK CHANGE should result in BSSMAP CLASSMARK UPDATE */ private function f_tc_classmark(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); + f_create_chan_and_exp(); /* we should now have a COMPL_L3 at the MSC */ BSSAP.receive(tr_BSSMAP_ComplL3); @@ -1996,7 +2008,7 @@ } private function f_est_single_l3(template PDU_ML3_MS_NW l3) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); f_create_chan_and_exp(); /* we should now have a COMPL_L3 at the MSC */ BSSAP.receive(tr_BSSMAP_ComplL3); @@ -2064,7 +2076,7 @@ /* short message from MS should be ignored */ private function f_tc_err_82_short_msg(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); f_create_chan_and_exp(); /* we should now have a COMPL_L3 at the MSC */ BSSAP.receive(tr_BSSMAP_ComplL3); @@ -2146,7 +2158,7 @@ /* intra-BSC hand-over between BTS0 and BTS1 */ private function f_tc_ho_int(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); var template PDU_BSSAP exp_compl := f_gen_exp_compl(); var PDU_BSSAP ass_cmd := f_gen_ass_req(); const OCT8 kc := '0001020304050607'O; @@ -2189,7 +2201,7 @@ } private function f_tc_ho_out_of_this_bsc(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); var PDU_BSSAP ass_req := f_gen_ass_req(); ass_req.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); @@ -2327,7 +2339,7 @@ } testcase TC_ho_into_this_bsc() runs on test_CT { var MSC_ConnHdlr vc_conn; - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); f_init(1, true); f_sleep(1.0); diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 079cc74..dfdf10c 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -426,9 +426,13 @@ RSL_IE_Body expect_mr_conf_ie optional, /* typically present for AMR codecs */ TestHdlrEncrParams encr optional, TestHdlrParamsLcls lcls, - TestHdlrParamsHandover handover optional + TestHdlrParamsHandover handover optional, + boolean aoip }; +/* Note: Do not use valueof() to get a value of this template, use + * f_gen_test_hdlr_pars() instead in order to get a configuration that is + * matched to the current test sitation (aoio vs. sccplite) */ template (value) TestHdlrParams t_def_TestHdlrPars := { ra := '23'O, fn := 23, @@ -444,7 +448,8 @@ csc := omit, exp_sts := omit }, - handover := omit + handover := omit, + aoip := true } function f_create_chan_and_exp() runs on MSC_ConnHdlr { @@ -828,15 +833,8 @@ runs on MSC_ConnHdlr { var BSSMAP_FIELD_CodecType codecType; - var boolean sccplite := false; timer T := 10.0; - /* Check if we run on SCCPLITE instead of SCCP by looking if a CIC is - * present or not. */ - if (isvalue(ass_tpl.pdu.bssmap.assignmentRequest.circuitIdentityCode)) { - sccplite := true; - } - if (isvalue(ass_tpl.pdu.bssmap.assignmentRequest.codecList)) { codecType := valueof(ass_tpl.pdu.bssmap.assignmentRequest.codecList.codecElements[0].codecType); } else { @@ -855,7 +853,7 @@ var template PDU_BSSAP exp_l3_compl; exp_l3_compl := tr_BSSMAP_ComplL3() - if (sccplite) { + if (g_pars.aoip == false) { exp_l3_compl.pdu.bssmap.completeLayer3Information.codecList := omit; } else { exp_l3_compl.pdu.bssmap.completeLayer3Information.codecList := ?; @@ -930,7 +928,7 @@ g_media.mgcp_conn[1].mdcx_seen_exp := 0; } else if (st.voice_call) { /* For voice calls we expect the following MGCP activity */ - if (sccplite) { + if (g_pars.aoip == false) { g_media.mgcp_conn[0].crcx_seen_exp := 1; g_media.mgcp_conn[0].mdcx_seen_exp := 1; g_media.mgcp_conn[1].crcx_seen_exp := 0; -- To view, visit https://gerrit.osmocom.org/11289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I800249e783deb018d99e81d814843e0574a5c69b Gerrit-Change-Number: 11289 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 13:57:55 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 9 Oct 2018 13:57:55 +0000 Subject: Change in osmo-bsc[master]: vty 'show bts'/'show trx': display IPs and ports Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11290 Change subject: vty 'show bts'/'show trx': display IPs and ports ...................................................................... vty 'show bts'/'show trx': display IPs and ports This quickly allows knowing which IP a BTS is using in order to SSH into it. Example output: OsmoBSC> show trx ... Baseband Transceiver NM State: Oper 'Enabled', Admin 'Unlocked', Avail 'OK' ip.access stream ID: 0x00 (r=192.168.1.178:55416<->l=192.168.1.37:3003) ... OsmoBSC> show bts ... OML Link state: connected 0 days 0 hours 0 min. 43 sec. (r=192.168.1.178:46006<->l=192.168.1.37:3002) ... Relates: OS#3145 Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f --- M src/osmo-bsc/bsc_vty.c 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/90/11290/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 8e6ff3e..84ae617 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -289,6 +290,19 @@ e1l->tei, e1l->sapi, VTY_NEWLINE); } +/*! Dump the IP addresses and ports of the input signal link's timeslot. + * This only makes sense for links connected with ipaccess. + * Example output: " (r=10.1.42.1:55416<->l=10.1.42.123:3003)" */ +static void e1isl_dump_vty_tcp(struct vty *vty, struct e1inp_sign_link *e1l) +{ + if (!e1l) + return; + + char *name = osmo_sock_get_name(NULL, e1l->ts->driver.ipaccess.fd.fd); + vty_out(vty, " %s%s", name, VTY_NEWLINE); + talloc_free(name); +} + static void vty_out_neigh_list(struct vty *vty, struct bitvec *bv) { int count = 0; @@ -451,6 +465,7 @@ vty_out(vty, " %llu days %llu hours %llu min. %llu sec.", OSMO_SEC2DAY(sec), OSMO_SEC2HRS(sec), OSMO_SEC2MIN(sec), sec % 60); vty_out(vty, "%s", VTY_NEWLINE); + e1isl_dump_vty_tcp(vty, bts->oml_link); } else { vty_out(vty, " E1 Signalling Link:%s", VTY_NEWLINE); e1isl_dump_vty(vty, bts->oml_link); @@ -1048,6 +1063,7 @@ if (is_ipaccess_bts(trx->bts)) { vty_out(vty, " ip.access stream ID: 0x%02x%s", trx->rsl_tei, VTY_NEWLINE); + e1isl_dump_vty_tcp(vty, trx->rsl_link); } else { vty_out(vty, " E1 Signalling Link:%s", VTY_NEWLINE); e1isl_dump_vty(vty, trx->rsl_link); -- To view, visit https://gerrit.osmocom.org/11290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f Gerrit-Change-Number: 11290 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 14:05:03 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 9 Oct 2018 14:05:03 +0000 Subject: Change in osmo-bsc[master]: vty 'show bts'/'show trx': display IPs and ports In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11290 ) Change subject: vty 'show bts'/'show trx': display IPs and ports ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11290/1/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11290/1/src/osmo-bsc/bsc_vty.c at 301 PS1, Line 301: e1l->ts->driver.ipaccess.fd.fd I'm wondering if this is a protocol layer violation, because it's directly accessing structs from e1 here. However, e1isl_dump_vty() (directly above) is doing something similar. So I guess it is fine? -- To view, visit https://gerrit.osmocom.org/11290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f Gerrit-Change-Number: 11290 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 09 Oct 2018 14:05:03 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Oct 9 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 9 Oct 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#271?= In-Reply-To: <1351985366.10.1539011407322.JavaMail.jenkins@jenkins.osmocom.org> References: <1351985366.10.1539011407322.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1635602604.17.1539097807425.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Oct 9 15:19:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 9 Oct 2018 15:19:12 +0000 Subject: Change in osmo-bsc[master]: vty 'show bts'/'show trx': display IPs and ports In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11290 ) Change subject: vty 'show bts'/'show trx': display IPs and ports ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/11290/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11290/1//COMMIT_MSG at 16 PS1, Line 16: (r=192.168.1.178:55416<->l=192.168.1.37:3003) I would leave it inline (same line, append): ip.access stream ID: 0x00 (r=192.168.1.178:55416<->l=192.168.1.37:3003) https://gerrit.osmocom.org/#/c/11290/1//COMMIT_MSG at 21 PS1, Line 21: OML Link state: connected 0 days 0 hours 0 min. 43 sec. OML Link: (r=192.168.1.178:46006<->l=192.168.1.37:3002) OML Link state: connected 0 days 0 hours 0 min. 43 sec. what do you think? -- To view, visit https://gerrit.osmocom.org/11290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f Gerrit-Change-Number: 11290 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 09 Oct 2018 15:19:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 9 16:56:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 9 Oct 2018 16:56:24 +0000 Subject: Change in osmo-gsm-tester[master]: bsc: Record RSL traffic in case rsl_ip and oml_ip differs Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11291 Change subject: bsc: Record RSL traffic in case rsl_ip and oml_ip differs ...................................................................... bsc: Record RSL traffic in case rsl_ip and oml_ip differs This change allows recording all interesting traffic for TTCN3 tests, having GSMTAP and RSL together, because osmo-bsc is configured to pass the RSL IP of the TTCN3 testsuite emulating a BSC. Change-Id: I6bd1d1bec8e7b698d12aa886acc21d92532d9e6c --- M src/osmo_gsm_tester/osmo_bsc.py 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/91/11291/1 diff --git a/src/osmo_gsm_tester/osmo_bsc.py b/src/osmo_gsm_tester/osmo_bsc.py index 0e5bbbe..ec9c3b8 100644 --- a/src/osmo_gsm_tester/osmo_bsc.py +++ b/src/osmo_gsm_tester/osmo_bsc.py @@ -53,8 +53,11 @@ if not os.path.isdir(lib): raise RuntimeError('No lib/ in %r' % inst) - pcap_recorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), None, - 'host %s and port not 22' % self.addr()) + if self.rsl_ip and self.addr() != self.rsl_ip: + filter = 'host %s or host %s and port not 22' % (self.addr(), self.rsl_ip) + else: + filter = 'host %s and port not 22' % self.addr() + pcap_recorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), None, filter) env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } -- To view, visit https://gerrit.osmocom.org/11291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6bd1d1bec8e7b698d12aa886acc21d92532d9e6c Gerrit-Change-Number: 11291 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 08:48:27 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 10 Oct 2018 08:48:27 +0000 Subject: Change in osmo-bsc[master]: vty 'show bts'/'show trx': display IPs and ports In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11290 to look at the new patch set (#2). Change subject: vty 'show bts'/'show trx': display IPs and ports ...................................................................... vty 'show bts'/'show trx': display IPs and ports This quickly allows knowing which IP a BTS is using in order to SSH into it. Example output: OsmoBSC> show trx ... Baseband Transceiver NM State: Oper 'Enabled', Admin 'Unlocked', Avail 'OK' ip.access stream ID: 0x00 (r=192.168.1.178:34090<->l=192.168.1.37:3003) ... OsmoBSC> show bts ... Paging: 0 pending requests, 50 free slots OML Link: (r=192.168.1.178:57692<->l=192.168.1.37:3002) OML Link state: connected 0 days 0 hours 0 min. 17 sec. ... Relates: OS#3145 Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f --- M src/osmo-bsc/bsc_vty.c 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/90/11290/2 -- To view, visit https://gerrit.osmocom.org/11290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f Gerrit-Change-Number: 11290 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 08:49:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 10 Oct 2018 08:49:39 +0000 Subject: Change in osmo-bsc[master]: vty 'show bts'/'show trx': display IPs and ports In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11290 ) Change subject: vty 'show bts'/'show trx': display IPs and ports ...................................................................... Patch Set 1: Good idea Pau, this looks better. Updated to make it look like that, and tested it. -- To view, visit https://gerrit.osmocom.org/11290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f Gerrit-Change-Number: 11290 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 10 Oct 2018 08:49:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 08:50:34 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 10 Oct 2018 08:50:34 +0000 Subject: Change in osmo-bsc[master]: vty 'show bts'/'show trx': display IPs and ports In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11290 to look at the new patch set (#3). Change subject: vty 'show bts'/'show trx': display IPs and ports ...................................................................... vty 'show bts'/'show trx': display IPs and ports This quickly allows knowing which IP a BTS is using in order to SSH into it. Example output: OsmoBSC> show trx ... Baseband Transceiver NM State: Oper 'Enabled', Admin 'Unlocked', Avail 'OK' ip.access stream ID: 0x00 (r=192.168.1.178:34090<->l=192.168.1.37:3003) ... OsmoBSC> show bts ... Paging: 0 pending requests, 50 free slots OML Link: (r=192.168.1.178:57692<->l=192.168.1.37:3002) OML Link state: connected 0 days 0 hours 0 min. 17 sec. ... Relates: OS#3145 Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f --- M src/osmo-bsc/bsc_vty.c 1 file changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/90/11290/3 -- To view, visit https://gerrit.osmocom.org/11290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f Gerrit-Change-Number: 11290 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 09:18:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 10 Oct 2018 09:18:27 +0000 Subject: Change in osmo-bsc[master]: vty 'show bts'/'show trx': display IPs and ports In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11290 ) Change subject: vty 'show bts'/'show trx': display IPs and ports ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f Gerrit-Change-Number: 11290 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 10 Oct 2018 09:18:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 09:26:46 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 10 Oct 2018 09:26:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: resolve ambiguity of MobileIdentityLV type name Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11292 Change subject: resolve ambiguity of MobileIdentityLV type name ...................................................................... resolve ambiguity of MobileIdentityLV type name There are two distinct types defined for a Mobile Identity LV IE. One type definition lives in GSM_RR_Types and defines the "canonical" IE form, with a full octet for the length. Another one lives in RLCMAC_CSN1_Types which defines how a mobile identity appears in paging requests. In this case, the length field is only 4 bits in size. Rename this latter type from MobileIdentityLV to MobileIdentityLV_Paging and add a comment to highlight this distinction. TS 144 060 Table 11.2.10.2 explicitly states that only the value part of this IE matches the definition of the canonical IE as "defined in 3GPP TS 44.018" (actually, TS 44.018 further redirects the reader to TS 124 008; see section 10.5.1.4 there). As an aside, a third definition of the MobileIdentityLV type exists in MobileL3_CommonIE_Types, which matches the "canonical" form. Change-Id: I990316cd5ef5aaf079b03c344e3185ae6ab8ba6d Related: OS#2404 --- M library/GSM_RR_Types.ttcn M library/RLCMAC_CSN1_Types.ttcn 2 files changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/11292/1 diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index 675271f..26783f9 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -231,6 +231,7 @@ variant "FIELDORDER(lsb)" }; + /* TS 24.008 10.5.1.4 "Mobile Identity" */ type record MobileIdentityLV { uint8_t len, MobileIdentity mi diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index fbd01d4..9a7c867 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -185,7 +185,11 @@ }; /* 11.2.10 Packet Paging Request */ - type record MobileIdentityLV { + type record MobileIdentityLV_Paging { + /* Note that the size of 'len' differs from that of the Mobile Identify IE + * as defined in 3GPP TS 24.008 10.5.1.4 "Mobile Identity"; Paging Requests + * use only 4 bit to encode the length of a mobile identity, whereas the IE + * uses a byte. */ uint4_t len, octetstring mobile_id } with { variant (len) "LENGTHTO(mobile_id)" }; @@ -193,7 +197,7 @@ BIT1 presence ('0'B), BIT1 ptmsi_or_mobile_id, GsmTmsi ptmsi optional, - MobileIdentityLV mobile_identity optional + MobileIdentityLV_Paging mobile_identity optional } with { variant (ptmsi) "PRESENCE(ptmsi_or_mobile_id = '0'B)" variant (mobile_identity) "PRESENCE(ptmsi_or_mobile_id = '1'B)" @@ -202,7 +206,7 @@ BIT1 presence ('1'B), BIT1 tmsi_or_mobile_id, GsmTmsi tmsi optional, - MobileIdentityLV mobile_identity optional, + MobileIdentityLV_Paging mobile_identity optional, ChannelNeeded chan_needed, BIT1 emlpp_prio_present, uint3_t emlpp_prio optional -- To view, visit https://gerrit.osmocom.org/11292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I990316cd5ef5aaf079b03c344e3185ae6ab8ba6d Gerrit-Change-Number: 11292 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 09:39:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 10 Oct 2018 09:39:16 +0000 Subject: Change in osmo-gsm-tester[master]: bsc: Record RSL traffic in case rsl_ip and oml_ip differs In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11291 ) Change subject: bsc: Record RSL traffic in case rsl_ip and oml_ip differs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6bd1d1bec8e7b698d12aa886acc21d92532d9e6c Gerrit-Change-Number: 11291 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 10 Oct 2018 09:39:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 09:39:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 10 Oct 2018 09:39:17 +0000 Subject: Change in osmo-gsm-tester[master]: bsc: Record RSL traffic in case rsl_ip and oml_ip differs In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11291 ) Change subject: bsc: Record RSL traffic in case rsl_ip and oml_ip differs ...................................................................... bsc: Record RSL traffic in case rsl_ip and oml_ip differs This change allows recording all interesting traffic for TTCN3 tests, having GSMTAP and RSL together, because osmo-bsc is configured to pass the RSL IP of the TTCN3 testsuite emulating a BSC. Change-Id: I6bd1d1bec8e7b698d12aa886acc21d92532d9e6c --- M src/osmo_gsm_tester/osmo_bsc.py 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo_gsm_tester/osmo_bsc.py b/src/osmo_gsm_tester/osmo_bsc.py index 0e5bbbe..ec9c3b8 100644 --- a/src/osmo_gsm_tester/osmo_bsc.py +++ b/src/osmo_gsm_tester/osmo_bsc.py @@ -53,8 +53,11 @@ if not os.path.isdir(lib): raise RuntimeError('No lib/ in %r' % inst) - pcap_recorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), None, - 'host %s and port not 22' % self.addr()) + if self.rsl_ip and self.addr() != self.rsl_ip: + filter = 'host %s or host %s and port not 22' % (self.addr(), self.rsl_ip) + else: + filter = 'host %s and port not 22' % self.addr() + pcap_recorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), None, filter) env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } -- To view, visit https://gerrit.osmocom.org/11291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6bd1d1bec8e7b698d12aa886acc21d92532d9e6c Gerrit-Change-Number: 11291 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 09:39:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 10 Oct 2018 09:39:39 +0000 Subject: Change in osmo-trx[master]: examples: Use logging level 'set-all' instead of 'all' In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11242 ) Change subject: examples: Use logging level 'set-all' instead of 'all' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic52ce0defc774acb8e24947ed22cf2a56b8b0bb0 Gerrit-Change-Number: 11242 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 10 Oct 2018 09:39:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 09:39:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 10 Oct 2018 09:39:41 +0000 Subject: Change in osmo-trx[master]: examples: Use logging level 'set-all' instead of 'all' In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11242 ) Change subject: examples: Use logging level 'set-all' instead of 'all' ...................................................................... examples: Use logging level 'set-all' instead of 'all' Change-Id: Ic52ce0defc774acb8e24947ed22cf2a56b8b0bb0 --- M doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg M doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg M doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg M doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg 4 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg b/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg index fae5b35..e2c67d6 100644 --- a/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg +++ b/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg @@ -4,7 +4,7 @@ logging print category 1 logging timestamp 1 logging print file basename - logging level all info + logging level set-all info ! line vty no login diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg index fae5b35..e2c67d6 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg @@ -4,7 +4,7 @@ logging print category 1 logging timestamp 1 logging print file basename - logging level all info + logging level set-all info ! line vty no login diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg index 06eb3e9..1b15b47 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg @@ -4,7 +4,7 @@ logging print category 1 logging timestamp 1 logging print file basename - logging level all info + logging level set-all info ! line vty no login diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg index af29929..7d02506 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg @@ -4,7 +4,7 @@ logging print category 1 logging timestamp 1 logging print file basename - logging level all info + logging level set-all info ! line vty no login -- To view, visit https://gerrit.osmocom.org/11242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic52ce0defc774acb8e24947ed22cf2a56b8b0bb0 Gerrit-Change-Number: 11242 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 09:39:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 10 Oct 2018 09:39:42 +0000 Subject: Change in osmo-trx[master]: jenkins.sh: Enable build of osmo-trx-lms In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10723 ) Change subject: jenkins.sh: Enable build of osmo-trx-lms ...................................................................... jenkins.sh: Enable build of osmo-trx-lms Change-Id: Idfa7ce566ad69b181bcadeee7ff023c77ecd4d6b --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 44a49c3..029f0e1 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -79,7 +79,7 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-werror --with-uhd --with-usrp1 $INSTR +./configure --enable-sanitize --enable-werror --with-uhd --with-usrp1 --with-lms $INSTR $MAKE $PARALLEL_MAKE $MAKE check \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/10723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idfa7ce566ad69b181bcadeee7ff023c77ecd4d6b Gerrit-Change-Number: 10723 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 09:39:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 10 Oct 2018 09:39:57 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bts-trx: Add support for osmo-trx-lms In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11285 ) Change subject: osmo-bts-trx: Add support for osmo-trx-lms ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44db0fe4592109ecb665e1880806d90379da64f7 Gerrit-Change-Number: 11285 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 10 Oct 2018 09:39:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 09:39:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 10 Oct 2018 09:39:58 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bts-trx: Add support for osmo-trx-lms In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11285 ) Change subject: osmo-bts-trx: Add support for osmo-trx-lms ...................................................................... osmo-bts-trx: Add support for osmo-trx-lms Change-Id: I44db0fe4592109ecb665e1880806d90379da64f7 --- M contrib/jenkins-build-osmo-trx.sh M example/resources.conf.prod A example/scenarios/trx-lms.conf M src/osmo_gsm_tester/bts_osmotrx.py 4 files changed, 57 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins-build-osmo-trx.sh b/contrib/jenkins-build-osmo-trx.sh index 67fca35..f15a9e0 100755 --- a/contrib/jenkins-build-osmo-trx.sh +++ b/contrib/jenkins-build-osmo-trx.sh @@ -4,8 +4,34 @@ name="osmo-trx" . "$(dirname "$0")/jenkins-build-common.sh" +build_repo_limesuite() { +set +x; echo " + +====================== $dep + +"; set -x + +prev_git_url="${git_url}" +git_url="https://github.com/myriadrf/" +have_repo "LimeSuite" "master" +git_url="${prev_git_url}" +cd "LimeSuite" + +set +x; echo; echo; set -x +mkdir -p builddir && cd builddir +set +x; echo; echo; set -x +cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix ../ +set +x; echo; echo; set -x +make -j5 +set +x; echo; echo; set -x +make install +} + +# We want to use LimSuite installed by debian repos +# build_repo_limesuite + # AddressSanitizer is not enabled on purpose since overhead affects the clocking. build_repo libosmocore --disable-doxygen -build_repo osmo-trx --without-sse --with-uhd +build_repo osmo-trx --without-sse --with-uhd --with-lms -create_bin_tgz osmo-trx-uhd +create_bin_tgz "osmo-trx-uhd osmo-trx-lms" diff --git a/example/resources.conf.prod b/example/resources.conf.prod index e69726a..22134e7 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -26,12 +26,26 @@ band: GSM-1800 ciphers: [a5_0, a5_1] osmo_trx: + type: uhd launch_trx: true remote_user: jenkins trx_ip: 10.42.42.116 clock_reference: external multi_arfcn: true +- label: LimeSDR-USB + type: osmo-bts-trx + ipa_unit_id: 11 + addr: 10.42.42.53 + band: GSM-1800 + ciphers: [a5_0, a5_1] + osmo_trx: + type: lms + launch_trx: true + remote_user: jenkins + trx_ip: 10.42.42.117 + clock_reference: external + - label: sysmoCell 5000 type: osmo-bts-trx ipa_unit_id: 7 diff --git a/example/scenarios/trx-lms.conf b/example/scenarios/trx-lms.conf new file mode 100644 index 0000000..15802db --- /dev/null +++ b/example/scenarios/trx-lms.conf @@ -0,0 +1,4 @@ +resources: + bts: + - label: LimeSDR-USB + type: osmo-bts-trx diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 79c541d..92b726c 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -165,6 +165,7 @@ def get_instance_by_type(cls, type, suite_run, conf): KNOWN_OSMOTRX_TYPES = { 'uhd': OsmoTrxUHD, + 'lms': OsmoTrxLMS, } osmo_trx_class = KNOWN_OSMOTRX_TYPES.get(type) return osmo_trx_class(suite_run, conf) @@ -281,4 +282,14 @@ def binary_name(self): return OsmoTrxUHD.BIN_TRX +class OsmoTrxLMS(OsmoTrx): + BIN_TRX = 'osmo-trx-lms' + + def __init__(self, suite_run, conf): + super().__init__(suite_run, conf) + self.conf['osmo_trx']['channels'][0]['rx_path'] = 'LNAW' + + def binary_name(self): + return OsmoTrxLMS.BIN_TRX + # vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit https://gerrit.osmocom.org/11285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I44db0fe4592109ecb665e1880806d90379da64f7 Gerrit-Change-Number: 11285 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 09:40:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 10 Oct 2018 09:40:16 +0000 Subject: Change in osmo-ci[master]: ansible: Install liblimesuite-dev and setup limesdr rights in gsm-tester In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11286 ) Change subject: ansible: Install liblimesuite-dev and setup limesdr rights in gsm-tester ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7fafae340221cac63e33bccabcce6fd8f4385514 Gerrit-Change-Number: 11286 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 10 Oct 2018 09:40:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 10:00:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 10:00:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: resolve ambiguity of MobileIdentityLV type name In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11292 ) Change subject: resolve ambiguity of MobileIdentityLV type name ...................................................................... Patch Set 1: Code-Review+2 fine with me. However, as you may know, types can always be prefixed by the Module name, so you can have something like GSM_RR_Types.MobileIdentityLV to distinguish it from other types in other modules. -- To view, visit https://gerrit.osmocom.org/11292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I990316cd5ef5aaf079b03c344e3185ae6ab8ba6d Gerrit-Change-Number: 11292 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 10 Oct 2018 10:00:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 10:01:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 10:01:45 +0000 Subject: Change in osmo-ci[master]: ansible: Install liblimesuite-dev and setup limesdr rights in gsm-tester In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11286 ) Change subject: ansible: Install liblimesuite-dev and setup limesdr rights in gsm-tester ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7fafae340221cac63e33bccabcce6fd8f4385514 Gerrit-Change-Number: 11286 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 10 Oct 2018 10:01:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 10:06:33 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 10 Oct 2018 10:06:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: resolve ambiguity of MobileIdentityLV type name In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11292 ) Change subject: resolve ambiguity of MobileIdentityLV type name ...................................................................... Patch Set 1: > Patch Set 1: Code-Review+2 > > fine with me. However, as you may know, types can always be prefixed by the Module name, so you can have something like GSM_RR_Types.MobileIdentityLV to distinguish it from other types in other modules. That also occurred to me. But I think in this case the difference is too subtle to be easily noticed. I suppose the generated encoders/decoders will always use the correct type, but I worry that readers of the code will easily miss the difference. -- To view, visit https://gerrit.osmocom.org/11292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I990316cd5ef5aaf079b03c344e3185ae6ab8ba6d Gerrit-Change-Number: 11292 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 10 Oct 2018 10:06:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 10:09:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 10 Oct 2018 10:09:54 +0000 Subject: Change in osmo-ci[master]: ansible: Install liblimesuite-dev and setup limesdr rights in gsm-tester In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11286 ) Change subject: ansible: Install liblimesuite-dev and setup limesdr rights in gsm-tester ...................................................................... ansible: Install liblimesuite-dev and setup limesdr rights in gsm-tester Change-Id: I7fafae340221cac63e33bccabcce6fd8f4385514 --- A ansible/roles/gsm-tester/files/64-limesuite.rules M ansible/roles/gsm-tester/tasks/main.yml M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 3 files changed, 12 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/ansible/roles/gsm-tester/files/64-limesuite.rules b/ansible/roles/gsm-tester/files/64-limesuite.rules new file mode 100644 index 0000000..2b46d86 --- /dev/null +++ b/ansible/roles/gsm-tester/files/64-limesuite.rules @@ -0,0 +1,5 @@ +SUBSYSTEM=="usb", ATTR{idVendor}=="04b4", ATTR{idProduct}=="8613", SYMLINK+="stream-%k", TAG+="uaccess", GROUP="osmo-gsm-tester", MODE="660" +SUBSYSTEM=="usb", ATTR{idVendor}=="04b4", ATTR{idProduct}=="00f1", SYMLINK+="stream-%k", TAG+="uaccess", GROUP="osmo-gsm-tester", MODE="660" +SUBSYSTEM=="usb", ATTR{idVendor}=="0403", ATTR{idProduct}=="601f", SYMLINK+="stream-%k", TAG+="uaccess", GROUP="osmo-gsm-tester", MODE="660" +SUBSYSTEM=="usb", ATTR{idVendor}=="1d50", ATTR{idProduct}=="6108", SYMLINK+="stream-%k", TAG+="uaccess", GROUP="osmo-gsm-tester", MODE="660" +SUBSYSTEM=="xillybus", MODE="666", OPTIONS="last_rule" diff --git a/ansible/roles/gsm-tester/tasks/main.yml b/ansible/roles/gsm-tester/tasks/main.yml index 954953d..61db8e9 100644 --- a/ansible/roles/gsm-tester/tasks/main.yml +++ b/ansible/roles/gsm-tester/tasks/main.yml @@ -251,3 +251,9 @@ src: 60-sispmctl.rules dest: /etc/udev/rules.d/ notify: restart udev + +- name: allow group osmo-gsm-tester to access LMS devices + copy: + src: 64-limesuite.rules + dest: /etc/udev/rules.d/ + notify: restart udev diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index 71bf9f1..f6c256d 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -66,6 +66,7 @@ - libgnutls28-dev - libgps-dev - libgsm1-dev + - liblimesuite-dev - libmnl-dev - libncurses5-dev - libortp-dev -- To view, visit https://gerrit.osmocom.org/11286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7fafae340221cac63e33bccabcce6fd8f4385514 Gerrit-Change-Number: 11286 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 10:12:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 10:12:34 +0000 Subject: Change in osmo-bsc[master]: vty 'show bts'/'show trx': display IPs and ports In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11290 ) Change subject: vty 'show bts'/'show trx': display IPs and ports ...................................................................... Patch Set 3: (3 comments) In terms of layering, the e1inp_sign_link_name() function should becom part of libosmo-abis. This way it's generic and can be used by whatever application to get a string representation of whatever signaling link. https://gerrit.osmocom.org/#/c/11290/3/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11290/3/src/osmo-bsc/bsc_vty.c at 293 PS3, Line 293: /*! Dump the IP addresses and ports of the input signal link's timeslot. in therm of API design, I don't think it makes sense to have a separate 'dump' function here, particularly not one that includes the newline at the end. I suggest to have a function like e1inp_sign_link_name(const struct e1inp_sign_link *e1l) which will simply return an empty string or "" if the e1l is NULL. This can then be used from a printf / vty_out() statement. https://gerrit.osmocom.org/#/c/11290/3/src/osmo-bsc/bsc_vty.c at 296 PS3, Line 296: static void e1isl_dump_vty_tcp(struct vty *vty, struct e1inp_sign_link *e1l) this argument is read-only, so it should be 'const struct e1inp_sign_link *' https://gerrit.osmocom.org/#/c/11290/3/src/osmo-bsc/bsc_vty.c at 298 PS3, Line 298: if(e1l) { if is not a function, hence we use a space. -- To view, visit https://gerrit.osmocom.org/11290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f Gerrit-Change-Number: 11290 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 10 Oct 2018 10:12:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 10:12:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 10:12:38 +0000 Subject: Change in osmo-bsc[master]: vty 'show bts'/'show trx': display IPs and ports In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11290 ) Change subject: vty 'show bts'/'show trx': display IPs and ports ...................................................................... Patch Set 3: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/11290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f Gerrit-Change-Number: 11290 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 10 Oct 2018 10:12:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 10:13:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 10:13:52 +0000 Subject: Change in libosmocore[master]: add support for ipaccess messages on the ctrl interface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11287 ) Change subject: add support for ipaccess messages on the ctrl interface ...................................................................... Patch Set 1: Code-Review+2 I think the commit message could state what this feature is useful for in general, beyond the specific test case. But nevermind... -- To view, visit https://gerrit.osmocom.org/11287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9d7137c830981ccad03806b30b776e2b1f1b4699 Gerrit-Change-Number: 11287 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 10 Oct 2018 10:13:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 10:14:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 10:14:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: run TC_chopped_ipa_ping on BSC ctrl interface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11288 ) Change subject: run TC_chopped_ipa_ping on BSC ctrl interface ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I20a4f251dbe3e75a5c53a0ff167998bbd1266f62 Gerrit-Change-Number: 11288 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 10 Oct 2018 10:14:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 10:47:31 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 10 Oct 2018 10:47:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: resolve ambiguity of MobileIdentityLV type name In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11292 ) Change subject: resolve ambiguity of MobileIdentityLV type name ...................................................................... Patch Set 1: Please don't merge this yet; I haven't yet done a full test build without ccache. -- To view, visit https://gerrit.osmocom.org/11292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I990316cd5ef5aaf079b03c344e3185ae6ab8ba6d Gerrit-Change-Number: 11292 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 10 Oct 2018 10:47:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 11:29:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 10 Oct 2018 11:29:36 +0000 Subject: Change in osmo-bts[master]: lchan_meas_check_compute: Log value during incorrect num of SUB measu... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11293 Change subject: lchan_meas_check_compute: Log value during incorrect num of SUB measurementes detected ...................................................................... lchan_meas_check_compute: Log value during incorrect num of SUB measurementes detected Change-Id: I5dacbed5517b2aa2a6bbc66ec125f0bdfd1f5b2b --- M src/common/measurement.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/93/11293/1 diff --git a/src/common/measurement.c b/src/common/measurement.c index 33b1c11..c2001da 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -640,7 +640,8 @@ gsm_lchan_name(lchan), num_ul_meas_subst, num_meas_sub_subst); if (num_meas_sub != num_meas_sub_expect) { - LOGP(DMEAS, LOGL_ERROR, "%s Incorrect number of SUB measurements detected!\n", gsm_lchan_name(lchan)); + LOGP(DMEAS, LOGL_ERROR, "%s Incorrect number of SUB measurements detected! (%u vs exp %u)\n", + gsm_lchan_name(lchan), num_meas_sub, num_meas_sub_expect); /* Normally the logic above should make sure that there is * always the exact amount of SUB measurements taken into * account. If not then the logic that decides tags the received -- To view, visit https://gerrit.osmocom.org/11293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5dacbed5517b2aa2a6bbc66ec125f0bdfd1f5b2b Gerrit-Change-Number: 11293 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 12:04:07 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 10 Oct 2018 12:04:07 +0000 Subject: Change in libosmo-abis[master]: ipaccess: add e1inp_sign_link_name() Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11294 Change subject: ipaccess: add e1inp_sign_link_name() ...................................................................... ipaccess: add e1inp_sign_link_name() This new function returns the IP addresses and ports of an input signal link's timeslot ("(r=10.1.42.1:55416<->l=10.1.42.123:3003)"). We need this to display the IP of connected BTS devices in osmo-bsc's VTY output. Related: OS#3145 Change-Id: I1e78ee4dc5c9bd10592c090b9a3b35baf61a6d69 --- M include/osmocom/abis/e1_input.h M src/e1_input.c 2 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/94/11294/1 diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index 79455e1..aee4a70 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -299,6 +299,9 @@ const char *rem_addr, uint16_t rem_port, uint8_t trx_id); +/* return the IP addresses and ports of the input signal link's timeslot */ +char* e1inp_sign_link_name(const struct e1inp_sign_link *link); + void e1inp_sign_link_destroy(struct e1inp_sign_link *link); int e1inp_line_update(struct e1inp_line *line); diff --git a/src/e1_input.c b/src/e1_input.c index 4717830..4871211 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #define NUM_E1_TS 32 @@ -544,6 +545,16 @@ return link; } +/*! Return the IP addresses and ports of the input signal link's timeslot. + * This only makes sense for links connected with ipaccess. + * Example: "(r=10.1.42.1:55416<->l=10.1.42.123:3003)" */ +char* e1inp_sign_link_name(const struct e1inp_sign_link *link) +{ + if (link) + return osmo_sock_get_name(NULL, link->ts->driver.ipaccess.fd.fd); + return talloc_strdup(NULL, ""); +} + void e1inp_sign_link_destroy(struct e1inp_sign_link *link) { struct msgb *msg; -- To view, visit https://gerrit.osmocom.org/11294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1e78ee4dc5c9bd10592c090b9a3b35baf61a6d69 Gerrit-Change-Number: 11294 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 12:10:30 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 10 Oct 2018 12:10:30 +0000 Subject: Change in osmo-bsc[master]: codec_pref: cosmetic: seperate half/full rate determination Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11295 Change subject: codec_pref: cosmetic: seperate half/full rate determination ...................................................................... codec_pref: cosmetic: seperate half/full rate determination The function match_codec_pref determines whether a permitted speech value belongs to a half-rate or full-rate codec. Lets seperate this into a separate function. Change-Id: Iec1db4621ba5a09bc0e3fc40b66f3a3bc5f54add Related: OS#3503 --- M src/osmo-bsc/codec_pref.c 1 file changed, 36 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/95/11295/1 diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index 0f0ffa5..a741e11 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -26,6 +26,38 @@ #include #include +/* Determine whether a permitted speech value is specifies a half rate or full + * rate codec */ +static int full_rate_from_perm_spch(bool * full_rate, + enum gsm0808_permitted_speech perm_spch) +{ + /* Check if the result is a half or full rate codec */ + switch (perm_spch) { + case GSM0808_PERM_HR1: + case GSM0808_PERM_HR2: + case GSM0808_PERM_HR3: + case GSM0808_PERM_HR4: + case GSM0808_PERM_HR6: + *full_rate = false; + break; + + case GSM0808_PERM_FR1: + case GSM0808_PERM_FR2: + case GSM0808_PERM_FR3: + case GSM0808_PERM_FR4: + case GSM0808_PERM_FR5: + *full_rate = true; + break; + + default: + LOGP(DMSC, LOGL_ERROR, "Invalid permitted-speech value: %u\n", + perm_spch); + return -EINVAL; + } + + return 0; +} + /* Helper function for match_codec_pref(), looks up a matching chan mode for * a given permitted speech value */ static enum gsm48_chan_mode gsm88_to_chan_mode(enum gsm0808_permitted_speech speech) @@ -225,6 +257,7 @@ bool match = false; const struct gsm0808_speech_codec *sc_match = NULL; uint16_t amr_s15_s0_supported; + int rc; /* Note: Normally the MSC should never try to advertise a codec that * we did not advertise as supported before. In order to ensure that @@ -255,28 +288,10 @@ return -1; } - /* Check if the result is a half or full rate codec */ - switch (perm_spch) { - case GSM0808_PERM_HR1: - case GSM0808_PERM_HR2: - case GSM0808_PERM_HR3: - case GSM0808_PERM_HR4: - case GSM0808_PERM_HR6: - *full_rate = false; - break; - - case GSM0808_PERM_FR1: - case GSM0808_PERM_FR2: - case GSM0808_PERM_FR3: - case GSM0808_PERM_FR4: - case GSM0808_PERM_FR5: - *full_rate = true; - break; - - default: - LOGP(DMSC, LOGL_ERROR, "Invalid permitted-speech value: %u\n", perm_spch); + /* Determine if the result is a half or full rate codec */ + rc = full_rate_from_perm_spch(full_rate, perm_spch); + if (rc < 0) return -EINVAL; - } /* Lookup a channel mode for the selected codec */ *chan_mode = gsm88_to_chan_mode(perm_spch); -- To view, visit https://gerrit.osmocom.org/11295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iec1db4621ba5a09bc0e3fc40b66f3a3bc5f54add Gerrit-Change-Number: 11295 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 12:10:30 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 10 Oct 2018 12:10:30 +0000 Subject: Change in osmo-bsc[master]: codec_pref: also check physical channels Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11296 Change subject: codec_pref: also check physical channels ...................................................................... codec_pref: also check physical channels At the moment codec_pref only checks the codec configuration, but it does not check if there is actually a matching physical channel available. This should be checked too we must make sure that the codec we select fits the physical channels available on the BTS. Change-Id: I2d29dfed450e5ef93c26ed5ec9fdc0730eb3d7dd Related: OS#3503 --- M src/osmo-bsc/codec_pref.c M tests/codec_pref/codec_pref_test.c 2 files changed, 42 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/96/11296/1 diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index a741e11..9f30c7b 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -176,8 +176,38 @@ /* Helper function to check if the given permitted speech value is supported * by the BTS. (vty option bts->codec-support). */ -static bool test_codec_support_bts(const struct bts_codec_conf *bts_codec, uint8_t perm_spch) +static bool test_codec_support_bts(const struct gsm_bts *bts, uint8_t perm_spch) { + struct gsm_bts_trx *trx; + const struct bts_codec_conf *bts_codec = &bts->codec; + unsigned int i; + bool full_rate; + int rc; + enum gsm_phys_chan_config pchan; + bool rate_match = false; + + /* Check if the BTS provides a physical channel that matches the + * bandwith of the desired codec. */ + rc = full_rate_from_perm_spch(&full_rate, perm_spch); + if (rc < 0) + return false; + llist_for_each_entry(trx, &bts->trx_list, list) { + for (i = 0; i < TRX_NR_TS; i++) { + pchan = trx->ts[i].pchan_from_config; + if (pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) + rate_match = true; + else if (full_rate && pchan == GSM_PCHAN_TCH_F) + rate_match = true; + else if (full_rate && pchan == GSM_PCHAN_TCH_F_PDCH) + rate_match = true; + else if (!full_rate && pchan == GSM_PCHAN_TCH_H) + rate_match = true; + } + } + if (!rate_match) + return false; + + /* Check codec support */ switch (perm_spch) { case GSM0808_PERM_FR1: /* GSM-FR is always supported by all BTSs. There is also no way to @@ -269,7 +299,7 @@ /* Check this permitted speech value against the BTS specific parameters. * if the BTS does not support the codec, try the next one */ - if (!test_codec_support_bts(&bts->codec, perm_spch)) + if (!test_codec_support_bts(bts, perm_spch)) continue; /* Match the permitted speech value against the codec lists that were @@ -345,7 +375,7 @@ /* Check this permitted speech value against the BTS specific parameters. * if the BTS does not support the codec, try the next one */ - if (!test_codec_support_bts(&bts->codec, perm_spch)) + if (!test_codec_support_bts(bts, perm_spch)) continue; /* Write item into codec list */ @@ -380,7 +410,7 @@ gen_bss_supported_codec_list(&scl, msc, bts); if (scl.len <= 0) { LOGP(DMSC, LOGL_FATAL, - "codec-support of BTS %u does not intersect with codec-list of MSC %u\n", + "codec-support/trx config of BTS %u does not intersect with codec-list of MSC %u\n", bts->nr, msc->nr); rc = -1; } diff --git a/tests/codec_pref/codec_pref_test.c b/tests/codec_pref/codec_pref_test.c index e2876e2..534b99e 100644 --- a/tests/codec_pref/codec_pref_test.c +++ b/tests/codec_pref/codec_pref_test.c @@ -294,6 +294,7 @@ /* Note: FR is supported by all BTSs, so there is no flag for it */ struct gsm48_multi_rate_conf *cfg; + static struct gsm_bts_trx trx; OSMO_ASSERT(config_no < N_CONFIG_VARIANTS); @@ -324,6 +325,13 @@ cfg->m10_2 = 0; cfg->m12_2 = 0; + /* Initalize TRX with a TCH/F and a TCH/H channel */ + memset(&trx, 0, sizeof(trx)); + INIT_LLIST_HEAD(&bts->trx_list); + llist_add(&trx.list, &bts->trx_list); + trx.ts[0].pchan_from_config = GSM_PCHAN_TCH_F; + trx.ts[1].pchan_from_config = GSM_PCHAN_TCH_H; + switch (config_no) { case 0: /* FR1 (implicit) only */ -- To view, visit https://gerrit.osmocom.org/11296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2d29dfed450e5ef93c26ed5ec9fdc0730eb3d7dd Gerrit-Change-Number: 11296 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 12:25:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 10 Oct 2018 12:25:09 +0000 Subject: Change in osmo-bts[master]: l1sap: Log name of chan_nr instead of hex value Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11297 Change subject: l1sap: Log name of chan_nr instead of hex value ...................................................................... l1sap: Log name of chan_nr instead of hex value Change-Id: If98e130d17f1d153a13ba28f48a0a563731fde41 --- M src/common/l1sap.c 1 file changed, 27 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/11297/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 0f3cd3a..8029c88 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -554,7 +555,7 @@ lchan = get_active_lchan_by_chan_nr(trx, info_meas_ind->chan_nr); if (!lchan) { LOGPFN(DL1P, LOGL_ERROR, info_meas_ind->fn, - "No lchan for MPH INFO MEAS IND (chan_nr=0x%02x)\n", info_meas_ind->chan_nr); + "No lchan for MPH INFO MEAS IND (chan_nr=%s)\n", rsl_chan_nr_str(info_meas_ind->chan_nr)); return 0; } @@ -618,8 +619,8 @@ { struct gsm_lchan *lchan; - LOGP(DL1C, LOGL_INFO, "activate confirm chan_nr=0x%02x trx=%d\n", - info_act_cnf->chan_nr, trx->nr); + LOGP(DL1C, LOGL_INFO, "activate confirm chan_nr=%s trx=%d\n", + rsl_chan_nr_str(info_act_cnf->chan_nr), trx->nr); lchan = get_lchan_by_chan_nr(trx, info_act_cnf->chan_nr); @@ -643,8 +644,8 @@ { struct gsm_lchan *lchan; - LOGP(DL1C, LOGL_INFO, "deactivate confirm chan_nr=0x%02x trx=%d\n", - info_act_cnf->chan_nr, trx->nr); + LOGP(DL1C, LOGL_INFO, "deactivate confirm chan_nr=%s trx=%d\n", + rsl_chan_nr_str(info_act_cnf->chan_nr), trx->nr); lchan = get_lchan_by_chan_nr(trx, info_act_cnf->chan_nr); @@ -748,7 +749,7 @@ gsm_fn2gsmtime(&g_time, fn); - DEBUGPGT(DL1P, &g_time, "Rx PH-RTS.ind chan_nr=0x%02x link_id=0x%02xd\n", chan_nr, link_id); + DEBUGPGT(DL1P, &g_time, "Rx PH-RTS.ind chan_nr=%s link_id=0x%02xd\n", rsl_chan_nr_str(chan_nr), link_id); /* reuse PH-RTS.ind for PH-DATA.req */ if (!msg) { @@ -792,7 +793,8 @@ } else if (!(chan_nr & 0x80)) { /* only TCH/F, TCH/H, SDCCH/4 and SDCCH/8 have C5 bit cleared */ lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { - LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=0x%02x)\n", chan_nr); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=%s)\n", + rsl_chan_nr_str(chan_nr)); return 0; } if (L1SAP_IS_LINK_SACCH(link_id)) { @@ -851,7 +853,7 @@ memcpy(p, fill_frame, GSM_MACBLOCK_LEN); } - DEBUGPGT(DL1P, &g_time, "Tx PH-DATA.req chan_nr=0x%02x link_id=0x%02x\n", chan_nr, link_id); + DEBUGPGT(DL1P, &g_time, "Tx PH-DATA.req chan_nr=%s link_id=0x%02x\n", rsl_chan_nr_str(chan_nr), link_id); l1sap_down(trx, l1sap); @@ -917,11 +919,11 @@ gsm_fn2gsmtime(&g_time, fn); - DEBUGPGT(DL1P, &g_time, "Rx TCH-RTS.ind chan_nr=0x%02x\n", chan_nr); + DEBUGPGT(DL1P, &g_time, "Rx TCH-RTS.ind chan_nr=%s\n", rsl_chan_nr_str(chan_nr)); lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { - LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=0x%02x)\n", chan_nr); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=%s)\n", rsl_chan_nr_str(chan_nr)); return 0; } @@ -971,7 +973,7 @@ resp_l1sap->u.tch.fn = fn; resp_l1sap->u.tch.marker = marker; - DEBUGPGT(DL1P, &g_time, "Tx TCH.req chan_nr=0x%02x\n", chan_nr); + DEBUGPGT(DL1P, &g_time, "Tx TCH.req chan_nr=%s\n", rsl_chan_nr_str(chan_nr)); l1sap_down(trx, resp_l1sap); @@ -1073,13 +1075,13 @@ gsm_fn2gsmtime(&g_time, fn); - DEBUGPGT(DL1P, &g_time, "Rx PH-DATA.ind chan_nr=0x%02x link_id=0x%02x len=%d\n", - chan_nr, link_id, len); + DEBUGPGT(DL1P, &g_time, "Rx PH-DATA.ind chan_nr=%s link_id=0x%02x len=%d\n", + rsl_chan_nr_str(chan_nr), link_id, len); if (ts_is_pdch(&trx->ts[tn])) { lchan = get_lchan_by_chan_nr(trx, chan_nr); if (!lchan) - LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=0x%02x\n", chan_nr); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=%s\n", rsl_chan_nr_str(chan_nr)); if (lchan && lchan->loopback && !L1SAP_IS_PTCCH(fn)) { /* we are in loopback mode (for BER testing) * mode and need to enqeue the frame to be @@ -1115,7 +1117,7 @@ lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { - LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=0x%02x\n", chan_nr); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=%s\n", rsl_chan_nr_str(chan_nr)); return 0; } @@ -1179,11 +1181,11 @@ gsm_fn2gsmtime(&g_time, fn); - LOGPGT(DL1P, LOGL_INFO, &g_time, "Rx TCH.ind chan_nr=0x%02x\n", chan_nr); + LOGPGT(DL1P, LOGL_INFO, &g_time, "Rx TCH.ind chan_nr=%s\n", rsl_chan_nr_str(chan_nr)); lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { - LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for TCH.ind (chan_nr=0x%02x)\n", chan_nr); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for TCH.ind (chan_nr=%s)\n", rsl_chan_nr_str(chan_nr)); return 0; } @@ -1465,8 +1467,8 @@ struct gsm48_chan_desc *cd; int rc; - LOGP(DL1C, LOGL_INFO, "activating channel chan_nr=0x%02x trx=%d\n", - chan_nr, trx->nr); + LOGP(DL1C, LOGL_INFO, "activating channel chan_nr=%s trx=%d\n", + rsl_chan_nr_str(chan_nr), trx->nr); /* osmo-pcu calls this without a valid 'tp' parameter, so we * need to make sure ew don't crash here */ @@ -1513,8 +1515,8 @@ int l1sap_chan_rel(struct gsm_bts_trx *trx, uint8_t chan_nr) { struct gsm_lchan *lchan = get_lchan_by_chan_nr(trx, chan_nr); - LOGP(DL1C, LOGL_INFO, "deactivating channel chan_nr=0x%02x trx=%d\n", - chan_nr, trx->nr); + LOGP(DL1C, LOGL_INFO, "deactivating channel chan_nr=%s trx=%d\n", + rsl_chan_nr_str(chan_nr), trx->nr); if (lchan->tch.dtx.dl_amr_fsm) { osmo_fsm_inst_free(lchan->tch.dtx.dl_amr_fsm); @@ -1529,8 +1531,8 @@ { struct gsm_lchan *lchan = get_lchan_by_chan_nr(trx, chan_nr); - LOGP(DL1C, LOGL_INFO, "deactivating sacch chan_nr=0x%02x trx=%d\n", - chan_nr, trx->nr); + LOGP(DL1C, LOGL_INFO, "deactivating sacch chan_nr=%s trx=%d\n", + rsl_chan_nr_str(chan_nr), trx->nr); lchan->sacch_deact = 1; @@ -1540,8 +1542,8 @@ int l1sap_chan_modify(struct gsm_bts_trx *trx, uint8_t chan_nr) { - LOGP(DL1C, LOGL_INFO, "modifying channel chan_nr=0x%02x trx=%d\n", - chan_nr, trx->nr); + LOGP(DL1C, LOGL_INFO, "modifying channel chan_nr=%s trx=%d\n", + rsl_chan_nr_str(chan_nr), trx->nr); return l1sap_chan_act_dact_modify(trx, chan_nr, PRIM_INFO_MODIFY, 0); } -- To view, visit https://gerrit.osmocom.org/11297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If98e130d17f1d153a13ba28f48a0a563731fde41 Gerrit-Change-Number: 11297 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 12:25:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 10 Oct 2018 12:25:09 +0000 Subject: Change in osmo-bts[master]: rsl_rx_chan-activ: Improve logging information Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11298 Change subject: rsl_rx_chan-activ: Improve logging information ...................................................................... rsl_rx_chan-activ: Improve logging information Change-Id: I9b9a666e195ea729503ecd707e1582268c190e09 --- M src/common/rsl.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/98/11298/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 601b1c1..b221754 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1154,8 +1154,9 @@ /* 9.3.53 MultiRate Control */ /* 9.3.54 Supported Codec Types */ - LOGP(DRSL, LOGL_INFO, " chan_nr=0x%02x type=0x%02x mode=0x%02x\n", - dch->chan_nr, type, lchan->tch_mode); + LOGP(DRSL, LOGL_INFO, "%s: chan_nr=%s type=0x%02x mode=%s\n", + gsm_lchan_name(lchan), rsl_chan_nr_str(dch->chan_nr), type, + gsm48_chan_mode_name(lchan->tch_mode)); /* Connecting PDCH on dyn TS goes via PCU instead. */ if (ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH -- To view, visit https://gerrit.osmocom.org/11298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9b9a666e195ea729503ecd707e1582268c190e09 Gerrit-Change-Number: 11298 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 12:26:00 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 10 Oct 2018 12:26:00 +0000 Subject: Change in osmo-bsc[master]: vty 'show bts'/'show trx': display IPs and ports In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11290 ) Change subject: vty 'show bts'/'show trx': display IPs and ports ...................................................................... Patch Set 3: (1 comment) Thanks for the review! https://gerrit.osmocom.org/#/c/11290/3/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11290/3/src/osmo-bsc/bsc_vty.c at 293 PS3, Line 293: /*! Dump the IP addresses and ports of the input signal link's timeslot. > I suggest to have a function like e1inp_sign_link_name(const struct e1inp_sign_link *e1l) which will simply return an empty string or "" if the e1l is NULL. Done: https://gerrit.osmocom.org/#/c/libosmo-abis/+/11294/ > in therm of API design, I don't think it makes sense to have a separate 'dump' function here, particularly not one that includes the newline at the end. This function was closely modeled after "e1isl_dump_vty()" above, which also outputs new lines at the end. With the libosmo-abis patch linked above, the e1isl_dump_vty_tcp() function can be replaced with the following (tested and working): ``` static void e1isl_dump_vty_tcp(struct vty *vty, const struct e1inp_sign_link *e1l) { char *name = e1inp_sign_link_name(e1l); vty_out(vty, "%s%s", name, VTY_NEWLINE); talloc_free(name); } ``` As we still need to free the result of e1inp_sign_link_name(), we save some redundancy if we put these three lines into a function (it gets called two times below). But if you prefer I could instead remove e1isl_dump_vty_tcp() and directly use these three lines where the function would have been called. -- To view, visit https://gerrit.osmocom.org/11290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f Gerrit-Change-Number: 11290 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 10 Oct 2018 12:26:00 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 13:30:31 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 10 Oct 2018 13:30:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: resolve ambiguity of MobileIdentityLV type name In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11292 ) Change subject: resolve ambiguity of MobileIdentityLV type name ...................................................................... Patch Set 1: > Patch Set 1: > > Please don't merge this yet; I haven't yet done a full test build without ccache. Full build has passed. I'll merge this now. -- To view, visit https://gerrit.osmocom.org/11292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I990316cd5ef5aaf079b03c344e3185ae6ab8ba6d Gerrit-Change-Number: 11292 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 10 Oct 2018 13:30:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 13:34:20 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 10 Oct 2018 13:34:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: resolve ambiguity of MobileIdentityLV type name In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11292 ) Change subject: resolve ambiguity of MobileIdentityLV type name ...................................................................... resolve ambiguity of MobileIdentityLV type name There are two distinct types defined for a Mobile Identity LV IE. One type definition lives in GSM_RR_Types and defines the "canonical" IE form, with a full octet for the length. Another one lives in RLCMAC_CSN1_Types which defines how a mobile identity appears in paging requests. In this case, the length field is only 4 bits in size. Rename this latter type from MobileIdentityLV to MobileIdentityLV_Paging and add a comment to highlight this distinction. TS 144 060 Table 11.2.10.2 explicitly states that only the value part of this IE matches the definition of the canonical IE as "defined in 3GPP TS 44.018" (actually, TS 44.018 further redirects the reader to TS 124 008; see section 10.5.1.4 there). As an aside, a third definition of the MobileIdentityLV type exists in MobileL3_CommonIE_Types, which matches the "canonical" form. Change-Id: I990316cd5ef5aaf079b03c344e3185ae6ab8ba6d Related: OS#2404 --- M library/GSM_RR_Types.ttcn M library/RLCMAC_CSN1_Types.ttcn 2 files changed, 8 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index 675271f..26783f9 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -231,6 +231,7 @@ variant "FIELDORDER(lsb)" }; + /* TS 24.008 10.5.1.4 "Mobile Identity" */ type record MobileIdentityLV { uint8_t len, MobileIdentity mi diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index fbd01d4..9a7c867 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -185,7 +185,11 @@ }; /* 11.2.10 Packet Paging Request */ - type record MobileIdentityLV { + type record MobileIdentityLV_Paging { + /* Note that the size of 'len' differs from that of the Mobile Identify IE + * as defined in 3GPP TS 24.008 10.5.1.4 "Mobile Identity"; Paging Requests + * use only 4 bit to encode the length of a mobile identity, whereas the IE + * uses a byte. */ uint4_t len, octetstring mobile_id } with { variant (len) "LENGTHTO(mobile_id)" }; @@ -193,7 +197,7 @@ BIT1 presence ('0'B), BIT1 ptmsi_or_mobile_id, GsmTmsi ptmsi optional, - MobileIdentityLV mobile_identity optional + MobileIdentityLV_Paging mobile_identity optional } with { variant (ptmsi) "PRESENCE(ptmsi_or_mobile_id = '0'B)" variant (mobile_identity) "PRESENCE(ptmsi_or_mobile_id = '1'B)" @@ -202,7 +206,7 @@ BIT1 presence ('1'B), BIT1 tmsi_or_mobile_id, GsmTmsi tmsi optional, - MobileIdentityLV mobile_identity optional, + MobileIdentityLV_Paging mobile_identity optional, ChannelNeeded chan_needed, BIT1 emlpp_prio_present, uint3_t emlpp_prio optional -- To view, visit https://gerrit.osmocom.org/11292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I990316cd5ef5aaf079b03c344e3185ae6ab8ba6d Gerrit-Change-Number: 11292 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 13:38:24 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 10 Oct 2018 13:38:24 +0000 Subject: Change in osmo-ci[master]: README.adoc: use 'my_api_token' as example pass Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11299 Change subject: README.adoc: use 'my_api_token' as example pass ...................................................................... README.adoc: use 'my_api_token' as example pass This makes it easier to recognize that users should paste an API token there, not their password. Change-Id: I203c25b6638e36d3f050223dd40e56b7c4a92a12 --- M jobs/README.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/99/11299/1 diff --git a/jobs/README.adoc b/jobs/README.adoc index fadafd8..1d4d405 100644 --- a/jobs/README.adoc +++ b/jobs/README.adoc @@ -25,7 +25,7 @@ [jenkins] user=my_user_name - password=my_password + password=my_api_token url=https://jenkins.osmocom.org/jenkins and -- To view, visit https://gerrit.osmocom.org/11299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I203c25b6638e36d3f050223dd40e56b7c4a92a12 Gerrit-Change-Number: 11299 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 14:12:38 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 10 Oct 2018 14:12:38 +0000 Subject: Change in libosmocore[master]: fix error handling gprs_ns_nsip_listen() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11300 Change subject: fix error handling gprs_ns_nsip_listen() ...................................................................... fix error handling gprs_ns_nsip_listen() If we cannot bind the listening socket, reset related fields in the osmo fd structure to NULL again. Otherwise our caller might eventually try to use an uninitialized osmo fd. Change-Id: Ia953b2eff54cac0bd980944291f75db14df09a34 Related: OS#3643 --- M src/gb/gprs_ns.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/00/11300/1 diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index 9b7cc05..198ead1 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -1628,8 +1628,11 @@ LOGP(DNS, LOGL_NOTICE, "Listening for nsip packets on %s:%u\n", inet_ntoa(in), nsi->nsip.local_port); } - if (ret < 0) + if (ret < 0) { + nsi->nsip.fd.cb = NULL; + nsi->nsip.fd.data = NULL; return ret; + } ret = setsockopt(nsi->nsip.fd.fd, IPPROTO_IP, IP_TOS, &nsi->nsip.dscp, sizeof(nsi->nsip.dscp)); -- To view, visit https://gerrit.osmocom.org/11300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia953b2eff54cac0bd980944291f75db14df09a34 Gerrit-Change-Number: 11300 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 14:16:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 14:16:06 +0000 Subject: Change in osmo-hlr[master]: store gsup peer upon accepting LU In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11232 ) Change subject: store gsup peer upon accepting LU ...................................................................... Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11232/3/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/#/c/11232/3/src/hlr.c at 308 PS3, Line 308: osmo_quote_str((const char*)luop->peer, -1)); > Ah sure. Now I'm escaping the string, in case it contains unprintable characters. [?] yes, add a FIXME now and/or an issue and merge this patch -- To view, visit https://gerrit.osmocom.org/11232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If438664faa5d68404f465f8b2002c6d03bbf3ceb Gerrit-Change-Number: 11232 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 10 Oct 2018 14:16:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 14:19:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 14:19:25 +0000 Subject: Change in osmo-bsc[master]: vty 'show bts'/'show trx': display IPs and ports In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11290 ) Change subject: vty 'show bts'/'show trx': display IPs and ports ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11290/3/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11290/3/src/osmo-bsc/bsc_vty.c at 293 PS3, Line 293: /*! Dump the IP addresses and ports of the input signal link's timeslot. > > I suggest to have a function like e1inp_sign_link_name(const struct e1inp_sign_link *e1l) which wi [?] I missed the fact that osmo_sock_get_name doesn't return a static buffer [like most parts of osmocom] but actually a heap-allocated string. I think we can just keep it. The difference between e1isl_dump_vty() and your e1isl_dump_vty_tcp() is that the former is used to print entire lines, i.e. dump an entire signaling link, while yours is used to print a trailer of a line. -- To view, visit https://gerrit.osmocom.org/11290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f Gerrit-Change-Number: 11290 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 10 Oct 2018 14:19:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 14:19:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 14:19:57 +0000 Subject: Change in libosmocore[master]: fix error handling gprs_ns_nsip_listen() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11300 ) Change subject: fix error handling gprs_ns_nsip_listen() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia953b2eff54cac0bd980944291f75db14df09a34 Gerrit-Change-Number: 11300 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 10 Oct 2018 14:19:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 14:20:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 14:20:00 +0000 Subject: Change in libosmocore[master]: fix error handling gprs_ns_nsip_listen() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11300 ) Change subject: fix error handling gprs_ns_nsip_listen() ...................................................................... fix error handling gprs_ns_nsip_listen() If we cannot bind the listening socket, reset related fields in the osmo fd structure to NULL again. Otherwise our caller might eventually try to use an uninitialized osmo fd. Change-Id: Ia953b2eff54cac0bd980944291f75db14df09a34 Related: OS#3643 --- M src/gb/gprs_ns.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index 9b7cc05..198ead1 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -1628,8 +1628,11 @@ LOGP(DNS, LOGL_NOTICE, "Listening for nsip packets on %s:%u\n", inet_ntoa(in), nsi->nsip.local_port); } - if (ret < 0) + if (ret < 0) { + nsi->nsip.fd.cb = NULL; + nsi->nsip.fd.data = NULL; return ret; + } ret = setsockopt(nsi->nsip.fd.fd, IPPROTO_IP, IP_TOS, &nsi->nsip.dscp, sizeof(nsi->nsip.dscp)); -- To view, visit https://gerrit.osmocom.org/11300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia953b2eff54cac0bd980944291f75db14df09a34 Gerrit-Change-Number: 11300 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 14:20:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 14:20:32 +0000 Subject: Change in osmo-ci[master]: README.adoc: use 'my_api_token' as example pass In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11299 ) Change subject: README.adoc: use 'my_api_token' as example pass ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I203c25b6638e36d3f050223dd40e56b7c4a92a12 Gerrit-Change-Number: 11299 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 10 Oct 2018 14:20:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 14:20:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 14:20:58 +0000 Subject: Change in osmo-bts[master]: lchan_meas_check_compute: Log value during incorrect num of SUB measu... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11293 ) Change subject: lchan_meas_check_compute: Log value during incorrect num of SUB measurementes detected ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5dacbed5517b2aa2a6bbc66ec125f0bdfd1f5b2b Gerrit-Change-Number: 11293 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 10 Oct 2018 14:20:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 14:21:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 14:21:09 +0000 Subject: Change in osmo-bts[master]: l1sap: Log name of chan_nr instead of hex value In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11297 ) Change subject: l1sap: Log name of chan_nr instead of hex value ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If98e130d17f1d153a13ba28f48a0a563731fde41 Gerrit-Change-Number: 11297 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 10 Oct 2018 14:21:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 14:21:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 14:21:21 +0000 Subject: Change in osmo-bts[master]: rsl_rx_chan-activ: Improve logging information In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11298 ) Change subject: rsl_rx_chan-activ: Improve logging information ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9b9a666e195ea729503ecd707e1582268c190e09 Gerrit-Change-Number: 11298 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 10 Oct 2018 14:21:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 14:21:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 14:21:22 +0000 Subject: Change in osmo-bts[master]: lchan_meas_check_compute: Log value during incorrect num of SUB measu... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11293 ) Change subject: lchan_meas_check_compute: Log value during incorrect num of SUB measurementes detected ...................................................................... lchan_meas_check_compute: Log value during incorrect num of SUB measurementes detected Change-Id: I5dacbed5517b2aa2a6bbc66ec125f0bdfd1f5b2b --- M src/common/measurement.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/common/measurement.c b/src/common/measurement.c index 33b1c11..c2001da 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -640,7 +640,8 @@ gsm_lchan_name(lchan), num_ul_meas_subst, num_meas_sub_subst); if (num_meas_sub != num_meas_sub_expect) { - LOGP(DMEAS, LOGL_ERROR, "%s Incorrect number of SUB measurements detected!\n", gsm_lchan_name(lchan)); + LOGP(DMEAS, LOGL_ERROR, "%s Incorrect number of SUB measurements detected! (%u vs exp %u)\n", + gsm_lchan_name(lchan), num_meas_sub, num_meas_sub_expect); /* Normally the logic above should make sure that there is * always the exact amount of SUB measurements taken into * account. If not then the logic that decides tags the received -- To view, visit https://gerrit.osmocom.org/11293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5dacbed5517b2aa2a6bbc66ec125f0bdfd1f5b2b Gerrit-Change-Number: 11293 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 14:21:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 14:21:23 +0000 Subject: Change in osmo-bts[master]: l1sap: Log name of chan_nr instead of hex value In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11297 ) Change subject: l1sap: Log name of chan_nr instead of hex value ...................................................................... l1sap: Log name of chan_nr instead of hex value Change-Id: If98e130d17f1d153a13ba28f48a0a563731fde41 --- M src/common/l1sap.c 1 file changed, 27 insertions(+), 25 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 0f3cd3a..8029c88 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -554,7 +555,7 @@ lchan = get_active_lchan_by_chan_nr(trx, info_meas_ind->chan_nr); if (!lchan) { LOGPFN(DL1P, LOGL_ERROR, info_meas_ind->fn, - "No lchan for MPH INFO MEAS IND (chan_nr=0x%02x)\n", info_meas_ind->chan_nr); + "No lchan for MPH INFO MEAS IND (chan_nr=%s)\n", rsl_chan_nr_str(info_meas_ind->chan_nr)); return 0; } @@ -618,8 +619,8 @@ { struct gsm_lchan *lchan; - LOGP(DL1C, LOGL_INFO, "activate confirm chan_nr=0x%02x trx=%d\n", - info_act_cnf->chan_nr, trx->nr); + LOGP(DL1C, LOGL_INFO, "activate confirm chan_nr=%s trx=%d\n", + rsl_chan_nr_str(info_act_cnf->chan_nr), trx->nr); lchan = get_lchan_by_chan_nr(trx, info_act_cnf->chan_nr); @@ -643,8 +644,8 @@ { struct gsm_lchan *lchan; - LOGP(DL1C, LOGL_INFO, "deactivate confirm chan_nr=0x%02x trx=%d\n", - info_act_cnf->chan_nr, trx->nr); + LOGP(DL1C, LOGL_INFO, "deactivate confirm chan_nr=%s trx=%d\n", + rsl_chan_nr_str(info_act_cnf->chan_nr), trx->nr); lchan = get_lchan_by_chan_nr(trx, info_act_cnf->chan_nr); @@ -748,7 +749,7 @@ gsm_fn2gsmtime(&g_time, fn); - DEBUGPGT(DL1P, &g_time, "Rx PH-RTS.ind chan_nr=0x%02x link_id=0x%02xd\n", chan_nr, link_id); + DEBUGPGT(DL1P, &g_time, "Rx PH-RTS.ind chan_nr=%s link_id=0x%02xd\n", rsl_chan_nr_str(chan_nr), link_id); /* reuse PH-RTS.ind for PH-DATA.req */ if (!msg) { @@ -792,7 +793,8 @@ } else if (!(chan_nr & 0x80)) { /* only TCH/F, TCH/H, SDCCH/4 and SDCCH/8 have C5 bit cleared */ lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { - LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=0x%02x)\n", chan_nr); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=%s)\n", + rsl_chan_nr_str(chan_nr)); return 0; } if (L1SAP_IS_LINK_SACCH(link_id)) { @@ -851,7 +853,7 @@ memcpy(p, fill_frame, GSM_MACBLOCK_LEN); } - DEBUGPGT(DL1P, &g_time, "Tx PH-DATA.req chan_nr=0x%02x link_id=0x%02x\n", chan_nr, link_id); + DEBUGPGT(DL1P, &g_time, "Tx PH-DATA.req chan_nr=%s link_id=0x%02x\n", rsl_chan_nr_str(chan_nr), link_id); l1sap_down(trx, l1sap); @@ -917,11 +919,11 @@ gsm_fn2gsmtime(&g_time, fn); - DEBUGPGT(DL1P, &g_time, "Rx TCH-RTS.ind chan_nr=0x%02x\n", chan_nr); + DEBUGPGT(DL1P, &g_time, "Rx TCH-RTS.ind chan_nr=%s\n", rsl_chan_nr_str(chan_nr)); lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { - LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=0x%02x)\n", chan_nr); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=%s)\n", rsl_chan_nr_str(chan_nr)); return 0; } @@ -971,7 +973,7 @@ resp_l1sap->u.tch.fn = fn; resp_l1sap->u.tch.marker = marker; - DEBUGPGT(DL1P, &g_time, "Tx TCH.req chan_nr=0x%02x\n", chan_nr); + DEBUGPGT(DL1P, &g_time, "Tx TCH.req chan_nr=%s\n", rsl_chan_nr_str(chan_nr)); l1sap_down(trx, resp_l1sap); @@ -1073,13 +1075,13 @@ gsm_fn2gsmtime(&g_time, fn); - DEBUGPGT(DL1P, &g_time, "Rx PH-DATA.ind chan_nr=0x%02x link_id=0x%02x len=%d\n", - chan_nr, link_id, len); + DEBUGPGT(DL1P, &g_time, "Rx PH-DATA.ind chan_nr=%s link_id=0x%02x len=%d\n", + rsl_chan_nr_str(chan_nr), link_id, len); if (ts_is_pdch(&trx->ts[tn])) { lchan = get_lchan_by_chan_nr(trx, chan_nr); if (!lchan) - LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=0x%02x\n", chan_nr); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=%s\n", rsl_chan_nr_str(chan_nr)); if (lchan && lchan->loopback && !L1SAP_IS_PTCCH(fn)) { /* we are in loopback mode (for BER testing) * mode and need to enqeue the frame to be @@ -1115,7 +1117,7 @@ lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { - LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=0x%02x\n", chan_nr); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=%s\n", rsl_chan_nr_str(chan_nr)); return 0; } @@ -1179,11 +1181,11 @@ gsm_fn2gsmtime(&g_time, fn); - LOGPGT(DL1P, LOGL_INFO, &g_time, "Rx TCH.ind chan_nr=0x%02x\n", chan_nr); + LOGPGT(DL1P, LOGL_INFO, &g_time, "Rx TCH.ind chan_nr=%s\n", rsl_chan_nr_str(chan_nr)); lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { - LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for TCH.ind (chan_nr=0x%02x)\n", chan_nr); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for TCH.ind (chan_nr=%s)\n", rsl_chan_nr_str(chan_nr)); return 0; } @@ -1465,8 +1467,8 @@ struct gsm48_chan_desc *cd; int rc; - LOGP(DL1C, LOGL_INFO, "activating channel chan_nr=0x%02x trx=%d\n", - chan_nr, trx->nr); + LOGP(DL1C, LOGL_INFO, "activating channel chan_nr=%s trx=%d\n", + rsl_chan_nr_str(chan_nr), trx->nr); /* osmo-pcu calls this without a valid 'tp' parameter, so we * need to make sure ew don't crash here */ @@ -1513,8 +1515,8 @@ int l1sap_chan_rel(struct gsm_bts_trx *trx, uint8_t chan_nr) { struct gsm_lchan *lchan = get_lchan_by_chan_nr(trx, chan_nr); - LOGP(DL1C, LOGL_INFO, "deactivating channel chan_nr=0x%02x trx=%d\n", - chan_nr, trx->nr); + LOGP(DL1C, LOGL_INFO, "deactivating channel chan_nr=%s trx=%d\n", + rsl_chan_nr_str(chan_nr), trx->nr); if (lchan->tch.dtx.dl_amr_fsm) { osmo_fsm_inst_free(lchan->tch.dtx.dl_amr_fsm); @@ -1529,8 +1531,8 @@ { struct gsm_lchan *lchan = get_lchan_by_chan_nr(trx, chan_nr); - LOGP(DL1C, LOGL_INFO, "deactivating sacch chan_nr=0x%02x trx=%d\n", - chan_nr, trx->nr); + LOGP(DL1C, LOGL_INFO, "deactivating sacch chan_nr=%s trx=%d\n", + rsl_chan_nr_str(chan_nr), trx->nr); lchan->sacch_deact = 1; @@ -1540,8 +1542,8 @@ int l1sap_chan_modify(struct gsm_bts_trx *trx, uint8_t chan_nr) { - LOGP(DL1C, LOGL_INFO, "modifying channel chan_nr=0x%02x trx=%d\n", - chan_nr, trx->nr); + LOGP(DL1C, LOGL_INFO, "modifying channel chan_nr=%s trx=%d\n", + rsl_chan_nr_str(chan_nr), trx->nr); return l1sap_chan_act_dact_modify(trx, chan_nr, PRIM_INFO_MODIFY, 0); } -- To view, visit https://gerrit.osmocom.org/11297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If98e130d17f1d153a13ba28f48a0a563731fde41 Gerrit-Change-Number: 11297 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 14:21:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 14:21:23 +0000 Subject: Change in osmo-bts[master]: rsl_rx_chan-activ: Improve logging information In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11298 ) Change subject: rsl_rx_chan-activ: Improve logging information ...................................................................... rsl_rx_chan-activ: Improve logging information Change-Id: I9b9a666e195ea729503ecd707e1582268c190e09 --- M src/common/rsl.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/common/rsl.c b/src/common/rsl.c index 601b1c1..b221754 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1154,8 +1154,9 @@ /* 9.3.53 MultiRate Control */ /* 9.3.54 Supported Codec Types */ - LOGP(DRSL, LOGL_INFO, " chan_nr=0x%02x type=0x%02x mode=0x%02x\n", - dch->chan_nr, type, lchan->tch_mode); + LOGP(DRSL, LOGL_INFO, "%s: chan_nr=%s type=0x%02x mode=%s\n", + gsm_lchan_name(lchan), rsl_chan_nr_str(dch->chan_nr), type, + gsm48_chan_mode_name(lchan->tch_mode)); /* Connecting PDCH on dyn TS goes via PCU instead. */ if (ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH -- To view, visit https://gerrit.osmocom.org/11298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9b9a666e195ea729503ecd707e1582268c190e09 Gerrit-Change-Number: 11298 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 14:22:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 14:22:01 +0000 Subject: Change in osmo-bsc[master]: codec_pref: cosmetic: seperate half/full rate determination In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11295 ) Change subject: codec_pref: cosmetic: seperate half/full rate determination ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iec1db4621ba5a09bc0e3fc40b66f3a3bc5f54add Gerrit-Change-Number: 11295 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 10 Oct 2018 14:22:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 14:22:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 10 Oct 2018 14:22:40 +0000 Subject: Change in osmo-ci[master]: README.adoc: use 'my_api_token' as example pass In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11299 ) Change subject: README.adoc: use 'my_api_token' as example pass ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I203c25b6638e36d3f050223dd40e56b7c4a92a12 Gerrit-Change-Number: 11299 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 10 Oct 2018 14:22:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 14:22:42 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 10 Oct 2018 14:22:42 +0000 Subject: Change in osmo-ci[master]: README.adoc: use 'my_api_token' as example pass In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11299 ) Change subject: README.adoc: use 'my_api_token' as example pass ...................................................................... README.adoc: use 'my_api_token' as example pass This makes it easier to recognize that users should paste an API token there, not their password. Change-Id: I203c25b6638e36d3f050223dd40e56b7c4a92a12 --- M jobs/README.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved osmith: Verified diff --git a/jobs/README.adoc b/jobs/README.adoc index fadafd8..1d4d405 100644 --- a/jobs/README.adoc +++ b/jobs/README.adoc @@ -25,7 +25,7 @@ [jenkins] user=my_user_name - password=my_password + password=my_api_token url=https://jenkins.osmocom.org/jenkins and -- To view, visit https://gerrit.osmocom.org/11299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I203c25b6638e36d3f050223dd40e56b7c4a92a12 Gerrit-Change-Number: 11299 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 14:22:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 14:22:51 +0000 Subject: Change in osmo-bsc[master]: codec_pref: also check physical channels In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11296 ) Change subject: codec_pref: also check physical channels ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2d29dfed450e5ef93c26ed5ec9fdc0730eb3d7dd Gerrit-Change-Number: 11296 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 10 Oct 2018 14:22:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 14:23:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 14:23:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: Use explicit AoIP flag In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11289 ) Change subject: MSC_ConnectionHandler: Use explicit AoIP flag ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I800249e783deb018d99e81d814843e0574a5c69b Gerrit-Change-Number: 11289 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 10 Oct 2018 14:23:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 14:23:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 14:23:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: Use explicit AoIP flag In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11289 ) Change subject: MSC_ConnectionHandler: Use explicit AoIP flag ...................................................................... MSC_ConnectionHandler: Use explicit AoIP flag Most differences between sccplite and AoIP are visible during the assignment. The current implementation checks for the presence of a CIC in the ASSIGNMENT REQUEST in order to detect if the communication should be modeled by AoIP or sccplite. This method is error prone and does not work very well in situations where only signalling is used, because there in sccplite and AoIP no CIC or AoIP trasp. identifier is present, so there is nothing to check on. To resolve this we need an explicit way to tell the MSC_ConnectionHandler that it has to behave like an AoIP MSC or like an sccplite MSC. - Add an aoip flag to TestHdlrParams - Make sure BSC_Tests.ttcn sets the AoIP depending on mp_bssap_cfg.transport Change-Id: I800249e783deb018d99e81d814843e0574a5c69b Related: OS#3639 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 43 insertions(+), 33 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 9a85a1f..754f7b3 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -119,6 +119,18 @@ }; } +private function f_gen_test_hdlr_pars() return TestHdlrParams { + + var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_AoIP) { + pars.aoip := true; + } else { + pars.aoip := false; + } + + return pars; +} + private function f_shutdown_helper() runs on test_CT { all component.stop; setverdict(pass); @@ -1571,7 +1583,7 @@ } testcase TC_ciph_mode_a5_0() runs on test_CT { var MSC_ConnHdlr vc_conn; - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.encr := valueof(t_EncrParams('01'O, f_rnd_octstring(8))); f_init(1, true); @@ -1581,7 +1593,7 @@ } testcase TC_ciph_mode_a5_1() runs on test_CT { var MSC_ConnHdlr vc_conn; - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.encr := valueof(t_EncrParams('02'O, f_rnd_octstring(8))); f_init(1, true); @@ -1591,7 +1603,7 @@ } testcase TC_ciph_mode_a5_3() runs on test_CT { var MSC_ConnHdlr vc_conn; - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.encr := valueof(t_EncrParams('08'O, f_rnd_octstring(8))); f_init(1, true); @@ -1613,7 +1625,7 @@ } testcase TC_assignment_fr_a5_0() runs on test_CT { var MSC_ConnHdlr vc_conn; - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.encr := valueof(t_EncrParams('01'O, f_rnd_octstring(8))); f_init(1, true); @@ -1623,7 +1635,7 @@ } testcase TC_assignment_fr_a5_1() runs on test_CT { var MSC_ConnHdlr vc_conn; - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.encr := valueof(t_EncrParams('02'O, f_rnd_octstring(8))); f_init(1, true); @@ -1633,7 +1645,7 @@ } testcase TC_assignment_fr_a5_3() runs on test_CT { var MSC_ConnHdlr vc_conn; - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.encr := valueof(t_EncrParams('08'O, f_rnd_octstring(8))); f_init(1, true); @@ -1644,7 +1656,7 @@ /* Expect ASSIGNMENT FAIL if mandatory IE is missing */ private function f_tc_assignment_fr_a5_1_codec_missing(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); var template PDU_BSSAP exp_fail := tr_BSSMAP_AssignmentFail; var PDU_BSSAP ass_cmd := f_gen_ass_req(); const OCT8 kc := '0001020304050607'O; @@ -1665,7 +1677,7 @@ } private function f_tc_assignment_fr_a5_4(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); var template PDU_BSSAP exp_compl := f_gen_exp_compl(); var PDU_BSSAP ass_cmd := f_gen_ass_req(); const OCT8 kc := '0001020304050607'O; @@ -1689,10 +1701,9 @@ private function f_tc_assignment_sign(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, omit); - var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, omit)); - + var PDU_BSSAP ass_cmd := f_gen_ass_req(); ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeSIGNAL); f_establish_fully(ass_cmd, exp_compl); } @@ -1886,7 +1897,7 @@ } testcase TC_assignment_codec_fr() runs on test_CT { - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); var MSC_ConnHdlr vc_conn; f_init(1, true); @@ -1898,7 +1909,7 @@ } testcase TC_assignment_codec_hr() runs on test_CT { - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); var MSC_ConnHdlr vc_conn; f_init(1, true); @@ -1910,7 +1921,7 @@ } testcase TC_assignment_codec_efr() runs on test_CT { - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); var MSC_ConnHdlr vc_conn; f_init(1, true); @@ -1922,7 +1933,7 @@ } testcase TC_assignment_codec_amr_f() runs on test_CT { - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); var MSC_ConnHdlr vc_conn; /* Note: This setups the codec configuration. The parameter payload in @@ -1948,7 +1959,7 @@ } testcase TC_assignment_codec_amr_h() runs on test_CT { - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); var MSC_ConnHdlr vc_conn; /* See note above */ @@ -1975,7 +1986,8 @@ * a) BSSMAP Classmark Request should result in RR CLASSMARK ENQUIRY, * b) L3 RR CLASSMARK CHANGE should result in BSSMAP CLASSMARK UPDATE */ private function f_tc_classmark(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); + f_create_chan_and_exp(); /* we should now have a COMPL_L3 at the MSC */ BSSAP.receive(tr_BSSMAP_ComplL3); @@ -1996,7 +2008,7 @@ } private function f_est_single_l3(template PDU_ML3_MS_NW l3) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); f_create_chan_and_exp(); /* we should now have a COMPL_L3 at the MSC */ BSSAP.receive(tr_BSSMAP_ComplL3); @@ -2064,7 +2076,7 @@ /* short message from MS should be ignored */ private function f_tc_err_82_short_msg(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); f_create_chan_and_exp(); /* we should now have a COMPL_L3 at the MSC */ BSSAP.receive(tr_BSSMAP_ComplL3); @@ -2146,7 +2158,7 @@ /* intra-BSC hand-over between BTS0 and BTS1 */ private function f_tc_ho_int(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); var template PDU_BSSAP exp_compl := f_gen_exp_compl(); var PDU_BSSAP ass_cmd := f_gen_ass_req(); const OCT8 kc := '0001020304050607'O; @@ -2189,7 +2201,7 @@ } private function f_tc_ho_out_of_this_bsc(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); var PDU_BSSAP ass_req := f_gen_ass_req(); ass_req.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); @@ -2327,7 +2339,7 @@ } testcase TC_ho_into_this_bsc() runs on test_CT { var MSC_ConnHdlr vc_conn; - var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + var TestHdlrParams pars := f_gen_test_hdlr_pars(); f_init(1, true); f_sleep(1.0); diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 079cc74..dfdf10c 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -426,9 +426,13 @@ RSL_IE_Body expect_mr_conf_ie optional, /* typically present for AMR codecs */ TestHdlrEncrParams encr optional, TestHdlrParamsLcls lcls, - TestHdlrParamsHandover handover optional + TestHdlrParamsHandover handover optional, + boolean aoip }; +/* Note: Do not use valueof() to get a value of this template, use + * f_gen_test_hdlr_pars() instead in order to get a configuration that is + * matched to the current test sitation (aoio vs. sccplite) */ template (value) TestHdlrParams t_def_TestHdlrPars := { ra := '23'O, fn := 23, @@ -444,7 +448,8 @@ csc := omit, exp_sts := omit }, - handover := omit + handover := omit, + aoip := true } function f_create_chan_and_exp() runs on MSC_ConnHdlr { @@ -828,15 +833,8 @@ runs on MSC_ConnHdlr { var BSSMAP_FIELD_CodecType codecType; - var boolean sccplite := false; timer T := 10.0; - /* Check if we run on SCCPLITE instead of SCCP by looking if a CIC is - * present or not. */ - if (isvalue(ass_tpl.pdu.bssmap.assignmentRequest.circuitIdentityCode)) { - sccplite := true; - } - if (isvalue(ass_tpl.pdu.bssmap.assignmentRequest.codecList)) { codecType := valueof(ass_tpl.pdu.bssmap.assignmentRequest.codecList.codecElements[0].codecType); } else { @@ -855,7 +853,7 @@ var template PDU_BSSAP exp_l3_compl; exp_l3_compl := tr_BSSMAP_ComplL3() - if (sccplite) { + if (g_pars.aoip == false) { exp_l3_compl.pdu.bssmap.completeLayer3Information.codecList := omit; } else { exp_l3_compl.pdu.bssmap.completeLayer3Information.codecList := ?; @@ -930,7 +928,7 @@ g_media.mgcp_conn[1].mdcx_seen_exp := 0; } else if (st.voice_call) { /* For voice calls we expect the following MGCP activity */ - if (sccplite) { + if (g_pars.aoip == false) { g_media.mgcp_conn[0].crcx_seen_exp := 1; g_media.mgcp_conn[0].mdcx_seen_exp := 1; g_media.mgcp_conn[1].crcx_seen_exp := 0; -- To view, visit https://gerrit.osmocom.org/11289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I800249e783deb018d99e81d814843e0574a5c69b Gerrit-Change-Number: 11289 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 15:03:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 10 Oct 2018 15:03:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: f_tx_lapdm: Build SacchL1Header with proper values Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11301 Change subject: bts: f_tx_lapdm: Build SacchL1Header with proper values ...................................................................... bts: f_tx_lapdm: Build SacchL1Header with proper values Change-Id: I2c77d9d6262bd4763b3fb53a4a595d2c61f45f4b --- M bts/BTS_Tests.ttcn 1 file changed, 11 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/11301/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 61fe1a7..82a54f3 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3318,14 +3318,18 @@ var octetstring l2 := enc_LapdmFrame(valueof(l)); if (valueof(link_id.c) == SACCH) { /* prepend dummy L1 header */ - l2 := '0000'O & l2; + var L1ctlDataReq l1hl2 := { + l1header := valueof(ts_SacchL1Header(g_pars.l1_pars.ms_power_level, false, g_pars.l1_pars.ms_actual_ta)), + l2_payload := f_pad_oct(l2, 21, '2B'O) + } + L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, link_id, l1hl2)); + } else { + /* If required, pad L2 frame with constant 0x2b filling */ + l2 := f_pad_oct(l2, 23, '2B'O); + + log("encoding ", l, " to ", l2); + L1CTL.send(ts_L1CTL_DATA_REQ(g_chan_nr, link_id, l2)); } - - /* If required, pad L2 frame with constant 0x2b filling */ - l2 := f_pad_oct(l2, 23, '2B'O); - - log("encoding ", l, " to ", l2); - L1CTL.send(ts_L1CTL_DATA_REQ(g_chan_nr, link_id, l2)); } type record RllTestCase { -- To view, visit https://gerrit.osmocom.org/11301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2c77d9d6262bd4763b3fb53a4a595d2c61f45f4b Gerrit-Change-Number: 11301 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 15:07:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 10 Oct 2018 15:07:05 +0000 Subject: Change in libosmocore[master]: gsm_08_58.h: Introduce struct abis_rsl_link_id Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11302 Change subject: gsm_08_58.h: Introduce struct abis_rsl_link_id ...................................................................... gsm_08_58.h: Introduce struct abis_rsl_link_id It will allow to make code handling link_id values more easier to read and less prone to errors. union is added inside the struct to be able to get the full octet in case we need to pass it somewhere else or encode it. A union is used in struct abis_rsl_common_hdr to allow using fields directly while keeping API compatibility. Change-Id: Ibd75a493bcfdf46c028ea466867d0c0d83d46343 --- M include/osmocom/gsm/protocol/gsm_08_58.h 1 file changed, 27 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/02/11302/1 diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h index e5ff464..06983f0 100644 --- a/include/osmocom/gsm/protocol/gsm_08_58.h +++ b/include/osmocom/gsm/protocol/gsm_08_58.h @@ -25,10 +25,32 @@ #include +#include + /*! \addtogroup rsl * @{ * \file gsm_08_58.h */ +/* Link Identifier 9.3.2 */ +struct abis_rsl_link_id { + union { +#if OSMO_IS_BIG_ENDIAN + uint8_t cbits:2, + na:1, + reserved:2; + sapi:3; +#elif OSMO_IS_LITTLE_ENDIAN + uint8_t sapi:3, + reserved:2, + na:1, + cbits:2; +#endif + uint8_t link_id; + }; +} __attribute__ ((packed)); +#define ABIS_RSL_LINK_ID_CHAN_FACCH_SDCCH 0x00 +#define ABIS_RSL_LINK_ID_CHAN_SACCH 0x01 + /*! RSL common header */ struct abis_rsl_common_hdr { uint8_t msg_discr; /*!< message discriminator (ABIS_RSL_MDISC_*) */ @@ -42,7 +64,11 @@ uint8_t ie_chan; /*!< \ref RSL_IE_CHAN_NR (tag) */ uint8_t chan_nr; /*!< RSL channel number (value) */ uint8_t ie_link_id; /*!< \ref RSL_IE_LINK_IDENT (tag) */ - uint8_t link_id; /*!< RSL link identifier (value) */ + union + { + uint8_t link_id; /*!< RSL link identifier (value) */ + struct abis_rsl_link_id link_id_fields; + }; uint8_t data[0]; /*!< message payload data */ } __attribute__ ((packed)); -- To view, visit https://gerrit.osmocom.org/11302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd75a493bcfdf46c028ea466867d0c0d83d46343 Gerrit-Change-Number: 11302 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Oct 10 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 10 Oct 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#272?= In-Reply-To: <1635602604.17.1539097807425.JavaMail.jenkins@jenkins.osmocom.org> References: <1635602604.17.1539097807425.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1965523020.25.1539184206243.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 2.07 KB...] =============================== asn1c =============================== + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 4 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Oct 10 15:25:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 10 Oct 2018 15:25:22 +0000 Subject: Change in libosmocore[master]: gsm_08_58.h: Introduce struct abis_rsl_link_id In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11302 ) Change subject: gsm_08_58.h: Introduce struct abis_rsl_link_id ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11302/1/include/osmocom/gsm/protocol/gsm_08_58.h File include/osmocom/gsm/protocol/gsm_08_58.h: https://gerrit.osmocom.org/#/c/11302/1/include/osmocom/gsm/protocol/gsm_08_58.h at 35 PS1, Line 35: struct abis_rsl_link_id { Perhaps a union is better here? Like dropping the structure and naming the inner union as "abis_rsl_link_id". -- To view, visit https://gerrit.osmocom.org/11302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibd75a493bcfdf46c028ea466867d0c0d83d46343 Gerrit-Change-Number: 11302 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 10 Oct 2018 15:25:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 15:29:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 10 Oct 2018 15:29:04 +0000 Subject: Change in libosmocore[master]: gsm_08_58.h: Introduce struct abis_rsl_link_id In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11302 ) Change subject: gsm_08_58.h: Introduce struct abis_rsl_link_id ...................................................................... Patch Set 1: btw, we can have similar stuff for chan_nr (08.58 9.3.1 Channel Number), which I found quite difficult to descipher while reading code. Opinions regarding this topic are welcome. -- To view, visit https://gerrit.osmocom.org/11302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibd75a493bcfdf46c028ea466867d0c0d83d46343 Gerrit-Change-Number: 11302 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 10 Oct 2018 15:29:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 17:47:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 17:47:28 +0000 Subject: Change in libosmocore[master]: gsm_08_58.h: Introduce struct abis_rsl_link_id In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11302 ) Change subject: gsm_08_58.h: Introduce struct abis_rsl_link_id ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11302/1/include/osmocom/gsm/protocol/gsm_08_58.h File include/osmocom/gsm/protocol/gsm_08_58.h: https://gerrit.osmocom.org/#/c/11302/1/include/osmocom/gsm/protocol/gsm_08_58.h at 35 PS1, Line 35: struct abis_rsl_link_id { > Perhaps a union is better here? [?] yes, a struct with a single union member looks a bit odd. but I don't really care too much... -- To view, visit https://gerrit.osmocom.org/11302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibd75a493bcfdf46c028ea466867d0c0d83d46343 Gerrit-Change-Number: 11302 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 10 Oct 2018 17:47:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 17:47:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 17:47:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: f_tx_lapdm: Build SacchL1Header with proper values In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11301 ) Change subject: bts: f_tx_lapdm: Build SacchL1Header with proper values ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2c77d9d6262bd4763b3fb53a4a595d2c61f45f4b Gerrit-Change-Number: 11301 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 10 Oct 2018 17:47:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 17:47:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 17:47:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: f_tx_lapdm: Build SacchL1Header with proper values In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11301 ) Change subject: bts: f_tx_lapdm: Build SacchL1Header with proper values ...................................................................... bts: f_tx_lapdm: Build SacchL1Header with proper values Change-Id: I2c77d9d6262bd4763b3fb53a4a595d2c61f45f4b --- M bts/BTS_Tests.ttcn 1 file changed, 11 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 61fe1a7..82a54f3 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3318,14 +3318,18 @@ var octetstring l2 := enc_LapdmFrame(valueof(l)); if (valueof(link_id.c) == SACCH) { /* prepend dummy L1 header */ - l2 := '0000'O & l2; + var L1ctlDataReq l1hl2 := { + l1header := valueof(ts_SacchL1Header(g_pars.l1_pars.ms_power_level, false, g_pars.l1_pars.ms_actual_ta)), + l2_payload := f_pad_oct(l2, 21, '2B'O) + } + L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, link_id, l1hl2)); + } else { + /* If required, pad L2 frame with constant 0x2b filling */ + l2 := f_pad_oct(l2, 23, '2B'O); + + log("encoding ", l, " to ", l2); + L1CTL.send(ts_L1CTL_DATA_REQ(g_chan_nr, link_id, l2)); } - - /* If required, pad L2 frame with constant 0x2b filling */ - l2 := f_pad_oct(l2, 23, '2B'O); - - log("encoding ", l, " to ", l2); - L1CTL.send(ts_L1CTL_DATA_REQ(g_chan_nr, link_id, l2)); } type record RllTestCase { -- To view, visit https://gerrit.osmocom.org/11301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2c77d9d6262bd4763b3fb53a4a595d2c61f45f4b Gerrit-Change-Number: 11301 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 18:42:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 10 Oct 2018 18:42:57 +0000 Subject: Change in libosmocore[master]: gsm_08_58.h: Introduce struct abis_rsl_link_id In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11302 to look at the new patch set (#2). Change subject: gsm_08_58.h: Introduce struct abis_rsl_link_id ...................................................................... gsm_08_58.h: Introduce struct abis_rsl_link_id It will allow to make code handling link_id values more easier to read and less prone to errors. union is used to be able to get the full octet in case we need to pass it somewhere else or encode it. An extra union is used in struct abis_rsl_common_hdr to allow using fields directly while keeping API compatibility. Change-Id: Ibd75a493bcfdf46c028ea466867d0c0d83d46343 --- M include/osmocom/gsm/protocol/gsm_08_58.h 1 file changed, 24 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/02/11302/2 -- To view, visit https://gerrit.osmocom.org/11302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibd75a493bcfdf46c028ea466867d0c0d83d46343 Gerrit-Change-Number: 11302 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 18:42:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 10 Oct 2018 18:42:58 +0000 Subject: Change in libosmocore[master]: gsm_08_58.h: Introduce struct abis_rsl_chan_nr Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11303 Change subject: gsm_08_58.h: Introduce struct abis_rsl_chan_nr ...................................................................... gsm_08_58.h: Introduce struct abis_rsl_chan_nr It will allow to make code handling chan_nr values more easier to read and less prone to errors. union is used to be able to get the full octet in case we need to pass it somewhere else or encode it. An extra union is used in struct abis_rsl_common_hdr and others to allow using fields directly while keeping API compatibility. Change-Id: Icd6822021207270a00106c50f8ca6b93c1250df9 --- M include/osmocom/gsm/protocol/gsm_08_58.h 1 file changed, 32 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/11303/1 diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h index c7a7d8a..cd28caf 100644 --- a/include/osmocom/gsm/protocol/gsm_08_58.h +++ b/include/osmocom/gsm/protocol/gsm_08_58.h @@ -31,6 +31,26 @@ * @{ * \file gsm_08_58.h */ +/* Channel Number 9.3.1 */ +union abis_rsl_chan_nr { +#if OSMO_IS_BIG_ENDIAN + uint8_t cbits:5, + tn:3; +#elif OSMO_IS_LITTLE_ENDIAN + uint8_t tn:3, + cbits:5; +#endif + uint8_t chan_nr; +} __attribute__ ((packed)); +#define ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs 0x01 +#define ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(ss) (0x02 + (ss)) +#define ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(ss) (0x04 + (ss)) +#define ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(ss) (0x08 + (ss)) +#define ABIS_RSL_CHAN_NR_CBITS_BCCH 0x10 +#define ABIS_RSL_CHAN_NR_CBITS_RACH 0x11 +#define ABIS_RSL_CHAN_NR_CBITS_PCH_AGCH 0x12 +#define ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH 0x18 /*< non-standard, for dyn TS */ + /* Link Identifier 9.3.2 */ union abis_rsl_link_id { #if OSMO_IS_BIG_ENDIAN @@ -60,7 +80,10 @@ struct abis_rsl_rll_hdr { struct abis_rsl_common_hdr c; uint8_t ie_chan; /*!< \ref RSL_IE_CHAN_NR (tag) */ - uint8_t chan_nr; /*!< RSL channel number (value) */ + union { + uint8_t chan_nr; /* API backward compat */ + union abis_rsl_chan_nr chan_nr_fields; /*!< RSL channel number (value) */ + }; uint8_t ie_link_id; /*!< \ref RSL_IE_LINK_IDENT (tag) */ union { uint8_t link_id; /* API backward compat */ @@ -73,7 +96,10 @@ struct abis_rsl_dchan_hdr { struct abis_rsl_common_hdr c; uint8_t ie_chan; /*!< \ref RSL_IE_CHAN_NR (tag) */ - uint8_t chan_nr; /*!< RSL channel number (value) */ + union { + uint8_t chan_nr; /* API backward compat */ + union abis_rsl_chan_nr chan_nr_fields; /*!< RSL channel number (value) */ + }; uint8_t data[0]; /*!< message payload data */ } __attribute__ ((packed)); @@ -81,7 +107,10 @@ struct abis_rsl_cchan_hdr { struct abis_rsl_common_hdr c; uint8_t ie_chan; /*!< \ref RSL_IE_CHAN_NR (tag) */ - uint8_t chan_nr; /*!< RSL channel number (value) */ + union { + uint8_t chan_nr; /* API backward compat */ + union abis_rsl_chan_nr chan_nr_fields; /*!< RSL channel number (value) */ + }; uint8_t data[0]; /*!< message payload data */ } __attribute__ ((packed)); -- To view, visit https://gerrit.osmocom.org/11303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icd6822021207270a00106c50f8ca6b93c1250df9 Gerrit-Change-Number: 11303 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 20:30:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 20:30:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: IPA_Types/Emulation: Add RSPRO support Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11304 Change subject: IPA_Types/Emulation: Add RSPRO support ...................................................................... IPA_Types/Emulation: Add RSPRO support RSPRO is the protocol used by osmo-remsim. It is embedded into an IPA multiplex, and hence the TTCN-3 IPA code needs some extension to cover support for it. Change-Id: I536d6843b3e65b3ee35fbbcd6353e0fb0ce21c8e --- M library/IPA_Emulation.ttcnpp M library/IPA_Types.ttcn 2 files changed, 49 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/11304/1 diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp index 7a26a6b..413d290 100644 --- a/library/IPA_Emulation.ttcnpp +++ b/library/IPA_Emulation.ttcnpp @@ -8,7 +8,7 @@ * GSUP. IT hence transcodes messages so the user can work with abstract data types rather * than binary messages. It handles multiple packets inside one TCP segment. * - * (C) 2017 by Harald Welte + * (C) 2017-2018 by Harald Welte * All rights reserved. * * Released under the terms of GNU General Public License, Version 2 or @@ -39,6 +39,12 @@ import from GSUP_Types all; #endif +#ifdef IPA_EMULATION_RSPRO +import from RSPRO all; +import from RSPRO_Types all; +#endif + + import from Osmocom_CTRL_Types all; modulepar { @@ -137,6 +143,14 @@ } with { extension "internal" } #endif +#ifdef IPA_EMULATION_RSPRO +type port IPA_RSPRO_PT message { + inout RsproPDU, ASP_IPA_Event; +} with { extension "internal" } +#endif + + + type component IPA_Emulation_CT { /* down-facing port to IPA codec port */ @@ -159,6 +173,10 @@ /* up-facing port for GSUP */ port IPA_GSUP_PT IPA_GSUP_PORT; #endif +#ifdef IPA_EMULATION_RSPRO + /* up-facing port for RSPRO */ + port IPA_RSPRO_PT IPA_RSPRO_PORT; +#endif /* up-facing port for other streams */ port IPA_SP_PT IPA_SP_PORT; @@ -266,6 +284,11 @@ IPA_GSUP_PORT.send(evt); } #endif +#ifdef IPA_EMULATION_RSPRO + if (IPA_RSPRO_PORT.checkstate("Connected")) { + IPA_RSPRO_PORT.send(evt); + } +#endif /* FIXME: to other ports */ } @@ -455,6 +478,13 @@ } #endif +#ifdef IPA_EMULATION_RSPRO +private function f_rspro_to_user(octetstring msg) runs on IPA_Emulation_CT { + var RsproPDU rspro := dec_RsproPDU(msg); + IPA_RSPRO_PORT.send(rspro); +} +#endif + #ifdef IPA_EMULATION_MGCP private function f_mgcp_to_user(octetstring msg) runs on IPA_Emulation_CT { var charstring msg_ch := oct2char(msg); @@ -497,6 +527,9 @@ #ifdef IPA_EMULATION_RSL var ASP_RSL_Unitdata rsl; #endif +#ifdef IPA_EMULATION_RSPRO + var RsproPDU rspro; +#endif /* Set function for dissecting the binary */ var f_IPL4_getMsgLen vl_f := refers(f_IPL4_fixedMsgLen); @@ -559,6 +592,11 @@ f_gsup_to_user(ipa_rx.msg); } #endif +#ifdef IPA_EMULATION_RSPRO + case (IPAC_PROTO_EXT_RSPRO) { + f_rspro_to_user(ipa_rx.msg); + } +#endif case else { IPA_SP_PORT.send(f_to_asp(ipa_rx)); } @@ -639,6 +677,14 @@ } #endif +#ifdef IPA_EMULATION_RSPRO + [] IPA_RSPRO_PORT.receive(RsproPDU:?) -> value rspro { + payload := enc_RsproPDU(rspro); + ipa_ud := valueof(t_ASP_IPA_UD(IPAC_PROTO_OSMO, payload, IPAC_PROTO_EXT_RSPRO)); + IPA_PORT.send(f_from_asp(g_ipa_conn_id, ipa_ud)); + } +#endif + #ifdef IPA_EMULATION_RSL /* Received RSL -> down into IPA */ [] IPA_RSL_PORT.receive(ASP_RSL_Unitdata:?) -> value rsl { diff --git a/library/IPA_Types.ttcn b/library/IPA_Types.ttcn index 3230329..1325b14 100644 --- a/library/IPA_Types.ttcn +++ b/library/IPA_Types.ttcn @@ -32,7 +32,8 @@ IPAC_PROTO_EXT_SMSC ('03'H), IPAC_PROTO_EXT_ORC ('04'H), IPAC_PROTO_EXT_GSUP ('05'H), - IPAC_PROTO_EXT_OAP ('06'H) + IPAC_PROTO_EXT_OAP ('06'H), + IPAC_PROTO_EXT_RSPRO ('07'H) } with { variant "FIELDLENGTH(8)" } external function enc_PDU_IPA(in PDU_IPA pdu) return octetstring -- To view, visit https://gerrit.osmocom.org/11304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I536d6843b3e65b3ee35fbbcd6353e0fb0ce21c8e Gerrit-Change-Number: 11304 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 20:31:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 20:31:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add SGsAP_Templates for SGsAP on the MME<->MSC interface Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11305 Change subject: Add SGsAP_Templates for SGsAP on the MME<->MSC interface ...................................................................... Add SGsAP_Templates for SGsAP on the MME<->MSC interface Change-Id: I435dab312fc4965c69ffb9cc22917539ebab93e7 --- M deps/Makefile A library/SGsAP_Templates.ttcn M msc/gen_links.sh 3 files changed, 867 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/11305/1 diff --git a/deps/Makefile b/deps/Makefile index cb9e359..f2f38bd 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -40,6 +40,7 @@ titan.ProtocolModules.LLC_v7.1.0 \ titan.ProtocolModules.MobileL3_v13.4.0 \ titan.ProtocolModules.NS_v7.3.0 \ + titan.ProtocolModules.SGsAP_13.2.0 \ titan.ProtocolModules.SNDCP_v7.0.0 \ titan.ProtocolEmulations.SCCP @@ -77,6 +78,7 @@ titan.ProtocolModules.RTP_commit= R.5.A titan.ProtocolModules.ROSE_commit= R.1.C titan.ProtocolModules.SCTP_commit= R.2.A +titan.ProtocolModules.SGsAP_13.2.0_commit= 81544cf008378058b95ff20d33f3770fadb7e235 titan.ProtocolModules.SDP_commit= R.14.A titan.ProtocolModules.SMPP_commit= R.2.A-2-gb7aee69 titan.ProtocolModules.SNDCP_v7.0.0_commit= R.2.A diff --git a/library/SGsAP_Templates.ttcn b/library/SGsAP_Templates.ttcn new file mode 100644 index 0000000..aac045e --- /dev/null +++ b/library/SGsAP_Templates.ttcn @@ -0,0 +1,860 @@ +module SGsAP_Templates { + +/* Templates for the SGsAP protocol as per 3GPP TS 29.118 + * (C) 2018 by Harald Welte + * All rights reserved. + * + * Released under the terms of the GNU General Public License, Version 2 or + * (at your option) any later version. + */ + +import from SGsAP_Types all; +import from GSM_Types all; +import from General_Types all; +import from MobileL3_CommonIE_Types all; + +/* 9.4.2 */ +template (value) EPS_LocationUpdateType ts_SGsAP_IE_EpsLuType(template (value) EPS_location_update_type lut) := { + iEI := '00001010'B, + lengthIndicator := 1, + locationUpdateType := lut +} +template EPS_LocationUpdateType tr_SGsAP_IE_EpsLuType(template EPS_location_update_type lut) := { + iEI := '00001010'B, + lengthIndicator := 1, + locationUpdateType := lut +} + +/* 9.4.3 */ +template (value) ErroneousMessage ts_SGsAP_IE_ErrMsg(template (value) octetstring err_msg) := { + iEI := '00011011'B, + lengthIndicator := lengthof(valueof(err_msg)), + erroneousMessage := err_msg +} +template ErroneousMessage tr_SGsAP_IE_ErrMsg(template octetstring err_msg) := { + iEI := '00011011'B, + lengthIndicator := ?, + erroneousMessage := err_msg +} + + +/* 9.4.6 */ +private function ts_SGsAP_IMSI(hexstring digits) return template (value) IMSI { + var template (value) IMSI imsi := { + iEI := '00000001'B, + lengthIndicator := lengthof(digits)/2 + 1, + iMSI := { + field1 := '001'B, + parity := '0'B, /* even */ + digits := digits, + fillerDigit := '1111'B /* even */ + } + } + if (lengthof(digits) mod 2 == 1) { + /* odd number of digits */ + imsi.iMSI.parity := '1'B; + imsi.iMSI.fillerDigit := omit; + } + return imsi; +} +private function ts_SGsAP_IMSI_omit(template (omit) hexstring digits) return template (omit) IMSI { + if (istemplatekind(digits, "omit")) { + return omit; + } else { + return ts_SGsAP_IMSI(valueof(digits)); + } +} +private function tr_SGsAP_IMSI(template hexstring digits) return template IMSI { + if (istemplatekind(digits, "omit")) { + return omit; + } else if (istemplatekind(digits, "*")) { + return *; + } + var template IMSI imsi := { + iEI := '00000001'B, + lengthIndicator := lengthof(digits)/2 + 1, + iMSI := { + field1 := '001'B, + parity := '0'B, /* even */ + digits := digits, + fillerDigit := '1111'B /* even */ + } + } + if (lengthof(digits) mod 2 == 1) { + /* odd number of digits */ + /* odd number of digits */ + imsi.iMSI.parity := '1'B; + imsi.iMSI.fillerDigit := omit; + } + return imsi; +} + +/* 9.4.7 */ +template (value) IMSI_DetachFromEPS_ServiceType ts_SGsAP_IE_DetServiceType(template (value) IMSI_detachFromEPS_serviceType st) := { + iEI := '00010000'B, + lengthIndicator := 1, + serviceType := st +} +template IMSI_DetachFromEPS_ServiceType tr_SGsAP_IE_DetServiceType(template IMSI_detachFromEPS_serviceType st) := { + iEI := '00010000'B, + lengthIndicator := 1, + serviceType := st +} + +/* 9.4.8 */ +template (value) IMSI_DetachFromNonEPS_ServiceType ts_SGsAP_IE_DetNonEpsServiceType(template (value) IMSI_detachFromNonEPS_serviceType st) := { + iEI := '00010001'B, + lengthIndicator := 1, + serviceType := st +} +template IMSI_DetachFromNonEPS_ServiceType tr_SGsAP_IE_DetNonEpsServiceType(template IMSI_detachFromNonEPS_serviceType st) := { + iEI := '00010001'B, + lengthIndicator := 1, + serviceType := st +} + +/* 9.4.11 */ +private function f_enc_mnc_digit3(GsmMnc mnc) return HEX1 { + if (lengthof(mnc) == 2) { + return 'F'H; + } else { + return mnc[2]; + } +} +template (value) LocationAreaIdValue ts_SGsAP_LAI(GsmMcc mcc, GsmMnc mnc, GsmLac lac) := { + mccDigit1 := mcc[0], + mccDigit2 := mcc[1], + mccDigit3 := mcc[2], + mncDigit3 := f_enc_mnc_digit3(mnc), + mncDigit1 := mnc[0], + mncDigit2 := mnc[1], + lac := int2oct(lac, 2) +} +template (value) LocationAreaId ts_SGsAP_IE_Lai(template (value) LocationAreaIdValue lai) := { + iEI := '00000100'B, + lengthIndicator := 5, + locationAreaId := lai +} +template LocationAreaId tr_SGsAP_IE_Lai(template LocationAreaIdValue lai) := { + iEI := '00000100'B, + lengthIndicator := 5, + locationAreaId := lai +} +function ts_SGsAP_IE_Lai_omit(template (omit) LocationAreaIdValue lai) return template (omit) LocationAreaId { + if (istemplatekind(lai, "omit")) { + return omit; + } else { + return ts_SGsAP_IE_Lai(lai); + } +} +function tr_SGsAP_IE_Lai_omit(template LocationAreaIdValue lai) return template LocationAreaId { + if (istemplatekind(lai, "omit")) { + return omit; + } else if (istemplatekind(lai, "*")) { + return *; + } else { + return tr_SGsAP_IE_Lai(lai); + } +} + + + +/* 9.4.12 */ +template (value) MM_Information ts_SGsAP_IE_MmInfo(template (value) octetstring mm_info) := { + iEI := '00010111'B, + lengthIndicator := lengthof(valueof(mm_info)), + information := mm_info +} +template MM_Information tr_SGsAP_IE_MmInfo(template octetstring mm_info) := { + iEI := '00010111'B, + lengthIndicator := ?, + information := mm_info +} + + + +/* 9.4.13 */ +template (value) MME_Name ts_SGsAP_IE_MmeName(template (value) charstring name) := { + iEI := '00001001'B, + lengthIndicator := lengthof(valueof(name)), + name := name +}; +template MME_Name tr_SGsAP_IE_MmeName(template charstring name) := { + iEI := '00001001'B, + lengthIndicator := ?, + name := name +}; + +/* 9.4.14 */ +function f_l3_to_sgs_id(MobileIdentityLV l3) return MobileIdentityValue { + var OddEvenInd_Identity l3v := l3.mobileIdentityV.oddEvenInd_identity; + var MobileIdentityValue ret; + ret.typeOfIdentity := l3.mobileIdentityV.typeOfIdentity; + if (ischosen(l3v.imei)) { + ret.iD.imei.oddevenIndicator := l3v.imei.oddevenIndicator; + ret.iD.imei.digits := l3v.imei.digits; + } else if (ischosen(l3v.imsi)) { + ret.iD.imsi.oddevenIndicator := l3v.imsi.oddevenIndicator; + ret.iD.imsi.digits := l3v.imsi.digits; + ret.iD.imsi.fillerDigit := l3v.imsi.fillerDigit; + } else if (ischosen(l3v.imei_sv)) { + ret.iD.imei_sv.oddevenIndicator := l3v.imei_sv.oddevenIndicator; + ret.iD.imei_sv.digits := l3v.imei_sv.digits; + ret.iD.imei_sv.fillerDigit := l3v.imei_sv.fillerDigit; + } else if (ischosen(l3v.tmsi_ptmsi)) { + ret.iD.tmsi_ptmsi.oddevenIndicator := l3v.tmsi_ptmsi.oddevenIndicator; + ret.iD.tmsi_ptmsi.fillerDigit := l3v.tmsi_ptmsi.fillerDigit; + ret.iD.tmsi_ptmsi.octets := l3v.tmsi_ptmsi.octets; + } else if (ischosen(l3v.tmgi_and_MBMS_SessionID)) { + ret.iD.tmgi_and_MBMS_SessionID.oddevenIndicator := l3v.tmgi_and_MBMS_SessionID.oddevenIndicator; + ret.iD.tmgi_and_MBMS_SessionID.mCC_MNCIndicator := l3v.tmgi_and_MBMS_SessionID.mCC_MNCIndicator; + ret.iD.tmgi_and_MBMS_SessionID.mBMS_SessionIdentityIndicator := l3v.tmgi_and_MBMS_SessionID.mBMS_SessionIdentityIndicator; + ret.iD.tmgi_and_MBMS_SessionID.spare := l3v.tmgi_and_MBMS_SessionID.spare; + ret.iD.tmgi_and_MBMS_SessionID.mBMS_ServiceID := l3v.tmgi_and_MBMS_SessionID.mBMS_ServiceID; + ret.iD.tmgi_and_MBMS_SessionID.mccDigit1 := l3v.tmgi_and_MBMS_SessionID.mccDigit1; + ret.iD.tmgi_and_MBMS_SessionID.mccDigit2 := l3v.tmgi_and_MBMS_SessionID.mccDigit2; + ret.iD.tmgi_and_MBMS_SessionID.mccDigit3 := l3v.tmgi_and_MBMS_SessionID.mccDigit3; + ret.iD.tmgi_and_MBMS_SessionID.mccDigit3 := l3v.tmgi_and_MBMS_SessionID.mccDigit3; + ret.iD.tmgi_and_MBMS_SessionID.mccDigit1 := l3v.tmgi_and_MBMS_SessionID.mccDigit1; + ret.iD.tmgi_and_MBMS_SessionID.mccDigit2 := l3v.tmgi_and_MBMS_SessionID.mccDigit2; + ret.iD.tmgi_and_MBMS_SessionID.mBMS_SessionIdentity := l3v.tmgi_and_MBMS_SessionID.mBMS_SessionIdentity; + } else if (ischosen(l3v.no_identity)) { + ret.iD.no_identity.oddevenIndicator := l3v.no_identity.oddevenIndicator; + ret.iD.no_identity.fillerDigits := l3v.no_identity.fillerDigits; + } + return ret; +} +template MobileIdentity ts_SGsAP_IE_MobileID(template (value) MobileIdentityLV l3_mi) := { + iEI := '00001110'B, + lengthIndicator := 0, /* overwritten */ + iD := f_l3_to_sgs_id(valueof(l3_mi)) +} + + +/* 9.4.15 */ +template (value) NAS_MessageContainer ts_SGsAP_NasContainer(template (value) octetstring nas_pdu) := { + iEI := '00010110'B, + lengthIndicator := lengthof(valueof(nas_pdu)), + nAS_MessageContainer := nas_pdu +} +template NAS_MessageContainer tr_SGsAP_NasContainer(template octetstring nas_pdu) := { + iEI := '00010110'B, + lengthIndicator := ?, + nAS_MessageContainer := nas_pdu +} + +/* 9.4.16 */ +template (value) RejectCause ts_SGsAP_IE_RejCause(template (value) Reject_Cause cause) := { + iEI := '00001111'B, + lengthIndicator := 1, + cause := cause +} +template RejectCause tr_SGsAP_IE_RejCause(template Reject_Cause cause) := { + iEI := '00001111'B, + lengthIndicator := 1, + cause := cause +} + +/* 9.4.17 */ +template (value) ServiceIndicator ts_SGsAP_ServiceInd(template (value) Service_Indicator si) := { + iEI := '00100000'B, + lengthIndicator := 1, + indicator := si +} +template ServiceIndicator tr_SGsAP_ServiceInd(template Service_Indicator si) := { + iEI := '00100000'B, + lengthIndicator := 1, + indicator := si +} + + +/* 9.4.18 */ +template (value) SGsCause ts_SGsAP_IE_SgsCause(template (value) SGs_Cause cause) := { + iEI := '00001000'B, + lengthIndicator := 1, + cause := cause +} +function tr_SGsAP_IE_SgsCause(template SGs_Cause cause) return template SGsCause { + if (istemplatekind(cause, "omit")) { + return omit; + } else if (istemplatekind(cause, "*")) { + return *; + } else { + var template SGsCause ret := { + iEI := '00001000'B, + lengthIndicator := 1, + cause := cause + } + return ret; + } +} + +/* 9.4.21c */ +template (value) UE_EMM_Mode ts_SGsAP_IE_UeEmmMode(template (value) UE_EMM_mode mode) := { + iEI := '00100101'B, + lengthIndicator := 1, + mode := mode +} +template UE_EMM_Mode tr_SGsAP_IE_UeEmmMode(template UE_EMM_mode mode) := { + iEI := '00100101'B, + lengthIndicator := 1, + mode := mode +} + + +/* 9.4.22 */ +template (value) VLR_Name ts_SGsAP_IE_VlrName(template (value) charstring name) := { + iEI := '00000010'B, + lengthIndicator := lengthof(name), + name := name +} +template VLR_Name tr_SGsAP_IE_VlrName(template charstring name) := { + iEI := '00000010'B, + lengthIndicator := ?, + name := name +} + + + + + +/* 3GPP TS 29.118 Section 8.1 */ +template (value) PDU_SGsAP ts_SGsAP_ALERT_ACK(hexstring imsi) := { + sGsAP_ALERT_ACK := { + messageType := '00001110'B, + iMSI := ts_SGsAP_IMSI(imsi) + } +} +template PDU_SGsAP tr_SGsAP_ALERT_ACK(template hexstring imsi) := { + sGsAP_ALERT_ACK := { + messageType := '00001110'B, + iMSI := tr_SGsAP_IMSI(imsi) + } +} + +/* 3GPP TS 29.118 Section 8.2 */ +template PDU_SGsAP ts_SGsAP_ALERT_REJECT(hexstring imsi, + template (value) SGs_Cause cause) := { + sGsAP_ALERT_REJECT := { + messageType := '00001111'B, + iMSI := ts_SGsAP_IMSI(imsi), + sGsCause := ts_SGsAP_IE_SgsCause(cause) + } +} +template PDU_SGsAP tr_SGsAP_ALERT_REJECT(template hexstring imsi, + template SGs_Cause cause := ?) := { + sGsAP_ALERT_REJECT := { + messageType := '00001111'B, + iMSI := tr_SGsAP_IMSI(imsi), + sGsCause := tr_SGsAP_IE_SgsCause(cause) + } +} + +/* 3GPP TS 29.118 Section 8.3 */ +template (value) PDU_SGsAP ts_SGsAP_ALERT_REQ(hexstring imsi) := { + sGsAP_ALERT_REQUEST := { + messageType := '00001101'B, + iMSI := ts_SGsAP_IMSI(imsi) + } +} +template PDU_SGsAP tr_SGsAP_ALERT_REQ(template hexstring imsi) := { + sGsAP_ALERT_REQUEST := { + messageType := '00001101'B, + iMSI := tr_SGsAP_IMSI(imsi) + } +} + +/* 3GPP TS 29.118 Section 8.4 */ +template (value) PDU_SGsAP ts_SGsAP_DL_UD(hexstring imsi, + template (value) octetstring nas_pdu) := { + sGsAP_DOWNLINK_UNITDATA := { + messageType := '00000111'B, + iMSI := ts_SGsAP_IMSI(imsi), + nAS_MessageContainer := ts_SGsAP_NasContainer(nas_pdu) + } +} +template PDU_SGsAP tr_SGsAP_DL_UD(template hexstring imsi, template octetstring nas_pdu := ?) := { + sGsAP_DOWNLINK_UNITDATA := { + messageType := '00000111'B, + iMSI := tr_SGsAP_IMSI(imsi), + nAS_MessageContainer := tr_SGsAP_NasContainer(nas_pdu) + } +} + +/* 8.5 */ +template (value) PDU_SGsAP ts_SGsAP_EPS_DETACH_ACK(hexstring imsi) := { + sGsAP_EPS_DETACH_ACK:= { + messageType := '00010010'B, + iMSI := ts_SGsAP_IMSI(imsi) + } +} +template PDU_SGsAP tr_SGsAP_EPS_DETACH_ACK(template hexstring imsi) := { + sGsAP_EPS_DETACH_ACK:= { + messageType := '00010010'B, + iMSI := tr_SGsAP_IMSI(valueof(imsi)) + } +} + +/* 8.6 */ +template (value) PDU_SGsAP ts_SGsAP_EPS_DETACH_IND(hexstring imsi, + template (value) charstring mme_name, + template (value) IMSI_detachFromEPS_serviceType det_serv_typ) := { + sGsAP_EPS_DETACH_INDICATION:= { + messageType := '00010001'B, + iMSI := ts_SGsAP_IMSI(imsi), + mME_Name := ts_SGsAP_IE_MmeName(mme_name), + iMSI_DetachFromEPS_ServiceType := ts_SGsAP_IE_DetServiceType(det_serv_typ) + } +} +template PDU_SGsAP tr_SGsAP_EPS_DETACH_IND(template hexstring imsi, + template charstring mme_name, + template IMSI_detachFromEPS_serviceType det_serv_typ) := { + sGsAP_EPS_DETACH_INDICATION:= { + messageType := '00010001'B, + iMSI := tr_SGsAP_IMSI(valueof(imsi)), + mME_Name := tr_SGsAP_IE_MmeName(mme_name), + iMSI_DetachFromEPS_ServiceType := tr_SGsAP_IE_DetServiceType(det_serv_typ) + } +} + +/* 8.7 */ +template (value) PDU_SGsAP ts_SGsAP_IMSI_DETACH_ACK(hexstring imsi) := { + sGsAP_IMSI_DETACH_ACK := { + messageType := '00010100'B, + iMSI := ts_SGsAP_IMSI(imsi) + } +} +template PDU_SGsAP tr_SGsAP_IMSI_DETACH_ACK(template hexstring imsi) := { + sGsAP_IMSI_DETACH_ACK := { + messageType := '00010100'B, + iMSI := tr_SGsAP_IMSI(imsi) + } +} + +/* 8.8 */ +template (value) PDU_SGsAP ts_SGsAP_IMSI_DETACH_IND(hexstring imsi, + template (value) charstring mme_name, + template (value) IMSI_detachFromNonEPS_serviceType det_serv_typ) := { + sGsAP_IMSI_DETACH_INDICATION := { + messageType := '00010011'B, + iMSI := ts_SGsAP_IMSI(imsi), + mME_Name := ts_SGsAP_IE_MmeName(mme_name), + iMSI_DetachFromNonEPS_ServiceType := ts_SGsAP_IE_DetNonEpsServiceType(det_serv_typ) + } +} +template PDU_SGsAP tr_SGsAP_IMSI_DETACH_IND(template hexstring imsi, + template charstring mme_name := ?, + template IMSI_detachFromNonEPS_serviceType det_serv_typ := ?) := { + sGsAP_IMSI_DETACH_INDICATION := { + messageType := '00010011'B, + iMSI := tr_SGsAP_IMSI(imsi), + mME_Name := tr_SGsAP_IE_MmeName(mme_name), + iMSI_DetachFromNonEPS_ServiceType := tr_SGsAP_IE_DetNonEpsServiceType(det_serv_typ) + } +} + +/* 8.9 */ +template (value) PDU_SGsAP ts_SGsAP_LU_ACCEPT(hexstring imsi, + template (value) LocationAreaIdValue lai, + template (value) MobileIdentityLV mobile_id) := { + sGsAP_LOCATION_UPDATE_ACCEPT := { + messageType := '00001010'B, + iMSI := ts_SGsAP_IMSI(imsi), + locationAreaId := ts_SGsAP_IE_Lai(lai), + newTMSIorIMSI := ts_SGsAP_IE_MobileID(mobile_id) + } +} +template PDU_SGsAP tr_SGsAP_LU_ACCEPT(template hexstring imsi, + template LocationAreaIdValue lai := ?) := { + sGsAP_LOCATION_UPDATE_ACCEPT := { + messageType := '00001010'B, + iMSI := tr_SGsAP_IMSI(imsi), + locationAreaId := tr_SGsAP_IE_Lai(lai), + newTMSIorIMSI := * + } +} + +/* 8.10 */ +template (value) PDU_SGsAP ts_SGsAP_LU_REJECT(hexstring imsi, + template (value) Reject_Cause rej_cause, + template (omit) LocationAreaIdValue lai) := { + sGsAP_LOCATION_UPDATE_REJECT := { + messageType := '00001011'B, + iMSI := ts_SGsAP_IMSI(imsi), + rejectCause := ts_SGsAP_IE_RejCause(rej_cause), + locationAreaId := ts_SGsAP_IE_Lai_omit(lai) + } +} +template PDU_SGsAP tr_SGsAP_LU_REJECT(template hexstring imsi, + template Reject_Cause rej_cause, + template LocationAreaIdValue lai) := { + sGsAP_LOCATION_UPDATE_REJECT := { + messageType := '00001011'B, + iMSI := tr_SGsAP_IMSI(imsi), + rejectCause := tr_SGsAP_IE_RejCause(rej_cause), + locationAreaId := tr_SGsAP_IE_Lai_omit(lai) + } +} + +/* 8.11 */ +template (value) PDU_SGsAP ts_SGsAP_LU_REQ(hexstring imsi, + template (value) charstring mme_name, + template (value) EPS_location_update_type eps_lu_type, + template (value) LocationAreaIdValue new_lai) := { + sGsAP_LOCATION_UPDATE_REQUEST := { + messageType := '00001001'B, + iMSI := ts_SGsAP_IMSI(imsi), + mME_Name := ts_SGsAP_IE_MmeName(mme_name), + ePS_LocationUpdateType := ts_SGsAP_IE_EpsLuType(eps_lu_type), + newLocationAreaId := ts_SGsAP_IE_Lai(new_lai), + oldLocationAreaId := omit, + tMSI_Status := omit, + iMEI_SV := omit, + tAI := omit, + eCGI := omit, + tMSI_NRI := omit, + cS_DomainOperator := omit + } +} +template PDU_SGsAP tr_SGsAP_LU_REQ(template hexstring imsi, + template charstring mme_name := ?, + template EPS_location_update_type eps_lu_type := ?, + template LocationAreaIdValue new_lai := ?) := { + sGsAP_LOCATION_UPDATE_REQUEST := { + messageType := '00001001'B, + iMSI := tr_SGsAP_IMSI(imsi), + mME_Name := tr_SGsAP_IE_MmeName(mme_name), + ePS_LocationUpdateType := tr_SGsAP_IE_EpsLuType(eps_lu_type), + newLocationAreaId := tr_SGsAP_IE_Lai_omit(new_lai), + oldLocationAreaId := *, + tMSI_Status := *, + iMEI_SV := *, + tAI := *, + eCGI := *, + tMSI_NRI := *, + cS_DomainOperator := * + } +} + +/* 8.12 */ +template (value) PDU_SGsAP ts_SGsAP_MM_INFO_REQ(hexstring imsi, + template (value) octetstring mm_info) := { + sGsAP_MM_INFORMATION_REQUEST := { + messageType := '00011010'B, + iMSI := ts_SGsAP_IMSI(imsi), + mM_Information := ts_SGsAP_IE_MmInfo(mm_info) + } +} +template PDU_SGsAP tr_SGsAP_MM_INFO_REQ(template hexstring imsi, + template octetstring mm_info :=?) := { + sGsAP_MM_INFORMATION_REQUEST := { + messageType := '00011010'B, + iMSI := tr_SGsAP_IMSI(imsi), + mM_Information := tr_SGsAP_IE_MmInfo(mm_info) + } +} + +/* 8.13 */ +template (value) PDU_SGsAP ts_SGsAP_PAGING_REJ(hexstring imsi, + template (value) SGs_Cause cause) := { + sGsAP_PAGING_REJECT := { + messageType := '00000010'B, + iMSI := ts_SGsAP_IMSI(imsi), + sGsCause := ts_SGsAP_IE_SgsCause(cause) + } +} +template PDU_SGsAP tr_SGsAP_PAGING_REJ(template hexstring imsi, + template SGs_Cause cause := ?) := { + sGsAP_PAGING_REJECT := { + messageType := '00000010'B, + iMSI := tr_SGsAP_IMSI(imsi), + sGsCause := tr_SGsAP_IE_SgsCause(cause) + } +} + +/* 8.14 */ +template (value) PDU_SGsAP ts_SGsAP_PAGING_REQ(hexstring imsi, + template (value) charstring vlr_name, + template (value) Service_Indicator serv_ind, + template (omit) OCT4 tmsi) := +{ + sGsAP_PAGING_REQUEST := { + messageType := '00000001'B, + iMSI := ts_SGsAP_IMSI(imsi), + vLR_Name := ts_SGsAP_IE_VlrName(vlr_name), + serviceIndicator := ts_SGsAP_ServiceInd(serv_ind), + tMSI := omit, + cLI := omit, + locationAreaId := omit, + globalCN_Id := omit, + sS_Code := omit, + lCS_Indicator := omit, + lCS_ClientIdentity := omit, + channelNeeded := omit, + eMLPP_Priority := omit, + additionalPagingIndicator := omit + } +} +template PDU_SGsAP tr_SGsAP_PAGING_REQ(template hexstring imsi, + template charstring vlr_name, + template Service_Indicator serv_ind, + template OCT4 tmsi) := +{ + sGsAP_PAGING_REQUEST := { + messageType := '00000001'B, + iMSI := tr_SGsAP_IMSI(imsi), + vLR_Name := tr_SGsAP_IE_VlrName(vlr_name), + serviceIndicator := tr_SGsAP_ServiceInd(serv_ind), + tMSI := *, + cLI := *, + locationAreaId := *, + globalCN_Id := *, + sS_Code := *, + lCS_Indicator := *, + lCS_ClientIdentity := *, + channelNeeded := *, + eMLPP_Priority := *, + additionalPagingIndicator := * + } +} + +/* 8.15 */ +template (value) PDU_SGsAP ts_SGsAP_RESET_ACK_MME(template (value) charstring mme_name) := { + sGsAP_RESET_ACK := { + messageType := '00010110'B, + mME_Name := ts_SGsAP_IE_MmeName(mme_name), + vLR_Name := omit + } +} +template (value) PDU_SGsAP ts_SGsAP_RESET_ACK_VLR(template (value) charstring vlr_name) := { + sGsAP_RESET_ACK := { + messageType := '00010110'B, + mME_Name := omit, + vLR_Name := ts_SGsAP_IE_VlrName(vlr_name) + } +} +template PDU_SGsAP tr_SGsAP_RESET_ACK(template charstring mme_name, template charstring vlr_name) := { + sGsAP_RESET_ACK := { + messageType := '00010110'B, + mME_Name := tr_SGsAP_IE_MmeName(mme_name), + vLR_Name := tr_SGsAP_IE_VlrName(vlr_name) + } +} + +/* 8.16 */ +template (value) PDU_SGsAP ts_SGsAP_RESET_IND_MME(template (value) charstring mme_name) := { + sGsAP_RESET_INDICATION := { + messageType := '00010101'B, + mME_Name := ts_SGsAP_IE_MmeName(mme_name), + vLR_Name := omit + } +} +template (value) PDU_SGsAP ts_SGsAP_RESET_IND_VLR(template (value) charstring vlr_name) := { + sGsAP_RESET_INDICATION := { + messageType := '00010101'B, + mME_Name := omit, + vLR_Name := ts_SGsAP_IE_VlrName(vlr_name) + } +} +template PDU_SGsAP tr_SGsAP_RESET_IND(template charstring mme_name, template charstring vlr_name) := { + sGsAP_RESET_INDICATION := { + messageType := '00010101'B, + mME_Name := tr_SGsAP_IE_MmeName(mme_name), + vLR_Name := tr_SGsAP_IE_VlrName(vlr_name) + } +} + +/* 8.17 */ +template (value) PDU_SGsAP ts_SGsAP_SERVICE_REQ(hexstring imsi, + template (value) Service_Indicator serv_ind, + template (value) UE_EMM_mode emm_mode) := { + sGsAP_SERVICE_REQUEST := { + messageType := '00000110'B, + iMSI := ts_SGsAP_IMSI(imsi), + serviceIndicator := ts_SGsAP_ServiceInd(serv_ind), + iMEI_SV := omit, + uE_TimeZone := omit, + mobileStationClassmark2 := omit, + tAI := omit, + eCGI := omit, + /* optional, but "the MME shall include this IE." */ + uE_EMM_Mode := ts_SGsAP_IE_UeEmmMode(emm_mode) + } +} +template PDU_SGsAP tr_SGsAP_SERVICE_REQ(template hexstring imsi, + template Service_Indicator serv_ind := ?, + template UE_EMM_mode emm_mode := ?) := { + sGsAP_SERVICE_REQUEST := { + messageType := '00000110'B, + iMSI := tr_SGsAP_IMSI(imsi), + serviceIndicator := tr_SGsAP_ServiceInd(serv_ind), + iMEI_SV := *, + uE_TimeZone := *, + mobileStationClassmark2 := *, + tAI := *, + eCGI := *, + /* optional, but "the MME shall include this IE." */ + uE_EMM_Mode := tr_SGsAP_IE_UeEmmMode(emm_mode) + } +} + + +/* 8.18 */ +template (value) PDU_SGsAP ts_SGsAP_STATUS(template (omit) hexstring imsi, + template (value) SGs_Cause cause, + template (value) octetstring err_msg) := { + sGsAP_STATUS := { + messageType := '00011101'B, + iMSI := ts_SGsAP_IMSI_omit(imsi), + sGsCause := ts_SGsAP_IE_SgsCause(cause), + erroneousMessage := ts_SGsAP_IE_ErrMsg(err_msg) + } +} +template PDU_SGsAP tr_SGsAP_STATUS(template hexstring imsi, + template SGs_Cause cause, + template octetstring err_msg) := { + sGsAP_STATUS := { + messageType := '00011101'B, + iMSI := tr_SGsAP_IMSI(imsi), + sGsCause := tr_SGsAP_IE_SgsCause(cause), + erroneousMessage := tr_SGsAP_IE_ErrMsg(err_msg) + } +} + + +/* 8.19 */ +template (value) PDU_SGsAP ts_SGsAP_TMSI_REALL_CMPL(hexstring imsi) := { + sGsAP_TMSI_REALLOCATION_COMPLETE := { + messageType := '00001100'B, + iMSI := ts_SGsAP_IMSI(imsi) + } +} +template PDU_SGsAP tr_SGsAP_TMSI_REALL_CMPL(template hexstring imsi) := { + sGsAP_TMSI_REALLOCATION_COMPLETE := { + messageType := '00001100'B, + iMSI := tr_SGsAP_IMSI(imsi) + } +} + +/* 8.20 */ +template (value) PDU_SGsAP ts_SGsAP_UE_ACT_IND(hexstring imsi) := { + sGsAP_UE_ACTIVITY_INDICATION := { + messageType := '00010000'B, + iMSI := ts_SGsAP_IMSI(imsi) + /* Rel 14: Max UE Avail Time */ + } +} +template PDU_SGsAP tr_SGsAP_UE_ACT_IND(template hexstring imsi) := { + sGsAP_UE_ACTIVITY_INDICATION := { + messageType := '00010000'B, + iMSI := tr_SGsAP_IMSI(imsi) + /* Rel 14: Max UE Avail Time */ + } +} + +/* 8.21 */ +template (value) PDU_SGsAP ts_SGsAP_UE_UNREACHABLE(hexstring imsi, + template (value) SGs_Cause cause) := { + sGsAP_UE_UNREACHABLE := { + messageType := '00011111'B, + iMSI := ts_SGsAP_IMSI(imsi), + sGsCause := ts_SGsAP_IE_SgsCause(cause) + /* Rel 14: Requested Retransmission Time */ + /* Rel 14: Additional UE Unreachable indicators */ + } +} +template PDU_SGsAP tr_SGsAP_UE_UNREACHABLE(template hexstring imsi, + template SGs_Cause cause := ?) := { + sGsAP_UE_UNREACHABLE := { + messageType := '00011111'B, + iMSI := tr_SGsAP_IMSI(imsi), + sGsCause := tr_SGsAP_IE_SgsCause(cause) + /* Rel 14: Requested Retransmission Time */ + /* Rel 14: Additional UE Unreachable indicators */ + } +} + +/* 8.22 */ +template (value) PDU_SGsAP ts_SGsAP_UL_UD(hexstring imsi, + template (value) octetstring nas_msg) := { + sGsAP_UPLINK_UNITDATA := { + messageType := '00001000'B, + iMSI := ts_SGsAP_IMSI(imsi), + nAS_MessageContainer := ts_SGsAP_NasContainer(nas_msg), + iMEI_SV := omit, + uE_TimeZone := omit, + mobileStationClassmark2 := omit, + tAI := omit, + eCGI := omit + } +} +template PDU_SGsAP tr_SGsAP_UL_UD(template hexstring imsi, + template octetstring nas_msg := ?) := { + sGsAP_UPLINK_UNITDATA := { + messageType := '00001000'B, + iMSI := tr_SGsAP_IMSI(imsi), + nAS_MessageContainer := tr_SGsAP_NasContainer(nas_msg), + iMEI_SV := *, + uE_TimeZone := *, + mobileStationClassmark2 := *, + tAI := *, + eCGI := * + } +} + +/* 8.23 */ +template (value) PDU_SGsAP ts_SGsAP_RELEASE_REQ(hexstring imsi, + template (value) SGs_Cause cause) := { + sGsAP_RELEASE_REQUEST := { + messageType := '00011011'B, + iMSI := ts_SGsAP_IMSI(imsi), + sGsCause := ts_SGsAP_IE_SgsCause(cause) + } +} +template PDU_SGsAP tr_SGsAP_RELEASE_REQ(template hexstring imsi, + template SGs_Cause cause) := { + sGsAP_RELEASE_REQUEST := { + messageType := '00011011'B, + iMSI := tr_SGsAP_IMSI(imsi), + sGsCause := tr_SGsAP_IE_SgsCause(cause) + } +} + +/* 8.24 */ +template (value) PDU_SGsAP ts_SGsAP_SERVICE_ABORT_REQ(hexstring imsi) := { + sGsAP_SERVICE_ABORT_REQUEST := { + messageType := '00010111'B, + iMSI := ts_SGsAP_IMSI(imsi) + } +} +template PDU_SGsAP tr_SGsAP_SERVICE_ABORT_REQ(template hexstring imsi) := { + sGsAP_SERVICE_ABORT_REQUEST := { + messageType := '00010111'B, + iMSI := tr_SGsAP_IMSI(imsi) + } +} + +/* 8.25 */ +template (value) PDU_SGsAP ts_SGsAP_MO_CSFB_IND(hexstring imsi) := { + sGsAP_MO_CSFB_INDICATION := { + messageType := '00011000'B, + iMSI := ts_SGsAP_IMSI(imsi), + tAI := omit, + eCGI := omit + } +} +template PDU_SGsAP tr_SGsAP_MO_CSFB_IND(template hexstring imsi) := { + sGsAP_MO_CSFB_INDICATION := { + messageType := '00011000'B, + iMSI := tr_SGsAP_IMSI(imsi), + tAI := *, + eCGI := * + } +} + + + + + + +} diff --git a/msc/gen_links.sh b/msc/gen_links.sh index a191aa5..df646d9 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -81,6 +81,9 @@ FILES="SMPP_EncDec.cc SMPP_Types.ttcn" gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.SGsAP_13.2.0/src +FILES="SGsAP_Types.ttcn" +gen_links $DIR $FILES DIR=../library FILES="General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn MNCC_Types.ttcn MNCC_EncDec.cc MNCC_CodecPort.ttcn mncc.h MNCC_Emulation.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " @@ -90,7 +93,8 @@ FILES+="RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunctDef.cc " FILES+="MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunctDef.cc " FILES+="SMPP_CodecPort.ttcn SMPP_CodecPort_CtrlFunct.ttcn SMPP_CodecPort_CtrlFunctDef.cc SMPP_Emulation.ttcn SMPP_Templates.ttcn " -FILES+="SS_Templates.ttcn SCCP_Templates.ttcn USSD_Helpers.ttcn" +FILES+="SS_Templates.ttcn SCCP_Templates.ttcn USSD_Helpers.ttcn " +FILES+="SGsAP_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/11305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I435dab312fc4965c69ffb9cc22917539ebab93e7 Gerrit-Change-Number: 11305 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 20:31:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 20:31:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add SGsAP_CodecPort module Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11306 Change subject: Add SGsAP_CodecPort module ...................................................................... Add SGsAP_CodecPort module Change-Id: I530f8f444d1c7ea0bf11d510da7b97f64a2039f5 --- A library/SGsAP_CodecPort.ttcn A library/SGsAP_CodecPort_CtrlFunct.ttcn A library/SGsAP_CodecPort_CtrlFunctDef.cc 3 files changed, 172 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/11306/1 diff --git a/library/SGsAP_CodecPort.ttcn b/library/SGsAP_CodecPort.ttcn new file mode 100644 index 0000000..2981fa2 --- /dev/null +++ b/library/SGsAP_CodecPort.ttcn @@ -0,0 +1,72 @@ +module SGsAP_CodecPort { + +/* Simple SGsAP Codec Port, translating between raw SCTP primitives with + * octetstring payload towards the IPL4asp provider, and SGsAP primitives + * which carry the decoded SGsAP data types as payload. + * + * (C) 2018 by Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + */ + + import from IPL4asp_PortType all; + import from IPL4asp_Types all; + import from SGsAP_Types all; + + type record SGsAP_RecvFrom { + ConnectionId connId, + HostName remName, + PortNumber remPort, + HostName locName, + PortNumber locPort, + PDU_SGsAP msg + }; + + template SGsAP_RecvFrom t_SGsAP_RecvFrom(template PDU_SGsAP msg) := { + connId := ?, + remName := ?, + remPort := ?, + locName := ?, + locPort := ?, + msg := msg + } + + type record SGsAP_Send { + ConnectionId connId, + PDU_SGsAP msg + } + + template SGsAP_Send t_SGsAP_Send(template ConnectionId connId, template PDU_SGsAP msg) := { + connId := connId, + msg := msg + } + + private function IPL4_to_SGsAP_RecvFrom(in ASP_RecvFrom pin, out SGsAP_RecvFrom pout) { + pout.connId := pin.connId; + pout.remName := pin.remName; + pout.remPort := pin.remPort; + pout.locName := pin.locName; + pout.locPort := pin.locPort; + pout.msg := dec_PDU_SGsAP(pin.msg); + } with { extension "prototype(fast)" }; + + private function SGsAP_to_IPL4_Send(in SGsAP_Send pin, out ASP_Send pout) { + pout.connId := pin.connId; + pout.proto := { sctp := {} }; + pout.msg := enc_PDU_SGsAP(pin.msg); + } with { extension "prototype(fast)" }; + + type port SGsAP_CODEC_PT message { + out SGsAP_Send; + in SGsAP_RecvFrom, + ASP_ConnId_ReadyToRelease, + ASP_Event; + } with { extension "user IPL4asp_PT + out(SGsAP_Send -> ASP_Send:function(SGsAP_to_IPL4_Send)) + in(ASP_RecvFrom -> SGsAP_RecvFrom: function(IPL4_to_SGsAP_RecvFrom); + ASP_ConnId_ReadyToRelease -> ASP_ConnId_ReadyToRelease: simple; + ASP_Event -> ASP_Event: simple)" + } +} diff --git a/library/SGsAP_CodecPort_CtrlFunct.ttcn b/library/SGsAP_CodecPort_CtrlFunct.ttcn new file mode 100644 index 0000000..b09fc94 --- /dev/null +++ b/library/SGsAP_CodecPort_CtrlFunct.ttcn @@ -0,0 +1,44 @@ +module SGsAP_CodecPort_CtrlFunct { + + import from SGsAP_CodecPort all; + import from IPL4asp_Types all; + + external function f_IPL4_listen( + inout SGsAP_CODEC_PT portRef, + in HostName locName, + in PortNumber locPort, + in ProtoTuple proto, + in OptionList options := {} + ) return Result; + + external function f_IPL4_connect( + inout SGsAP_CODEC_PT portRef, + in HostName remName, + in PortNumber remPort, + in HostName locName, + in PortNumber locPort, + in ConnectionId connId, + in ProtoTuple proto, + in OptionList options := {} + ) return Result; + + external function f_IPL4_close( + inout SGsAP_CODEC_PT portRef, + in ConnectionId id, + in ProtoTuple proto := { unspecified := {} } + ) return Result; + + external function f_IPL4_setUserData( + inout SGsAP_CODEC_PT portRef, + in ConnectionId id, + in UserData userData + ) return Result; + + external function f_IPL4_getUserData( + inout SGsAP_CODEC_PT portRef, + in ConnectionId id, + out UserData userData + ) return Result; + +} + diff --git a/library/SGsAP_CodecPort_CtrlFunctDef.cc b/library/SGsAP_CodecPort_CtrlFunctDef.cc new file mode 100644 index 0000000..aa38e51 --- /dev/null +++ b/library/SGsAP_CodecPort_CtrlFunctDef.cc @@ -0,0 +1,56 @@ +#include "IPL4asp_PortType.hh" +#include "SGsAP_CodecPort.hh" +#include "IPL4asp_PT.hh" + +namespace SGsAP__CodecPort__CtrlFunct { + + IPL4asp__Types::Result f__IPL4__listen( + SGsAP__CodecPort::SGsAP__CODEC__PT& portRef, + const IPL4asp__Types::HostName& locName, + const IPL4asp__Types::PortNumber& locPort, + const IPL4asp__Types::ProtoTuple& proto, + const IPL4asp__Types::OptionList& options) + { + return f__IPL4__PROVIDER__listen(portRef, locName, locPort, proto, options); + } + + IPL4asp__Types::Result f__IPL4__connect( + SGsAP__CodecPort::SGsAP__CODEC__PT& portRef, + const IPL4asp__Types::HostName& remName, + const IPL4asp__Types::PortNumber& remPort, + const IPL4asp__Types::HostName& locName, + const IPL4asp__Types::PortNumber& locPort, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::ProtoTuple& proto, + const IPL4asp__Types::OptionList& options) + { + return f__IPL4__PROVIDER__connect(portRef, remName, remPort, + locName, locPort, connId, proto, options); + } + + IPL4asp__Types::Result f__IPL4__close( + SGsAP__CodecPort::SGsAP__CODEC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::ProtoTuple& proto) + { + return f__IPL4__PROVIDER__close(portRef, connId, proto); + } + + IPL4asp__Types::Result f__IPL4__setUserData( + SGsAP__CodecPort::SGsAP__CODEC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::UserData& userData) + { + return f__IPL4__PROVIDER__setUserData(portRef, connId, userData); + } + + IPL4asp__Types::Result f__IPL4__getUserData( + SGsAP__CodecPort::SGsAP__CODEC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + IPL4asp__Types::UserData& userData) + { + return f__IPL4__PROVIDER__getUserData(portRef, connId, userData); + } + +} + -- To view, visit https://gerrit.osmocom.org/11306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I530f8f444d1c7ea0bf11d510da7b97f64a2039f5 Gerrit-Change-Number: 11306 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 20:32:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 20:32:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: IPA_Types/Emulation: Add RSPRO support In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11304 ) Change subject: IPA_Types/Emulation: Add RSPRO support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I536d6843b3e65b3ee35fbbcd6353e0fb0ce21c8e Gerrit-Change-Number: 11304 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Wed, 10 Oct 2018 20:32:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 20:32:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 20:32:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add SGsAP_Templates for SGsAP on the MME<->MSC interface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11305 ) Change subject: Add SGsAP_Templates for SGsAP on the MME<->MSC interface ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I435dab312fc4965c69ffb9cc22917539ebab93e7 Gerrit-Change-Number: 11305 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 10 Oct 2018 20:32:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 20:33:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 20:33:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add SGsAP_Templates for SGsAP on the MME<->MSC interface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11305 ) Change subject: Add SGsAP_Templates for SGsAP on the MME<->MSC interface ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I435dab312fc4965c69ffb9cc22917539ebab93e7 Gerrit-Change-Number: 11305 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 10 Oct 2018 20:33:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 20:33:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 20:33:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add SGsAP_Templates for SGsAP on the MME<->MSC interface In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11305 ) Change subject: Add SGsAP_Templates for SGsAP on the MME<->MSC interface ...................................................................... Add SGsAP_Templates for SGsAP on the MME<->MSC interface Change-Id: I435dab312fc4965c69ffb9cc22917539ebab93e7 --- M deps/Makefile A library/SGsAP_Templates.ttcn M msc/gen_links.sh 3 files changed, 867 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/deps/Makefile b/deps/Makefile index cb9e359..f2f38bd 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -40,6 +40,7 @@ titan.ProtocolModules.LLC_v7.1.0 \ titan.ProtocolModules.MobileL3_v13.4.0 \ titan.ProtocolModules.NS_v7.3.0 \ + titan.ProtocolModules.SGsAP_13.2.0 \ titan.ProtocolModules.SNDCP_v7.0.0 \ titan.ProtocolEmulations.SCCP @@ -77,6 +78,7 @@ titan.ProtocolModules.RTP_commit= R.5.A titan.ProtocolModules.ROSE_commit= R.1.C titan.ProtocolModules.SCTP_commit= R.2.A +titan.ProtocolModules.SGsAP_13.2.0_commit= 81544cf008378058b95ff20d33f3770fadb7e235 titan.ProtocolModules.SDP_commit= R.14.A titan.ProtocolModules.SMPP_commit= R.2.A-2-gb7aee69 titan.ProtocolModules.SNDCP_v7.0.0_commit= R.2.A diff --git a/library/SGsAP_Templates.ttcn b/library/SGsAP_Templates.ttcn new file mode 100644 index 0000000..aac045e --- /dev/null +++ b/library/SGsAP_Templates.ttcn @@ -0,0 +1,860 @@ +module SGsAP_Templates { + +/* Templates for the SGsAP protocol as per 3GPP TS 29.118 + * (C) 2018 by Harald Welte + * All rights reserved. + * + * Released under the terms of the GNU General Public License, Version 2 or + * (at your option) any later version. + */ + +import from SGsAP_Types all; +import from GSM_Types all; +import from General_Types all; +import from MobileL3_CommonIE_Types all; + +/* 9.4.2 */ +template (value) EPS_LocationUpdateType ts_SGsAP_IE_EpsLuType(template (value) EPS_location_update_type lut) := { + iEI := '00001010'B, + lengthIndicator := 1, + locationUpdateType := lut +} +template EPS_LocationUpdateType tr_SGsAP_IE_EpsLuType(template EPS_location_update_type lut) := { + iEI := '00001010'B, + lengthIndicator := 1, + locationUpdateType := lut +} + +/* 9.4.3 */ +template (value) ErroneousMessage ts_SGsAP_IE_ErrMsg(template (value) octetstring err_msg) := { + iEI := '00011011'B, + lengthIndicator := lengthof(valueof(err_msg)), + erroneousMessage := err_msg +} +template ErroneousMessage tr_SGsAP_IE_ErrMsg(template octetstring err_msg) := { + iEI := '00011011'B, + lengthIndicator := ?, + erroneousMessage := err_msg +} + + +/* 9.4.6 */ +private function ts_SGsAP_IMSI(hexstring digits) return template (value) IMSI { + var template (value) IMSI imsi := { + iEI := '00000001'B, + lengthIndicator := lengthof(digits)/2 + 1, + iMSI := { + field1 := '001'B, + parity := '0'B, /* even */ + digits := digits, + fillerDigit := '1111'B /* even */ + } + } + if (lengthof(digits) mod 2 == 1) { + /* odd number of digits */ + imsi.iMSI.parity := '1'B; + imsi.iMSI.fillerDigit := omit; + } + return imsi; +} +private function ts_SGsAP_IMSI_omit(template (omit) hexstring digits) return template (omit) IMSI { + if (istemplatekind(digits, "omit")) { + return omit; + } else { + return ts_SGsAP_IMSI(valueof(digits)); + } +} +private function tr_SGsAP_IMSI(template hexstring digits) return template IMSI { + if (istemplatekind(digits, "omit")) { + return omit; + } else if (istemplatekind(digits, "*")) { + return *; + } + var template IMSI imsi := { + iEI := '00000001'B, + lengthIndicator := lengthof(digits)/2 + 1, + iMSI := { + field1 := '001'B, + parity := '0'B, /* even */ + digits := digits, + fillerDigit := '1111'B /* even */ + } + } + if (lengthof(digits) mod 2 == 1) { + /* odd number of digits */ + /* odd number of digits */ + imsi.iMSI.parity := '1'B; + imsi.iMSI.fillerDigit := omit; + } + return imsi; +} + +/* 9.4.7 */ +template (value) IMSI_DetachFromEPS_ServiceType ts_SGsAP_IE_DetServiceType(template (value) IMSI_detachFromEPS_serviceType st) := { + iEI := '00010000'B, + lengthIndicator := 1, + serviceType := st +} +template IMSI_DetachFromEPS_ServiceType tr_SGsAP_IE_DetServiceType(template IMSI_detachFromEPS_serviceType st) := { + iEI := '00010000'B, + lengthIndicator := 1, + serviceType := st +} + +/* 9.4.8 */ +template (value) IMSI_DetachFromNonEPS_ServiceType ts_SGsAP_IE_DetNonEpsServiceType(template (value) IMSI_detachFromNonEPS_serviceType st) := { + iEI := '00010001'B, + lengthIndicator := 1, + serviceType := st +} +template IMSI_DetachFromNonEPS_ServiceType tr_SGsAP_IE_DetNonEpsServiceType(template IMSI_detachFromNonEPS_serviceType st) := { + iEI := '00010001'B, + lengthIndicator := 1, + serviceType := st +} + +/* 9.4.11 */ +private function f_enc_mnc_digit3(GsmMnc mnc) return HEX1 { + if (lengthof(mnc) == 2) { + return 'F'H; + } else { + return mnc[2]; + } +} +template (value) LocationAreaIdValue ts_SGsAP_LAI(GsmMcc mcc, GsmMnc mnc, GsmLac lac) := { + mccDigit1 := mcc[0], + mccDigit2 := mcc[1], + mccDigit3 := mcc[2], + mncDigit3 := f_enc_mnc_digit3(mnc), + mncDigit1 := mnc[0], + mncDigit2 := mnc[1], + lac := int2oct(lac, 2) +} +template (value) LocationAreaId ts_SGsAP_IE_Lai(template (value) LocationAreaIdValue lai) := { + iEI := '00000100'B, + lengthIndicator := 5, + locationAreaId := lai +} +template LocationAreaId tr_SGsAP_IE_Lai(template LocationAreaIdValue lai) := { + iEI := '00000100'B, + lengthIndicator := 5, + locationAreaId := lai +} +function ts_SGsAP_IE_Lai_omit(template (omit) LocationAreaIdValue lai) return template (omit) LocationAreaId { + if (istemplatekind(lai, "omit")) { + return omit; + } else { + return ts_SGsAP_IE_Lai(lai); + } +} +function tr_SGsAP_IE_Lai_omit(template LocationAreaIdValue lai) return template LocationAreaId { + if (istemplatekind(lai, "omit")) { + return omit; + } else if (istemplatekind(lai, "*")) { + return *; + } else { + return tr_SGsAP_IE_Lai(lai); + } +} + + + +/* 9.4.12 */ +template (value) MM_Information ts_SGsAP_IE_MmInfo(template (value) octetstring mm_info) := { + iEI := '00010111'B, + lengthIndicator := lengthof(valueof(mm_info)), + information := mm_info +} +template MM_Information tr_SGsAP_IE_MmInfo(template octetstring mm_info) := { + iEI := '00010111'B, + lengthIndicator := ?, + information := mm_info +} + + + +/* 9.4.13 */ +template (value) MME_Name ts_SGsAP_IE_MmeName(template (value) charstring name) := { + iEI := '00001001'B, + lengthIndicator := lengthof(valueof(name)), + name := name +}; +template MME_Name tr_SGsAP_IE_MmeName(template charstring name) := { + iEI := '00001001'B, + lengthIndicator := ?, + name := name +}; + +/* 9.4.14 */ +function f_l3_to_sgs_id(MobileIdentityLV l3) return MobileIdentityValue { + var OddEvenInd_Identity l3v := l3.mobileIdentityV.oddEvenInd_identity; + var MobileIdentityValue ret; + ret.typeOfIdentity := l3.mobileIdentityV.typeOfIdentity; + if (ischosen(l3v.imei)) { + ret.iD.imei.oddevenIndicator := l3v.imei.oddevenIndicator; + ret.iD.imei.digits := l3v.imei.digits; + } else if (ischosen(l3v.imsi)) { + ret.iD.imsi.oddevenIndicator := l3v.imsi.oddevenIndicator; + ret.iD.imsi.digits := l3v.imsi.digits; + ret.iD.imsi.fillerDigit := l3v.imsi.fillerDigit; + } else if (ischosen(l3v.imei_sv)) { + ret.iD.imei_sv.oddevenIndicator := l3v.imei_sv.oddevenIndicator; + ret.iD.imei_sv.digits := l3v.imei_sv.digits; + ret.iD.imei_sv.fillerDigit := l3v.imei_sv.fillerDigit; + } else if (ischosen(l3v.tmsi_ptmsi)) { + ret.iD.tmsi_ptmsi.oddevenIndicator := l3v.tmsi_ptmsi.oddevenIndicator; + ret.iD.tmsi_ptmsi.fillerDigit := l3v.tmsi_ptmsi.fillerDigit; + ret.iD.tmsi_ptmsi.octets := l3v.tmsi_ptmsi.octets; + } else if (ischosen(l3v.tmgi_and_MBMS_SessionID)) { + ret.iD.tmgi_and_MBMS_SessionID.oddevenIndicator := l3v.tmgi_and_MBMS_SessionID.oddevenIndicator; + ret.iD.tmgi_and_MBMS_SessionID.mCC_MNCIndicator := l3v.tmgi_and_MBMS_SessionID.mCC_MNCIndicator; + ret.iD.tmgi_and_MBMS_SessionID.mBMS_SessionIdentityIndicator := l3v.tmgi_and_MBMS_SessionID.mBMS_SessionIdentityIndicator; + ret.iD.tmgi_and_MBMS_SessionID.spare := l3v.tmgi_and_MBMS_SessionID.spare; + ret.iD.tmgi_and_MBMS_SessionID.mBMS_ServiceID := l3v.tmgi_and_MBMS_SessionID.mBMS_ServiceID; + ret.iD.tmgi_and_MBMS_SessionID.mccDigit1 := l3v.tmgi_and_MBMS_SessionID.mccDigit1; + ret.iD.tmgi_and_MBMS_SessionID.mccDigit2 := l3v.tmgi_and_MBMS_SessionID.mccDigit2; + ret.iD.tmgi_and_MBMS_SessionID.mccDigit3 := l3v.tmgi_and_MBMS_SessionID.mccDigit3; + ret.iD.tmgi_and_MBMS_SessionID.mccDigit3 := l3v.tmgi_and_MBMS_SessionID.mccDigit3; + ret.iD.tmgi_and_MBMS_SessionID.mccDigit1 := l3v.tmgi_and_MBMS_SessionID.mccDigit1; + ret.iD.tmgi_and_MBMS_SessionID.mccDigit2 := l3v.tmgi_and_MBMS_SessionID.mccDigit2; + ret.iD.tmgi_and_MBMS_SessionID.mBMS_SessionIdentity := l3v.tmgi_and_MBMS_SessionID.mBMS_SessionIdentity; + } else if (ischosen(l3v.no_identity)) { + ret.iD.no_identity.oddevenIndicator := l3v.no_identity.oddevenIndicator; + ret.iD.no_identity.fillerDigits := l3v.no_identity.fillerDigits; + } + return ret; +} +template MobileIdentity ts_SGsAP_IE_MobileID(template (value) MobileIdentityLV l3_mi) := { + iEI := '00001110'B, + lengthIndicator := 0, /* overwritten */ + iD := f_l3_to_sgs_id(valueof(l3_mi)) +} + + +/* 9.4.15 */ +template (value) NAS_MessageContainer ts_SGsAP_NasContainer(template (value) octetstring nas_pdu) := { + iEI := '00010110'B, + lengthIndicator := lengthof(valueof(nas_pdu)), + nAS_MessageContainer := nas_pdu +} +template NAS_MessageContainer tr_SGsAP_NasContainer(template octetstring nas_pdu) := { + iEI := '00010110'B, + lengthIndicator := ?, + nAS_MessageContainer := nas_pdu +} + +/* 9.4.16 */ +template (value) RejectCause ts_SGsAP_IE_RejCause(template (value) Reject_Cause cause) := { + iEI := '00001111'B, + lengthIndicator := 1, + cause := cause +} +template RejectCause tr_SGsAP_IE_RejCause(template Reject_Cause cause) := { + iEI := '00001111'B, + lengthIndicator := 1, + cause := cause +} + +/* 9.4.17 */ +template (value) ServiceIndicator ts_SGsAP_ServiceInd(template (value) Service_Indicator si) := { + iEI := '00100000'B, + lengthIndicator := 1, + indicator := si +} +template ServiceIndicator tr_SGsAP_ServiceInd(template Service_Indicator si) := { + iEI := '00100000'B, + lengthIndicator := 1, + indicator := si +} + + +/* 9.4.18 */ +template (value) SGsCause ts_SGsAP_IE_SgsCause(template (value) SGs_Cause cause) := { + iEI := '00001000'B, + lengthIndicator := 1, + cause := cause +} +function tr_SGsAP_IE_SgsCause(template SGs_Cause cause) return template SGsCause { + if (istemplatekind(cause, "omit")) { + return omit; + } else if (istemplatekind(cause, "*")) { + return *; + } else { + var template SGsCause ret := { + iEI := '00001000'B, + lengthIndicator := 1, + cause := cause + } + return ret; + } +} + +/* 9.4.21c */ +template (value) UE_EMM_Mode ts_SGsAP_IE_UeEmmMode(template (value) UE_EMM_mode mode) := { + iEI := '00100101'B, + lengthIndicator := 1, + mode := mode +} +template UE_EMM_Mode tr_SGsAP_IE_UeEmmMode(template UE_EMM_mode mode) := { + iEI := '00100101'B, + lengthIndicator := 1, + mode := mode +} + + +/* 9.4.22 */ +template (value) VLR_Name ts_SGsAP_IE_VlrName(template (value) charstring name) := { + iEI := '00000010'B, + lengthIndicator := lengthof(name), + name := name +} +template VLR_Name tr_SGsAP_IE_VlrName(template charstring name) := { + iEI := '00000010'B, + lengthIndicator := ?, + name := name +} + + + + + +/* 3GPP TS 29.118 Section 8.1 */ +template (value) PDU_SGsAP ts_SGsAP_ALERT_ACK(hexstring imsi) := { + sGsAP_ALERT_ACK := { + messageType := '00001110'B, + iMSI := ts_SGsAP_IMSI(imsi) + } +} +template PDU_SGsAP tr_SGsAP_ALERT_ACK(template hexstring imsi) := { + sGsAP_ALERT_ACK := { + messageType := '00001110'B, + iMSI := tr_SGsAP_IMSI(imsi) + } +} + +/* 3GPP TS 29.118 Section 8.2 */ +template PDU_SGsAP ts_SGsAP_ALERT_REJECT(hexstring imsi, + template (value) SGs_Cause cause) := { + sGsAP_ALERT_REJECT := { + messageType := '00001111'B, + iMSI := ts_SGsAP_IMSI(imsi), + sGsCause := ts_SGsAP_IE_SgsCause(cause) + } +} +template PDU_SGsAP tr_SGsAP_ALERT_REJECT(template hexstring imsi, + template SGs_Cause cause := ?) := { + sGsAP_ALERT_REJECT := { + messageType := '00001111'B, + iMSI := tr_SGsAP_IMSI(imsi), + sGsCause := tr_SGsAP_IE_SgsCause(cause) + } +} + +/* 3GPP TS 29.118 Section 8.3 */ +template (value) PDU_SGsAP ts_SGsAP_ALERT_REQ(hexstring imsi) := { + sGsAP_ALERT_REQUEST := { + messageType := '00001101'B, + iMSI := ts_SGsAP_IMSI(imsi) + } +} +template PDU_SGsAP tr_SGsAP_ALERT_REQ(template hexstring imsi) := { + sGsAP_ALERT_REQUEST := { + messageType := '00001101'B, + iMSI := tr_SGsAP_IMSI(imsi) + } +} + +/* 3GPP TS 29.118 Section 8.4 */ +template (value) PDU_SGsAP ts_SGsAP_DL_UD(hexstring imsi, + template (value) octetstring nas_pdu) := { + sGsAP_DOWNLINK_UNITDATA := { + messageType := '00000111'B, + iMSI := ts_SGsAP_IMSI(imsi), + nAS_MessageContainer := ts_SGsAP_NasContainer(nas_pdu) + } +} +template PDU_SGsAP tr_SGsAP_DL_UD(template hexstring imsi, template octetstring nas_pdu := ?) := { + sGsAP_DOWNLINK_UNITDATA := { + messageType := '00000111'B, + iMSI := tr_SGsAP_IMSI(imsi), + nAS_MessageContainer := tr_SGsAP_NasContainer(nas_pdu) + } +} + +/* 8.5 */ +template (value) PDU_SGsAP ts_SGsAP_EPS_DETACH_ACK(hexstring imsi) := { + sGsAP_EPS_DETACH_ACK:= { + messageType := '00010010'B, + iMSI := ts_SGsAP_IMSI(imsi) + } +} +template PDU_SGsAP tr_SGsAP_EPS_DETACH_ACK(template hexstring imsi) := { + sGsAP_EPS_DETACH_ACK:= { + messageType := '00010010'B, + iMSI := tr_SGsAP_IMSI(valueof(imsi)) + } +} + +/* 8.6 */ +template (value) PDU_SGsAP ts_SGsAP_EPS_DETACH_IND(hexstring imsi, + template (value) charstring mme_name, + template (value) IMSI_detachFromEPS_serviceType det_serv_typ) := { + sGsAP_EPS_DETACH_INDICATION:= { + messageType := '00010001'B, + iMSI := ts_SGsAP_IMSI(imsi), + mME_Name := ts_SGsAP_IE_MmeName(mme_name), + iMSI_DetachFromEPS_ServiceType := ts_SGsAP_IE_DetServiceType(det_serv_typ) + } +} +template PDU_SGsAP tr_SGsAP_EPS_DETACH_IND(template hexstring imsi, + template charstring mme_name, + template IMSI_detachFromEPS_serviceType det_serv_typ) := { + sGsAP_EPS_DETACH_INDICATION:= { + messageType := '00010001'B, + iMSI := tr_SGsAP_IMSI(valueof(imsi)), + mME_Name := tr_SGsAP_IE_MmeName(mme_name), + iMSI_DetachFromEPS_ServiceType := tr_SGsAP_IE_DetServiceType(det_serv_typ) + } +} + +/* 8.7 */ +template (value) PDU_SGsAP ts_SGsAP_IMSI_DETACH_ACK(hexstring imsi) := { + sGsAP_IMSI_DETACH_ACK := { + messageType := '00010100'B, + iMSI := ts_SGsAP_IMSI(imsi) + } +} +template PDU_SGsAP tr_SGsAP_IMSI_DETACH_ACK(template hexstring imsi) := { + sGsAP_IMSI_DETACH_ACK := { + messageType := '00010100'B, + iMSI := tr_SGsAP_IMSI(imsi) + } +} + +/* 8.8 */ +template (value) PDU_SGsAP ts_SGsAP_IMSI_DETACH_IND(hexstring imsi, + template (value) charstring mme_name, + template (value) IMSI_detachFromNonEPS_serviceType det_serv_typ) := { + sGsAP_IMSI_DETACH_INDICATION := { + messageType := '00010011'B, + iMSI := ts_SGsAP_IMSI(imsi), + mME_Name := ts_SGsAP_IE_MmeName(mme_name), + iMSI_DetachFromNonEPS_ServiceType := ts_SGsAP_IE_DetNonEpsServiceType(det_serv_typ) + } +} +template PDU_SGsAP tr_SGsAP_IMSI_DETACH_IND(template hexstring imsi, + template charstring mme_name := ?, + template IMSI_detachFromNonEPS_serviceType det_serv_typ := ?) := { + sGsAP_IMSI_DETACH_INDICATION := { + messageType := '00010011'B, + iMSI := tr_SGsAP_IMSI(imsi), + mME_Name := tr_SGsAP_IE_MmeName(mme_name), + iMSI_DetachFromNonEPS_ServiceType := tr_SGsAP_IE_DetNonEpsServiceType(det_serv_typ) + } +} + +/* 8.9 */ +template (value) PDU_SGsAP ts_SGsAP_LU_ACCEPT(hexstring imsi, + template (value) LocationAreaIdValue lai, + template (value) MobileIdentityLV mobile_id) := { + sGsAP_LOCATION_UPDATE_ACCEPT := { + messageType := '00001010'B, + iMSI := ts_SGsAP_IMSI(imsi), + locationAreaId := ts_SGsAP_IE_Lai(lai), + newTMSIorIMSI := ts_SGsAP_IE_MobileID(mobile_id) + } +} +template PDU_SGsAP tr_SGsAP_LU_ACCEPT(template hexstring imsi, + template LocationAreaIdValue lai := ?) := { + sGsAP_LOCATION_UPDATE_ACCEPT := { + messageType := '00001010'B, + iMSI := tr_SGsAP_IMSI(imsi), + locationAreaId := tr_SGsAP_IE_Lai(lai), + newTMSIorIMSI := * + } +} + +/* 8.10 */ +template (value) PDU_SGsAP ts_SGsAP_LU_REJECT(hexstring imsi, + template (value) Reject_Cause rej_cause, + template (omit) LocationAreaIdValue lai) := { + sGsAP_LOCATION_UPDATE_REJECT := { + messageType := '00001011'B, + iMSI := ts_SGsAP_IMSI(imsi), + rejectCause := ts_SGsAP_IE_RejCause(rej_cause), + locationAreaId := ts_SGsAP_IE_Lai_omit(lai) + } +} +template PDU_SGsAP tr_SGsAP_LU_REJECT(template hexstring imsi, + template Reject_Cause rej_cause, + template LocationAreaIdValue lai) := { + sGsAP_LOCATION_UPDATE_REJECT := { + messageType := '00001011'B, + iMSI := tr_SGsAP_IMSI(imsi), + rejectCause := tr_SGsAP_IE_RejCause(rej_cause), + locationAreaId := tr_SGsAP_IE_Lai_omit(lai) + } +} + +/* 8.11 */ +template (value) PDU_SGsAP ts_SGsAP_LU_REQ(hexstring imsi, + template (value) charstring mme_name, + template (value) EPS_location_update_type eps_lu_type, + template (value) LocationAreaIdValue new_lai) := { + sGsAP_LOCATION_UPDATE_REQUEST := { + messageType := '00001001'B, + iMSI := ts_SGsAP_IMSI(imsi), + mME_Name := ts_SGsAP_IE_MmeName(mme_name), + ePS_LocationUpdateType := ts_SGsAP_IE_EpsLuType(eps_lu_type), + newLocationAreaId := ts_SGsAP_IE_Lai(new_lai), + oldLocationAreaId := omit, + tMSI_Status := omit, + iMEI_SV := omit, + tAI := omit, + eCGI := omit, + tMSI_NRI := omit, + cS_DomainOperator := omit + } +} +template PDU_SGsAP tr_SGsAP_LU_REQ(template hexstring imsi, + template charstring mme_name := ?, + template EPS_location_update_type eps_lu_type := ?, + template LocationAreaIdValue new_lai := ?) := { + sGsAP_LOCATION_UPDATE_REQUEST := { + messageType := '00001001'B, + iMSI := tr_SGsAP_IMSI(imsi), + mME_Name := tr_SGsAP_IE_MmeName(mme_name), + ePS_LocationUpdateType := tr_SGsAP_IE_EpsLuType(eps_lu_type), + newLocationAreaId := tr_SGsAP_IE_Lai_omit(new_lai), + oldLocationAreaId := *, + tMSI_Status := *, + iMEI_SV := *, + tAI := *, + eCGI := *, + tMSI_NRI := *, + cS_DomainOperator := * + } +} + +/* 8.12 */ +template (value) PDU_SGsAP ts_SGsAP_MM_INFO_REQ(hexstring imsi, + template (value) octetstring mm_info) := { + sGsAP_MM_INFORMATION_REQUEST := { + messageType := '00011010'B, + iMSI := ts_SGsAP_IMSI(imsi), + mM_Information := ts_SGsAP_IE_MmInfo(mm_info) + } +} +template PDU_SGsAP tr_SGsAP_MM_INFO_REQ(template hexstring imsi, + template octetstring mm_info :=?) := { + sGsAP_MM_INFORMATION_REQUEST := { + messageType := '00011010'B, + iMSI := tr_SGsAP_IMSI(imsi), + mM_Information := tr_SGsAP_IE_MmInfo(mm_info) + } +} + +/* 8.13 */ +template (value) PDU_SGsAP ts_SGsAP_PAGING_REJ(hexstring imsi, + template (value) SGs_Cause cause) := { + sGsAP_PAGING_REJECT := { + messageType := '00000010'B, + iMSI := ts_SGsAP_IMSI(imsi), + sGsCause := ts_SGsAP_IE_SgsCause(cause) + } +} +template PDU_SGsAP tr_SGsAP_PAGING_REJ(template hexstring imsi, + template SGs_Cause cause := ?) := { + sGsAP_PAGING_REJECT := { + messageType := '00000010'B, + iMSI := tr_SGsAP_IMSI(imsi), + sGsCause := tr_SGsAP_IE_SgsCause(cause) + } +} + +/* 8.14 */ +template (value) PDU_SGsAP ts_SGsAP_PAGING_REQ(hexstring imsi, + template (value) charstring vlr_name, + template (value) Service_Indicator serv_ind, + template (omit) OCT4 tmsi) := +{ + sGsAP_PAGING_REQUEST := { + messageType := '00000001'B, + iMSI := ts_SGsAP_IMSI(imsi), + vLR_Name := ts_SGsAP_IE_VlrName(vlr_name), + serviceIndicator := ts_SGsAP_ServiceInd(serv_ind), + tMSI := omit, + cLI := omit, + locationAreaId := omit, + globalCN_Id := omit, + sS_Code := omit, + lCS_Indicator := omit, + lCS_ClientIdentity := omit, + channelNeeded := omit, + eMLPP_Priority := omit, + additionalPagingIndicator := omit + } +} +template PDU_SGsAP tr_SGsAP_PAGING_REQ(template hexstring imsi, + template charstring vlr_name, + template Service_Indicator serv_ind, + template OCT4 tmsi) := +{ + sGsAP_PAGING_REQUEST := { + messageType := '00000001'B, + iMSI := tr_SGsAP_IMSI(imsi), + vLR_Name := tr_SGsAP_IE_VlrName(vlr_name), + serviceIndicator := tr_SGsAP_ServiceInd(serv_ind), + tMSI := *, + cLI := *, + locationAreaId := *, + globalCN_Id := *, + sS_Code := *, + lCS_Indicator := *, + lCS_ClientIdentity := *, + channelNeeded := *, + eMLPP_Priority := *, + additionalPagingIndicator := * + } +} + +/* 8.15 */ +template (value) PDU_SGsAP ts_SGsAP_RESET_ACK_MME(template (value) charstring mme_name) := { + sGsAP_RESET_ACK := { + messageType := '00010110'B, + mME_Name := ts_SGsAP_IE_MmeName(mme_name), + vLR_Name := omit + } +} +template (value) PDU_SGsAP ts_SGsAP_RESET_ACK_VLR(template (value) charstring vlr_name) := { + sGsAP_RESET_ACK := { + messageType := '00010110'B, + mME_Name := omit, + vLR_Name := ts_SGsAP_IE_VlrName(vlr_name) + } +} +template PDU_SGsAP tr_SGsAP_RESET_ACK(template charstring mme_name, template charstring vlr_name) := { + sGsAP_RESET_ACK := { + messageType := '00010110'B, + mME_Name := tr_SGsAP_IE_MmeName(mme_name), + vLR_Name := tr_SGsAP_IE_VlrName(vlr_name) + } +} + +/* 8.16 */ +template (value) PDU_SGsAP ts_SGsAP_RESET_IND_MME(template (value) charstring mme_name) := { + sGsAP_RESET_INDICATION := { + messageType := '00010101'B, + mME_Name := ts_SGsAP_IE_MmeName(mme_name), + vLR_Name := omit + } +} +template (value) PDU_SGsAP ts_SGsAP_RESET_IND_VLR(template (value) charstring vlr_name) := { + sGsAP_RESET_INDICATION := { + messageType := '00010101'B, + mME_Name := omit, + vLR_Name := ts_SGsAP_IE_VlrName(vlr_name) + } +} +template PDU_SGsAP tr_SGsAP_RESET_IND(template charstring mme_name, template charstring vlr_name) := { + sGsAP_RESET_INDICATION := { + messageType := '00010101'B, + mME_Name := tr_SGsAP_IE_MmeName(mme_name), + vLR_Name := tr_SGsAP_IE_VlrName(vlr_name) + } +} + +/* 8.17 */ +template (value) PDU_SGsAP ts_SGsAP_SERVICE_REQ(hexstring imsi, + template (value) Service_Indicator serv_ind, + template (value) UE_EMM_mode emm_mode) := { + sGsAP_SERVICE_REQUEST := { + messageType := '00000110'B, + iMSI := ts_SGsAP_IMSI(imsi), + serviceIndicator := ts_SGsAP_ServiceInd(serv_ind), + iMEI_SV := omit, + uE_TimeZone := omit, + mobileStationClassmark2 := omit, + tAI := omit, + eCGI := omit, + /* optional, but "the MME shall include this IE." */ + uE_EMM_Mode := ts_SGsAP_IE_UeEmmMode(emm_mode) + } +} +template PDU_SGsAP tr_SGsAP_SERVICE_REQ(template hexstring imsi, + template Service_Indicator serv_ind := ?, + template UE_EMM_mode emm_mode := ?) := { + sGsAP_SERVICE_REQUEST := { + messageType := '00000110'B, + iMSI := tr_SGsAP_IMSI(imsi), + serviceIndicator := tr_SGsAP_ServiceInd(serv_ind), + iMEI_SV := *, + uE_TimeZone := *, + mobileStationClassmark2 := *, + tAI := *, + eCGI := *, + /* optional, but "the MME shall include this IE." */ + uE_EMM_Mode := tr_SGsAP_IE_UeEmmMode(emm_mode) + } +} + + +/* 8.18 */ +template (value) PDU_SGsAP ts_SGsAP_STATUS(template (omit) hexstring imsi, + template (value) SGs_Cause cause, + template (value) octetstring err_msg) := { + sGsAP_STATUS := { + messageType := '00011101'B, + iMSI := ts_SGsAP_IMSI_omit(imsi), + sGsCause := ts_SGsAP_IE_SgsCause(cause), + erroneousMessage := ts_SGsAP_IE_ErrMsg(err_msg) + } +} +template PDU_SGsAP tr_SGsAP_STATUS(template hexstring imsi, + template SGs_Cause cause, + template octetstring err_msg) := { + sGsAP_STATUS := { + messageType := '00011101'B, + iMSI := tr_SGsAP_IMSI(imsi), + sGsCause := tr_SGsAP_IE_SgsCause(cause), + erroneousMessage := tr_SGsAP_IE_ErrMsg(err_msg) + } +} + + +/* 8.19 */ +template (value) PDU_SGsAP ts_SGsAP_TMSI_REALL_CMPL(hexstring imsi) := { + sGsAP_TMSI_REALLOCATION_COMPLETE := { + messageType := '00001100'B, + iMSI := ts_SGsAP_IMSI(imsi) + } +} +template PDU_SGsAP tr_SGsAP_TMSI_REALL_CMPL(template hexstring imsi) := { + sGsAP_TMSI_REALLOCATION_COMPLETE := { + messageType := '00001100'B, + iMSI := tr_SGsAP_IMSI(imsi) + } +} + +/* 8.20 */ +template (value) PDU_SGsAP ts_SGsAP_UE_ACT_IND(hexstring imsi) := { + sGsAP_UE_ACTIVITY_INDICATION := { + messageType := '00010000'B, + iMSI := ts_SGsAP_IMSI(imsi) + /* Rel 14: Max UE Avail Time */ + } +} +template PDU_SGsAP tr_SGsAP_UE_ACT_IND(template hexstring imsi) := { + sGsAP_UE_ACTIVITY_INDICATION := { + messageType := '00010000'B, + iMSI := tr_SGsAP_IMSI(imsi) + /* Rel 14: Max UE Avail Time */ + } +} + +/* 8.21 */ +template (value) PDU_SGsAP ts_SGsAP_UE_UNREACHABLE(hexstring imsi, + template (value) SGs_Cause cause) := { + sGsAP_UE_UNREACHABLE := { + messageType := '00011111'B, + iMSI := ts_SGsAP_IMSI(imsi), + sGsCause := ts_SGsAP_IE_SgsCause(cause) + /* Rel 14: Requested Retransmission Time */ + /* Rel 14: Additional UE Unreachable indicators */ + } +} +template PDU_SGsAP tr_SGsAP_UE_UNREACHABLE(template hexstring imsi, + template SGs_Cause cause := ?) := { + sGsAP_UE_UNREACHABLE := { + messageType := '00011111'B, + iMSI := tr_SGsAP_IMSI(imsi), + sGsCause := tr_SGsAP_IE_SgsCause(cause) + /* Rel 14: Requested Retransmission Time */ + /* Rel 14: Additional UE Unreachable indicators */ + } +} + +/* 8.22 */ +template (value) PDU_SGsAP ts_SGsAP_UL_UD(hexstring imsi, + template (value) octetstring nas_msg) := { + sGsAP_UPLINK_UNITDATA := { + messageType := '00001000'B, + iMSI := ts_SGsAP_IMSI(imsi), + nAS_MessageContainer := ts_SGsAP_NasContainer(nas_msg), + iMEI_SV := omit, + uE_TimeZone := omit, + mobileStationClassmark2 := omit, + tAI := omit, + eCGI := omit + } +} +template PDU_SGsAP tr_SGsAP_UL_UD(template hexstring imsi, + template octetstring nas_msg := ?) := { + sGsAP_UPLINK_UNITDATA := { + messageType := '00001000'B, + iMSI := tr_SGsAP_IMSI(imsi), + nAS_MessageContainer := tr_SGsAP_NasContainer(nas_msg), + iMEI_SV := *, + uE_TimeZone := *, + mobileStationClassmark2 := *, + tAI := *, + eCGI := * + } +} + +/* 8.23 */ +template (value) PDU_SGsAP ts_SGsAP_RELEASE_REQ(hexstring imsi, + template (value) SGs_Cause cause) := { + sGsAP_RELEASE_REQUEST := { + messageType := '00011011'B, + iMSI := ts_SGsAP_IMSI(imsi), + sGsCause := ts_SGsAP_IE_SgsCause(cause) + } +} +template PDU_SGsAP tr_SGsAP_RELEASE_REQ(template hexstring imsi, + template SGs_Cause cause) := { + sGsAP_RELEASE_REQUEST := { + messageType := '00011011'B, + iMSI := tr_SGsAP_IMSI(imsi), + sGsCause := tr_SGsAP_IE_SgsCause(cause) + } +} + +/* 8.24 */ +template (value) PDU_SGsAP ts_SGsAP_SERVICE_ABORT_REQ(hexstring imsi) := { + sGsAP_SERVICE_ABORT_REQUEST := { + messageType := '00010111'B, + iMSI := ts_SGsAP_IMSI(imsi) + } +} +template PDU_SGsAP tr_SGsAP_SERVICE_ABORT_REQ(template hexstring imsi) := { + sGsAP_SERVICE_ABORT_REQUEST := { + messageType := '00010111'B, + iMSI := tr_SGsAP_IMSI(imsi) + } +} + +/* 8.25 */ +template (value) PDU_SGsAP ts_SGsAP_MO_CSFB_IND(hexstring imsi) := { + sGsAP_MO_CSFB_INDICATION := { + messageType := '00011000'B, + iMSI := ts_SGsAP_IMSI(imsi), + tAI := omit, + eCGI := omit + } +} +template PDU_SGsAP tr_SGsAP_MO_CSFB_IND(template hexstring imsi) := { + sGsAP_MO_CSFB_INDICATION := { + messageType := '00011000'B, + iMSI := tr_SGsAP_IMSI(imsi), + tAI := *, + eCGI := * + } +} + + + + + + +} diff --git a/msc/gen_links.sh b/msc/gen_links.sh index a191aa5..df646d9 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -81,6 +81,9 @@ FILES="SMPP_EncDec.cc SMPP_Types.ttcn" gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.SGsAP_13.2.0/src +FILES="SGsAP_Types.ttcn" +gen_links $DIR $FILES DIR=../library FILES="General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn MNCC_Types.ttcn MNCC_EncDec.cc MNCC_CodecPort.ttcn mncc.h MNCC_Emulation.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " @@ -90,7 +93,8 @@ FILES+="RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunctDef.cc " FILES+="MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunctDef.cc " FILES+="SMPP_CodecPort.ttcn SMPP_CodecPort_CtrlFunct.ttcn SMPP_CodecPort_CtrlFunctDef.cc SMPP_Emulation.ttcn SMPP_Templates.ttcn " -FILES+="SS_Templates.ttcn SCCP_Templates.ttcn USSD_Helpers.ttcn" +FILES+="SS_Templates.ttcn SCCP_Templates.ttcn USSD_Helpers.ttcn " +FILES+="SGsAP_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/11305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I435dab312fc4965c69ffb9cc22917539ebab93e7 Gerrit-Change-Number: 11305 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 20:42:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 20:42:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: IPA_Types/Emulation: Add RSPRO support In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11304 ) Change subject: IPA_Types/Emulation: Add RSPRO support ...................................................................... IPA_Types/Emulation: Add RSPRO support RSPRO is the protocol used by osmo-remsim. It is embedded into an IPA multiplex, and hence the TTCN-3 IPA code needs some extension to cover support for it. Change-Id: I536d6843b3e65b3ee35fbbcd6353e0fb0ce21c8e --- M library/IPA_Emulation.ttcnpp M library/IPA_Types.ttcn 2 files changed, 49 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp index 7a26a6b..413d290 100644 --- a/library/IPA_Emulation.ttcnpp +++ b/library/IPA_Emulation.ttcnpp @@ -8,7 +8,7 @@ * GSUP. IT hence transcodes messages so the user can work with abstract data types rather * than binary messages. It handles multiple packets inside one TCP segment. * - * (C) 2017 by Harald Welte + * (C) 2017-2018 by Harald Welte * All rights reserved. * * Released under the terms of GNU General Public License, Version 2 or @@ -39,6 +39,12 @@ import from GSUP_Types all; #endif +#ifdef IPA_EMULATION_RSPRO +import from RSPRO all; +import from RSPRO_Types all; +#endif + + import from Osmocom_CTRL_Types all; modulepar { @@ -137,6 +143,14 @@ } with { extension "internal" } #endif +#ifdef IPA_EMULATION_RSPRO +type port IPA_RSPRO_PT message { + inout RsproPDU, ASP_IPA_Event; +} with { extension "internal" } +#endif + + + type component IPA_Emulation_CT { /* down-facing port to IPA codec port */ @@ -159,6 +173,10 @@ /* up-facing port for GSUP */ port IPA_GSUP_PT IPA_GSUP_PORT; #endif +#ifdef IPA_EMULATION_RSPRO + /* up-facing port for RSPRO */ + port IPA_RSPRO_PT IPA_RSPRO_PORT; +#endif /* up-facing port for other streams */ port IPA_SP_PT IPA_SP_PORT; @@ -266,6 +284,11 @@ IPA_GSUP_PORT.send(evt); } #endif +#ifdef IPA_EMULATION_RSPRO + if (IPA_RSPRO_PORT.checkstate("Connected")) { + IPA_RSPRO_PORT.send(evt); + } +#endif /* FIXME: to other ports */ } @@ -455,6 +478,13 @@ } #endif +#ifdef IPA_EMULATION_RSPRO +private function f_rspro_to_user(octetstring msg) runs on IPA_Emulation_CT { + var RsproPDU rspro := dec_RsproPDU(msg); + IPA_RSPRO_PORT.send(rspro); +} +#endif + #ifdef IPA_EMULATION_MGCP private function f_mgcp_to_user(octetstring msg) runs on IPA_Emulation_CT { var charstring msg_ch := oct2char(msg); @@ -497,6 +527,9 @@ #ifdef IPA_EMULATION_RSL var ASP_RSL_Unitdata rsl; #endif +#ifdef IPA_EMULATION_RSPRO + var RsproPDU rspro; +#endif /* Set function for dissecting the binary */ var f_IPL4_getMsgLen vl_f := refers(f_IPL4_fixedMsgLen); @@ -559,6 +592,11 @@ f_gsup_to_user(ipa_rx.msg); } #endif +#ifdef IPA_EMULATION_RSPRO + case (IPAC_PROTO_EXT_RSPRO) { + f_rspro_to_user(ipa_rx.msg); + } +#endif case else { IPA_SP_PORT.send(f_to_asp(ipa_rx)); } @@ -639,6 +677,14 @@ } #endif +#ifdef IPA_EMULATION_RSPRO + [] IPA_RSPRO_PORT.receive(RsproPDU:?) -> value rspro { + payload := enc_RsproPDU(rspro); + ipa_ud := valueof(t_ASP_IPA_UD(IPAC_PROTO_OSMO, payload, IPAC_PROTO_EXT_RSPRO)); + IPA_PORT.send(f_from_asp(g_ipa_conn_id, ipa_ud)); + } +#endif + #ifdef IPA_EMULATION_RSL /* Received RSL -> down into IPA */ [] IPA_RSL_PORT.receive(ASP_RSL_Unitdata:?) -> value rsl { diff --git a/library/IPA_Types.ttcn b/library/IPA_Types.ttcn index 3230329..1325b14 100644 --- a/library/IPA_Types.ttcn +++ b/library/IPA_Types.ttcn @@ -32,7 +32,8 @@ IPAC_PROTO_EXT_SMSC ('03'H), IPAC_PROTO_EXT_ORC ('04'H), IPAC_PROTO_EXT_GSUP ('05'H), - IPAC_PROTO_EXT_OAP ('06'H) + IPAC_PROTO_EXT_OAP ('06'H), + IPAC_PROTO_EXT_RSPRO ('07'H) } with { variant "FIELDLENGTH(8)" } external function enc_PDU_IPA(in PDU_IPA pdu) return octetstring -- To view, visit https://gerrit.osmocom.org/11304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I536d6843b3e65b3ee35fbbcd6353e0fb0ce21c8e Gerrit-Change-Number: 11304 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 20:43:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 20:43:23 +0000 Subject: Change in libosmocore[master]: gsm_08_58.h: Introduce struct abis_rsl_link_id In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11302 ) Change subject: gsm_08_58.h: Introduce struct abis_rsl_link_id ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibd75a493bcfdf46c028ea466867d0c0d83d46343 Gerrit-Change-Number: 11302 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 10 Oct 2018 20:43:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 20:43:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 20:43:25 +0000 Subject: Change in libosmocore[master]: gsm_08_58.h: Introduce struct abis_rsl_link_id In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11302 ) Change subject: gsm_08_58.h: Introduce struct abis_rsl_link_id ...................................................................... gsm_08_58.h: Introduce struct abis_rsl_link_id It will allow to make code handling link_id values more easier to read and less prone to errors. union is used to be able to get the full octet in case we need to pass it somewhere else or encode it. An extra union is used in struct abis_rsl_common_hdr to allow using fields directly while keeping API compatibility. Change-Id: Ibd75a493bcfdf46c028ea466867d0c0d83d46343 --- M include/osmocom/gsm/protocol/gsm_08_58.h 1 file changed, 24 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h index e5ff464..c7a7d8a 100644 --- a/include/osmocom/gsm/protocol/gsm_08_58.h +++ b/include/osmocom/gsm/protocol/gsm_08_58.h @@ -25,10 +25,30 @@ #include +#include + /*! \addtogroup rsl * @{ * \file gsm_08_58.h */ +/* Link Identifier 9.3.2 */ +union abis_rsl_link_id { +#if OSMO_IS_BIG_ENDIAN + uint8_t cbits:2, + na:1, + reserved:2; + sapi:3; +#elif OSMO_IS_LITTLE_ENDIAN + uint8_t sapi:3, + reserved:2, + na:1, + cbits:2; +#endif + uint8_t link_id; +} __attribute__ ((packed)); +#define ABIS_RSL_LINK_ID_CBITS_FACCH_SDCCH 0x00 +#define ABIS_RSL_LINK_ID_CBITS_SACCH 0x01 + /*! RSL common header */ struct abis_rsl_common_hdr { uint8_t msg_discr; /*!< message discriminator (ABIS_RSL_MDISC_*) */ @@ -42,7 +62,10 @@ uint8_t ie_chan; /*!< \ref RSL_IE_CHAN_NR (tag) */ uint8_t chan_nr; /*!< RSL channel number (value) */ uint8_t ie_link_id; /*!< \ref RSL_IE_LINK_IDENT (tag) */ - uint8_t link_id; /*!< RSL link identifier (value) */ + union { + uint8_t link_id; /* API backward compat */ + union abis_rsl_link_id link_id_fields; /*!< RSL link identifier (value) */ + }; uint8_t data[0]; /*!< message payload data */ } __attribute__ ((packed)); -- To view, visit https://gerrit.osmocom.org/11302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibd75a493bcfdf46c028ea466867d0c0d83d46343 Gerrit-Change-Number: 11302 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 20:43:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 20:43:44 +0000 Subject: Change in libosmocore[master]: gsm_08_58.h: Introduce struct abis_rsl_chan_nr In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11303 ) Change subject: gsm_08_58.h: Introduce struct abis_rsl_chan_nr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icd6822021207270a00106c50f8ca6b93c1250df9 Gerrit-Change-Number: 11303 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 10 Oct 2018 20:43:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 20:43:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 20:43:53 +0000 Subject: Change in osmo-bsc[master]: codec_pref: cosmetic: seperate half/full rate determination In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11295 ) Change subject: codec_pref: cosmetic: seperate half/full rate determination ...................................................................... codec_pref: cosmetic: seperate half/full rate determination The function match_codec_pref determines whether a permitted speech value belongs to a half-rate or full-rate codec. Lets seperate this into a separate function. Change-Id: Iec1db4621ba5a09bc0e3fc40b66f3a3bc5f54add Related: OS#3503 --- M src/osmo-bsc/codec_pref.c 1 file changed, 36 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index 0f0ffa5..a741e11 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -26,6 +26,38 @@ #include #include +/* Determine whether a permitted speech value is specifies a half rate or full + * rate codec */ +static int full_rate_from_perm_spch(bool * full_rate, + enum gsm0808_permitted_speech perm_spch) +{ + /* Check if the result is a half or full rate codec */ + switch (perm_spch) { + case GSM0808_PERM_HR1: + case GSM0808_PERM_HR2: + case GSM0808_PERM_HR3: + case GSM0808_PERM_HR4: + case GSM0808_PERM_HR6: + *full_rate = false; + break; + + case GSM0808_PERM_FR1: + case GSM0808_PERM_FR2: + case GSM0808_PERM_FR3: + case GSM0808_PERM_FR4: + case GSM0808_PERM_FR5: + *full_rate = true; + break; + + default: + LOGP(DMSC, LOGL_ERROR, "Invalid permitted-speech value: %u\n", + perm_spch); + return -EINVAL; + } + + return 0; +} + /* Helper function for match_codec_pref(), looks up a matching chan mode for * a given permitted speech value */ static enum gsm48_chan_mode gsm88_to_chan_mode(enum gsm0808_permitted_speech speech) @@ -225,6 +257,7 @@ bool match = false; const struct gsm0808_speech_codec *sc_match = NULL; uint16_t amr_s15_s0_supported; + int rc; /* Note: Normally the MSC should never try to advertise a codec that * we did not advertise as supported before. In order to ensure that @@ -255,28 +288,10 @@ return -1; } - /* Check if the result is a half or full rate codec */ - switch (perm_spch) { - case GSM0808_PERM_HR1: - case GSM0808_PERM_HR2: - case GSM0808_PERM_HR3: - case GSM0808_PERM_HR4: - case GSM0808_PERM_HR6: - *full_rate = false; - break; - - case GSM0808_PERM_FR1: - case GSM0808_PERM_FR2: - case GSM0808_PERM_FR3: - case GSM0808_PERM_FR4: - case GSM0808_PERM_FR5: - *full_rate = true; - break; - - default: - LOGP(DMSC, LOGL_ERROR, "Invalid permitted-speech value: %u\n", perm_spch); + /* Determine if the result is a half or full rate codec */ + rc = full_rate_from_perm_spch(full_rate, perm_spch); + if (rc < 0) return -EINVAL; - } /* Lookup a channel mode for the selected codec */ *chan_mode = gsm88_to_chan_mode(perm_spch); -- To view, visit https://gerrit.osmocom.org/11295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iec1db4621ba5a09bc0e3fc40b66f3a3bc5f54add Gerrit-Change-Number: 11295 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 10 20:43:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 10 Oct 2018 20:43:53 +0000 Subject: Change in osmo-bsc[master]: codec_pref: also check physical channels In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11296 ) Change subject: codec_pref: also check physical channels ...................................................................... codec_pref: also check physical channels At the moment codec_pref only checks the codec configuration, but it does not check if there is actually a matching physical channel available. This should be checked too we must make sure that the codec we select fits the physical channels available on the BTS. Change-Id: I2d29dfed450e5ef93c26ed5ec9fdc0730eb3d7dd Related: OS#3503 --- M src/osmo-bsc/codec_pref.c M tests/codec_pref/codec_pref_test.c 2 files changed, 42 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index a741e11..9f30c7b 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -176,8 +176,38 @@ /* Helper function to check if the given permitted speech value is supported * by the BTS. (vty option bts->codec-support). */ -static bool test_codec_support_bts(const struct bts_codec_conf *bts_codec, uint8_t perm_spch) +static bool test_codec_support_bts(const struct gsm_bts *bts, uint8_t perm_spch) { + struct gsm_bts_trx *trx; + const struct bts_codec_conf *bts_codec = &bts->codec; + unsigned int i; + bool full_rate; + int rc; + enum gsm_phys_chan_config pchan; + bool rate_match = false; + + /* Check if the BTS provides a physical channel that matches the + * bandwith of the desired codec. */ + rc = full_rate_from_perm_spch(&full_rate, perm_spch); + if (rc < 0) + return false; + llist_for_each_entry(trx, &bts->trx_list, list) { + for (i = 0; i < TRX_NR_TS; i++) { + pchan = trx->ts[i].pchan_from_config; + if (pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) + rate_match = true; + else if (full_rate && pchan == GSM_PCHAN_TCH_F) + rate_match = true; + else if (full_rate && pchan == GSM_PCHAN_TCH_F_PDCH) + rate_match = true; + else if (!full_rate && pchan == GSM_PCHAN_TCH_H) + rate_match = true; + } + } + if (!rate_match) + return false; + + /* Check codec support */ switch (perm_spch) { case GSM0808_PERM_FR1: /* GSM-FR is always supported by all BTSs. There is also no way to @@ -269,7 +299,7 @@ /* Check this permitted speech value against the BTS specific parameters. * if the BTS does not support the codec, try the next one */ - if (!test_codec_support_bts(&bts->codec, perm_spch)) + if (!test_codec_support_bts(bts, perm_spch)) continue; /* Match the permitted speech value against the codec lists that were @@ -345,7 +375,7 @@ /* Check this permitted speech value against the BTS specific parameters. * if the BTS does not support the codec, try the next one */ - if (!test_codec_support_bts(&bts->codec, perm_spch)) + if (!test_codec_support_bts(bts, perm_spch)) continue; /* Write item into codec list */ @@ -380,7 +410,7 @@ gen_bss_supported_codec_list(&scl, msc, bts); if (scl.len <= 0) { LOGP(DMSC, LOGL_FATAL, - "codec-support of BTS %u does not intersect with codec-list of MSC %u\n", + "codec-support/trx config of BTS %u does not intersect with codec-list of MSC %u\n", bts->nr, msc->nr); rc = -1; } diff --git a/tests/codec_pref/codec_pref_test.c b/tests/codec_pref/codec_pref_test.c index e2876e2..534b99e 100644 --- a/tests/codec_pref/codec_pref_test.c +++ b/tests/codec_pref/codec_pref_test.c @@ -294,6 +294,7 @@ /* Note: FR is supported by all BTSs, so there is no flag for it */ struct gsm48_multi_rate_conf *cfg; + static struct gsm_bts_trx trx; OSMO_ASSERT(config_no < N_CONFIG_VARIANTS); @@ -324,6 +325,13 @@ cfg->m10_2 = 0; cfg->m12_2 = 0; + /* Initalize TRX with a TCH/F and a TCH/H channel */ + memset(&trx, 0, sizeof(trx)); + INIT_LLIST_HEAD(&bts->trx_list); + llist_add(&trx.list, &bts->trx_list); + trx.ts[0].pchan_from_config = GSM_PCHAN_TCH_F; + trx.ts[1].pchan_from_config = GSM_PCHAN_TCH_H; + switch (config_no) { case 0: /* FR1 (implicit) only */ -- To view, visit https://gerrit.osmocom.org/11296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2d29dfed450e5ef93c26ed5ec9fdc0730eb3d7dd Gerrit-Change-Number: 11296 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 11:26:43 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 11 Oct 2018 11:26:43 +0000 Subject: Change in osmo-msc[master]: gsm_04_08_cc: Add global guard timer for MNCC Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11307 Change subject: gsm_04_08_cc: Add global guard timer for MNCC ...................................................................... gsm_04_08_cc: Add global guard timer for MNCC The external MNCC handler may hang indefinitely in cases where the remote end of the MNCC ceases to work properly. Add a global guard timer to make sure the call reaches ACTIVE state. Change-Id: I7375d1e17cd746aac4eadfe1e587e82cf1630d3d Related: OS#3599 --- M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M tests/msc_vlr/msc_vlr_test_call.err 3 files changed, 60 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/07/11307/1 diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h index 4ffb468..b7d7971 100644 --- a/include/osmocom/msc/transaction.h +++ b/include/osmocom/msc/transaction.h @@ -69,6 +69,7 @@ int Tcurrent; /* current CC timer */ int T308_second; /* used to send release again */ struct osmo_timer_list timer; + struct osmo_timer_list timer_guard; struct gsm_mncc msg; /* stores setup/disconnect/release message */ } cc; struct { diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 19e6cba..7410947 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -73,6 +73,35 @@ static uint32_t new_callref = 0x80000001; +#define GUARD_TIMEOUT 65 + +static void gsm48_cc_guard_timeout(void *arg) +{ + struct gsm_trans *trans = arg; + DEBUGP(DCC, "guard timeout for subscr %s\n", + vlr_subscr_msisdn_or_name(trans->vsub)); + trans_free(trans); + return; +} + +static void gsm48_stop_guard_timer(struct gsm_trans *trans) +{ + if (osmo_timer_pending(&trans->cc.timer_guard)) { + DEBUGP(DCC, "stopping pending guard timer for subscr %s\n", + vlr_subscr_msisdn_or_name(trans->vsub)); + osmo_timer_del(&trans->cc.timer_guard); + } +} + +static void gsm48_start_guard_timer(struct gsm_trans *trans) +{ + if (osmo_timer_pending(&trans->cc.timer_guard)) + gsm48_stop_guard_timer(trans); + DEBUGP(DCC, "starting guard timer with %d seconds for subscr %s\n", + GUARD_TIMEOUT, vlr_subscr_msisdn_or_name(trans->vsub)); + osmo_timer_setup(&trans->cc.timer_guard, gsm48_cc_guard_timeout, trans); + osmo_timer_schedule(&trans->cc.timer_guard, GUARD_TIMEOUT, 0); +} /* Call Control */ @@ -149,6 +178,10 @@ count_statistics(trans, state); trans->cc.state = state; + + /* Stop the guard timer when a call reaches the active state */ + if (state == GSM_CSTATE_ACTIVE) + gsm48_stop_guard_timer(trans); } static int gsm48_cc_tx_status(struct gsm_trans *trans, void *arg) @@ -259,6 +292,8 @@ } if (trans->cc.state != GSM_CSTATE_NULL) new_cc_state(trans, GSM_CSTATE_NULL); + + gsm48_stop_guard_timer(trans); } static int gsm48_cc_tx_setup(struct gsm_trans *trans, void *arg); @@ -1970,6 +2005,8 @@ log_set_context(LOG_CTX_VLR_SUBSCR, trans->vsub); } + gsm48_start_guard_timer(trans); + if (trans->conn) conn = trans->conn; diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index 19cb25d..9c68ea5 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -287,6 +287,7 @@ DREF MSISDN:42342: MSC conn use - dtap == 1 (0x10: trans_cc) - MNCC says that's fine DMNCC receive message MNCC_CALL_PROC_REQ +DCC starting guard timer with 65 seconds for subscr 42342 DCC (ti 08 sub 42342) Received 'MNCC_CALL_PROC_REQ' from MNCC in state 1 (INITIATED) DCC (ti 08 sub MSISDN:42342) new state INITIATED -> MO_CALL_PROC DMSC msc_tx 2 bytes to MSISDN:42342 via RAN_UTRAN_IU @@ -296,12 +297,16 @@ - Total time passed: 1.000023 s - The other call leg got established (not shown here), MNCC tells us so DMNCC receive message MNCC_ALERT_REQ +DCC stopping pending guard timer for subscr 42342 +DCC starting guard timer with 65 seconds for subscr 42342 DCC (ti 08 sub 42342) Received 'MNCC_ALERT_REQ' from MNCC in state 3 (MO_CALL_PROC) DCC (ti 08 sub MSISDN:42342) new state MO_CALL_PROC -> CALL_DELIVERED DMSC msc_tx 2 bytes to MSISDN:42342 via RAN_UTRAN_IU - DTAP --RAN_UTRAN_IU--> MS: GSM48_MT_CC_ALERTING: 8301 - DTAP matches expected message DMNCC receive message MNCC_SETUP_RSP +DCC stopping pending guard timer for subscr 42342 +DCC starting guard timer with 65 seconds for subscr 42342 DCC (ti 08 sub 42342) Received 'MNCC_SETUP_RSP' from MNCC in state 4 (CALL_DELIVERED) DCC starting timer T313 with 30 seconds DCC (ti 08 sub MSISDN:42342) new state CALL_DELIVERED -> CONNECT_IND @@ -314,6 +319,7 @@ DRLL Dispatching 04.08 message GSM48_MT_CC_CONNECT_ACK (0x3:0xf) DCC stopping pending timer T313 DCC (ti 08 sub MSISDN:42342) new state CONNECT_IND -> ACTIVE +DCC stopping pending guard timer for subscr 42342 DMNCC transmit message MNCC_SETUP_COMPL_IND DCC Sending 'MNCC_SETUP_COMPL_IND' to MNCC. MSC --> MNCC: callref 0x80000001: MNCC_SETUP_COMPL_IND @@ -334,6 +340,7 @@ DMM Subscr_Conn(CM_SERVICE_REQ:901700000010650){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_COMMUNICATING DREF MSISDN:42342: MSC conn use - dtap == 1 (0x10: trans_cc) DMNCC receive message MNCC_REL_REQ +DCC starting guard timer with 65 seconds for subscr 42342 DCC (ti 08 sub 42342) Received 'MNCC_REL_REQ' from MNCC in state 12 (DISCONNECT_IND) DCC starting timer T308 with 10 seconds DCC (ti 08 sub MSISDN:42342) new state DISCONNECT_IND -> RELEASE_REQ @@ -349,6 +356,7 @@ MSC --> MNCC: callref 0x80000001: MNCC_REL_CNF MS <--Call Release-- MSC: subscr=MSISDN:42342 callref=0x0 DCC (ti 08 sub MSISDN:42342) new state RELEASE_REQ -> NULL +DCC stopping pending guard timer for subscr 42342 DREF VLR subscr MSISDN:42342 usage decreases to: 2 DREF MSISDN:42342: MSC conn use - trans_cc == 1 (0x2: dtap) DMM Subscr_Conn(CM_SERVICE_REQ:901700000010650){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_COMMUNICATING @@ -697,8 +705,10 @@ DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_COMMUNICATING DREF MSISDN:42342: MSC conn use - dtap == 1 (0x10: trans_cc) DMNCC receive message MNCC_SETUP_COMPL_REQ +DCC starting guard timer with 65 seconds for subscr 42342 DCC (ti 00 sub 42342) Received 'MNCC_SETUP_COMPL_REQ' from MNCC in state 8 (CONNECT_REQUEST) DCC (ti 00 sub MSISDN:42342) new state CONNECT_REQUEST -> ACTIVE +DCC stopping pending guard timer for subscr 42342 DMSC msc_tx 2 bytes to MSISDN:42342 via RAN_UTRAN_IU - DTAP --RAN_UTRAN_IU--> MS: GSM48_MT_CC_CONNECT_ACK: 030f - DTAP matches expected message @@ -717,6 +727,7 @@ DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_COMMUNICATING DREF MSISDN:42342: MSC conn use - dtap == 1 (0x10: trans_cc) DMNCC receive message MNCC_REL_REQ +DCC starting guard timer with 65 seconds for subscr 42342 DCC (ti 00 sub 42342) Received 'MNCC_REL_REQ' from MNCC in state 12 (DISCONNECT_IND) DCC starting timer T308 with 10 seconds DCC (ti 00 sub MSISDN:42342) new state DISCONNECT_IND -> RELEASE_REQ @@ -732,6 +743,7 @@ MSC --> MNCC: callref 0x423: MNCC_REL_CNF MS <--Call Release-- MSC: subscr=MSISDN:42342 callref=0x0 DCC (ti 00 sub MSISDN:42342) new state RELEASE_REQ -> NULL +DCC stopping pending guard timer for subscr 42342 DREF VLR subscr MSISDN:42342 usage decreases to: 2 DREF MSISDN:42342: MSC conn use - trans_cc == 1 (0x2: dtap) DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_COMMUNICATING @@ -1078,6 +1090,7 @@ DCC stopping pending timer T301 MS <--Call Release-- MSC: subscr=MSISDN:42342 callref=0x423 DMNCC receive message MNCC_REL_REQ +DCC starting guard timer with 65 seconds for subscr 42342 DCC (ti 00 sub 42342) Received 'MNCC_REL_REQ' from MNCC in state 7 (CALL_RECEIVED) DCC starting timer T308 with 10 seconds DCC (ti 00 sub MSISDN:42342) new state CALL_RECEIVED -> RELEASE_REQ @@ -1089,6 +1102,7 @@ MSC --> MNCC: callref 0x423: MNCC_REL_CNF DCC stopping pending timer T308 DCC (ti 00 sub MSISDN:42342) new state RELEASE_REQ -> NULL +DCC stopping pending guard timer for subscr 42342 DREF VLR subscr MSISDN:42342 usage decreases to: 2 DREF MSISDN:42342: MSC conn use - trans_cc == 1 (0x100: release) - Iu Release --RAN_UTRAN_IU--> MS @@ -1399,6 +1413,7 @@ DREF MSISDN:42342: MSC conn use - dtap == 1 (0x10: trans_cc) - MNCC says that's fine DMNCC receive message MNCC_CALL_PROC_REQ +DCC starting guard timer with 65 seconds for subscr 42342 DCC (ti 08 sub 42342) Received 'MNCC_CALL_PROC_REQ' from MNCC in state 1 (INITIATED) DCC (ti 08 sub MSISDN:42342) new state INITIATED -> MO_CALL_PROC DMSC msc_tx 2 bytes to MSISDN:42342 via RAN_UTRAN_IU @@ -1407,6 +1422,8 @@ MS <--Call Assignment-- MSC: subscr=MSISDN:42342 callref=0x80000002 - But the other side's MSISDN could not be resolved, MNCC tells us to cancel DMNCC receive message MNCC_REL_REQ +DCC stopping pending guard timer for subscr 42342 +DCC starting guard timer with 65 seconds for subscr 42342 DCC (ti 08 sub 42342) Received 'MNCC_REL_REQ' from MNCC in state 3 (MO_CALL_PROC) DCC starting timer T308 with 10 seconds DCC (ti 08 sub MSISDN:42342) new state MO_CALL_PROC -> RELEASE_REQ @@ -1427,6 +1444,7 @@ MSC --> MNCC: callref 0x80000002: MNCC_REL_CNF MS <--Call Release-- MSC: subscr=MSISDN:42342 callref=0x0 DCC (ti 08 sub MSISDN:42342) new state RELEASE_REQ -> NULL +DCC stopping pending guard timer for subscr 42342 DREF VLR subscr MSISDN:42342 usage decreases to: 2 DREF MSISDN:42342: MSC conn use - trans_cc == 1 (0x2: dtap) DMM Subscr_Conn(CM_SERVICE_REQ:901700000010650){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_COMMUNICATING @@ -1743,6 +1761,7 @@ DREF MSISDN:42342: MSC conn use - dtap == 1 (0x10: trans_cc) - MNCC says that's fine DMNCC receive message MNCC_CALL_PROC_REQ +DCC starting guard timer with 65 seconds for subscr 42342 DCC (ti 08 sub 42342) Received 'MNCC_CALL_PROC_REQ' from MNCC in state 1 (INITIATED) DCC (ti 08 sub MSISDN:42342) new state INITIATED -> MO_CALL_PROC DMSC msc_tx 2 bytes to MSISDN:42342 via RAN_UTRAN_IU @@ -1751,6 +1770,8 @@ MS <--Call Assignment-- MSC: subscr=MSISDN:42342 callref=0x80000003 - But the other side's MSISDN could not be resolved, MNCC tells us to cancel DMNCC receive message MNCC_REL_REQ +DCC stopping pending guard timer for subscr 42342 +DCC starting guard timer with 65 seconds for subscr 42342 DCC (ti 08 sub 42342) Received 'MNCC_REL_REQ' from MNCC in state 3 (MO_CALL_PROC) DCC starting timer T308 with 10 seconds DCC (ti 08 sub MSISDN:42342) new state MO_CALL_PROC -> RELEASE_REQ @@ -1770,6 +1791,7 @@ DCC Sending 'MNCC_REL_CNF' to MNCC. MSC --> MNCC: callref 0x80000003: MNCC_REL_CNF DCC (ti 08 sub MSISDN:42342) new state RELEASE_REQ -> NULL +DCC stopping pending guard timer for subscr 42342 DREF VLR subscr MSISDN:42342 usage decreases to: 2 DREF MSISDN:42342: MSC conn use - trans_cc == 0 (0x0: ) DMM Subscr_Conn(CM_SERVICE_REQ:901700000010650){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_UNUSED -- To view, visit https://gerrit.osmocom.org/11307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7375d1e17cd746aac4eadfe1e587e82cf1630d3d Gerrit-Change-Number: 11307 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 11:30:01 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 11 Oct 2018 11:30:01 +0000 Subject: Change in osmo-msc[master]: mncc: protect against non responsive MNCC during setup In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/11265 ) Change subject: mncc: protect against non responsive MNCC during setup ...................................................................... Abandoned This is not too well thought out, will be replaced by another patch. -- To view, visit https://gerrit.osmocom.org/11265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ieaf6015d78ddef68827be107d3722c9d089f7c66 Gerrit-Change-Number: 11265 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 11:54:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 11:54:47 +0000 Subject: Change in osmo-hlr[master]: store gsup peer upon accepting LU In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11232 ) Change subject: store gsup peer upon accepting LU ...................................................................... Patch Set 3: https://osmocom.org/issues/3644 -- To view, visit https://gerrit.osmocom.org/11232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If438664faa5d68404f465f8b2002c6d03bbf3ceb Gerrit-Change-Number: 11232 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 11 Oct 2018 11:54:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 11:54:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 11:54:49 +0000 Subject: Change in osmo-hlr[master]: store gsup peer upon accepting LU In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11232 ) Change subject: store gsup peer upon accepting LU ...................................................................... store gsup peer upon accepting LU Store the GSUP client's IPA_IDTAG_SERNR in vlr_number or sgsn_number (depending on is_ps), just before sending the Insert Subscriber Data message after a successful LU Req. Log about it. Original patch: Ib2611421f3638eadc361787af801fffe9a34bd8a by laforge Related: OS#2796 Change-Id: If438664faa5d68404f465f8b2002c6d03bbf3ceb --- M src/hlr.c 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/hlr.c b/src/hlr.c index f631d52..26be8d5 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -242,12 +242,15 @@ static int rx_upd_loc_req(struct osmo_gsup_conn *conn, const struct osmo_gsup_message *gsup) { + struct hlr_subscriber *subscr; struct lu_operation *luop = lu_op_alloc_conn(conn); if (!luop) { LOGP(DMAIN, LOGL_ERROR, "LU REQ from conn without addr?\n"); return -EINVAL; } + subscr = &luop->subscr; + lu_op_statechg(luop, LU_S_LU_RECEIVED); switch (gsup->cn_domain) { @@ -298,6 +301,15 @@ lu_op_tx_cancel_old(luop); } else #endif + + /* Store the VLR / SGSN number with the subscriber, so we know where it was last seen. */ + LOGP(DAUC, LOGL_DEBUG, "IMSI='%s': storing %s = %s\n", + subscr->imsi, luop->is_ps ? "SGSN number" : "VLR number", + osmo_quote_str((const char*)luop->peer, -1)); + if (db_subscr_lu(g_hlr->dbc, subscr->id, (const char *)luop->peer, luop->is_ps)) + LOGP(DAUC, LOGL_ERROR, "IMSI='%s': Cannot update %s in the database\n", + subscr->imsi, luop->is_ps ? "SGSN number" : "VLR number"); + { /* TODO: Subscriber allowed to roam in PLMN? */ /* TODO: Update RoutingInfo */ -- To view, visit https://gerrit.osmocom.org/11232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If438664faa5d68404f465f8b2002c6d03bbf3ceb Gerrit-Change-Number: 11232 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 12:04:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 12:04:46 +0000 Subject: Change in osmo-hlr[master]: fix and re-enable osmo_hlr_subscriber_update_notify() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11233 ) Change subject: fix and re-enable osmo_hlr_subscriber_update_notify() ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11233/3/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/#/c/11233/3/src/hlr.c at 70 PS3, Line 70: subscr->imsi, subscr->vlr_number, subscr->sgsn_number); needs string escaping like in the preceding patch -- To view, visit https://gerrit.osmocom.org/11233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7c317de8329d9a115d072fc61ddb9abc21b7e8d8 Gerrit-Change-Number: 11233 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 11 Oct 2018 12:04:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 12:06:07 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 12:06:07 +0000 Subject: Change in osmo-hlr[master]: fix and re-enable osmo_hlr_subscriber_update_notify() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11233 to look at the new patch set (#4). Change subject: fix and re-enable osmo_hlr_subscriber_update_notify() ...................................................................... fix and re-enable osmo_hlr_subscriber_update_notify() Send updated subscriber data out to exactly those GSUP clients that match the last LU operations (depending on each client sending distinct identification). As this adds logging on DLGSUP, also change adjacent GSUP related logging from DMAIN to DLGSUP. Related: OS#2785 Change-Id: I7c317de8329d9a115d072fc61ddb9abc21b7e8d8 --- M src/hlr.c 1 file changed, 48 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/33/11233/4 -- To view, visit https://gerrit.osmocom.org/11233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7c317de8329d9a115d072fc61ddb9abc21b7e8d8 Gerrit-Change-Number: 11233 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 12:09:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 12:09:20 +0000 Subject: Change in osmo-hlr[master]: fix and re-enable osmo_hlr_subscriber_update_notify() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11233 ) Change subject: fix and re-enable osmo_hlr_subscriber_update_notify() ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11233/4/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/#/c/11233/4/src/hlr.c at 71 PS4, Line 71: osmo_quote_str(subscr->sgsn_number, -1)); actually, tow osmo_quote_str() on the same log won't work. Introducing another name buffer just to log this doesn't seem worth it, particularly since the loop logs each one again. dropping. -- To view, visit https://gerrit.osmocom.org/11233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7c317de8329d9a115d072fc61ddb9abc21b7e8d8 Gerrit-Change-Number: 11233 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 11 Oct 2018 12:09:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 12:09:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 12:09:37 +0000 Subject: Change in osmo-hlr[master]: fix and re-enable osmo_hlr_subscriber_update_notify() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11233 to look at the new patch set (#5). Change subject: fix and re-enable osmo_hlr_subscriber_update_notify() ...................................................................... fix and re-enable osmo_hlr_subscriber_update_notify() Send updated subscriber data out to exactly those GSUP clients that match the last LU operations (depending on each client sending distinct identification). As this adds logging on DLGSUP, also change adjacent GSUP related logging from DMAIN to DLGSUP. Related: OS#2785 Change-Id: I7c317de8329d9a115d072fc61ddb9abc21b7e8d8 --- M src/hlr.c 1 file changed, 42 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/33/11233/5 -- To view, visit https://gerrit.osmocom.org/11233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7c317de8329d9a115d072fc61ddb9abc21b7e8d8 Gerrit-Change-Number: 11233 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 12:12:06 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 12:12:06 +0000 Subject: Change in osmo-dev[master]: run tcpdump *after* finding programs (not before) In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11142 ) Change subject: run tcpdump *after* finding programs (not before) ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11142/2/net/tmpl_std/run.sh File net/tmpl_std/run.sh: https://gerrit.osmocom.org/#/c/11142/2/net/tmpl_std/run.sh at 63 PS2, Line 63: sudo tcpdump -i lo -n -w current_log/lo.single.pcap -U not port 22 & the above isn't actually finding programs, just assigning to vars, so this change has no functional difference -- To view, visit https://gerrit.osmocom.org/11142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If487c357cbae504410545d2ed00d7e22f5e60f4f Gerrit-Change-Number: 11142 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 11 Oct 2018 12:12:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 12:12:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 12:12:45 +0000 Subject: Change in osmo-dev[master]: 3G+2G.deps: add osmo-sip-connector In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11140 ) Change subject: 3G+2G.deps: add osmo-sip-connector ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I57fa43209581638c39554079d7c4b65ce24890f8 Gerrit-Change-Number: 11140 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 11 Oct 2018 12:12:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 12:13:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 12:13:12 +0000 Subject: Change in osmo-dev[master]: change default of MGW4BSC_PORT to 2427 In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11141 ) Change subject: change default of MGW4BSC_PORT to 2427 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2c73df138642bc3fd52eea493fcab5261e5bc5c8 Gerrit-Change-Number: 11141 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 11 Oct 2018 12:13:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 12:15:28 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 12:15:28 +0000 Subject: Change in osmo-dev[master]: exit if xterm was not found In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11143 ) Change subject: exit if xterm was not found ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11143/3/net/tmpl_std/run.sh File net/tmpl_std/run.sh: https://gerrit.osmocom.org/#/c/11143/3/net/tmpl_std/run.sh at 44 PS3, Line 44: echo "ERROR: Couldn't find urxvt or xterm!" (prefer generalized message, so that if someone were to edit the terminal cmdlines invoked above, then we don't have this msg out of sync) -- To view, visit https://gerrit.osmocom.org/11143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 Gerrit-Change-Number: 11143 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 11 Oct 2018 12:15:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 12:18:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 12:18:03 +0000 Subject: Change in osmo-dev[master]: exit if xterm was not found In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#4) to the change originally created by osmith. ( https://gerrit.osmocom.org/11143 ) Change subject: exit if xterm was not found ...................................................................... exit if xterm was not found Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 --- M net/tmpl_std/run.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/43/11143/4 -- To view, visit https://gerrit.osmocom.org/11143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 Gerrit-Change-Number: 11143 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 12:18:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 12:18:17 +0000 Subject: Change in osmo-dev[master]: exit if xterm was not found In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11143 ) Change subject: exit if xterm was not found ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 Gerrit-Change-Number: 11143 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 11 Oct 2018 12:18:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 12:24:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 12:24:26 +0000 Subject: Change in osmo-dev[master]: Support osmo-sip-connector with kamailio In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11144 ) Change subject: Support osmo-sip-connector with kamailio ...................................................................... Patch Set 4: Code-Review+2 (3 comments) https://gerrit.osmocom.org/#/c/11144/4/net/tmpl_std/kamailio.cfg File net/tmpl_std/kamailio.cfg: https://gerrit.osmocom.org/#/c/11144/4/net/tmpl_std/kamailio.cfg at 9 PS4, Line 9: # FLT_ - per transaction (message) flags (space indent above, tab below) https://gerrit.osmocom.org/#/c/11144/4/net/tmpl_std/kamailio.cfg at 47 PS4, Line 47: /* uncomment and configure the following line if you want Kamailio to (whitespace) https://gerrit.osmocom.org/#/c/11144/4/net/tmpl_std/kamailio.cfg at 162 PS4, Line 162: modparam("acc", "log_extra", (whitespace) -- To view, visit https://gerrit.osmocom.org/11144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 Gerrit-Change-Number: 11144 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: daniel Gerrit-Comment-Date: Thu, 11 Oct 2018 12:24:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 12:26:54 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 12:26:54 +0000 Subject: Change in osmo-dev[master]: exit if xterm was not found In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11143 ) Change subject: exit if xterm was not found ...................................................................... Patch Set 4: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11143/4/net/tmpl_std/run.sh File net/tmpl_std/run.sh: https://gerrit.osmocom.org/#/c/11143/4/net/tmpl_std/run.sh at 45 PS4, Line 45: exit 1 no, wait, we invoke term() only after starting the tcpdumps, so we should check terminal presence outside of term(), before invoking tcpdump. -- To view, visit https://gerrit.osmocom.org/11143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 Gerrit-Change-Number: 11143 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 11 Oct 2018 12:26:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 12:28:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 12:28:29 +0000 Subject: Change in osmo-dev[master]: exit if xterm was not found In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11143 ) Change subject: exit if xterm was not found ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11143/4/net/tmpl_std/run.sh File net/tmpl_std/run.sh: https://gerrit.osmocom.org/#/c/11143/4/net/tmpl_std/run.sh at 45 PS4, Line 45: exit 1 > no, wait, we invoke term() only after starting the tcpdumps, so we should check terminal presence ou [?] (which also makes sense apart from the exit: no need to do 'which' for each term() invocation, once up front is plenty) -- To view, visit https://gerrit.osmocom.org/11143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 Gerrit-Change-Number: 11143 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 11 Oct 2018 12:28:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 12:29:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 12:29:30 +0000 Subject: Change in osmo-bts[master]: clear GPRS indicator in SI3 while PCU is disconnected In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10170 ) Change subject: clear GPRS indicator in SI3 while PCU is disconnected ...................................................................... Patch Set 1: any news here? -- To view, visit https://gerrit.osmocom.org/10170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a6f5c636c0fe098ee31c280d4572a3f8122b44b Gerrit-Change-Number: 10170 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 11 Oct 2018 12:29:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 12:30:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 12:30:11 +0000 Subject: Change in osmo-bts[master]: clear GPRS indicator in SI3 while PCU is disconnected In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10170 ) Change subject: clear GPRS indicator in SI3 while PCU is disconnected ...................................................................... Patch Set 1: ah, it says so in the issue. -- To view, visit https://gerrit.osmocom.org/10170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a6f5c636c0fe098ee31c280d4572a3f8122b44b Gerrit-Change-Number: 10170 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 11 Oct 2018 12:30:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 12:40:24 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 12:40:24 +0000 Subject: Change in osmo-bsc[master]: vty 'show bts'/'show trx': display IPs and ports In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11290 ) Change subject: vty 'show bts'/'show trx': display IPs and ports ...................................................................... Patch Set 3: Verified+1 (3 comments) still needs the space,const,commit-tag fixed... https://gerrit.osmocom.org/#/c/11290/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11290/3//COMMIT_MSG at 25 PS3, Line 25: Relates: OS#3145 should be "Related:" https://gerrit.osmocom.org/#/c/11290/3/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11290/3/src/osmo-bsc/bsc_vty.c at 293 PS3, Line 293: /*! Dump the IP addresses and ports of the input signal link's timeslot. > I missed the fact that osmo_sock_get_name doesn't return a static buffer [like most parts of osmocom [?] wow, the API doc totally omits that fact. https://gerrit.osmocom.org/#/c/11290/3/src/osmo-bsc/bsc_vty.c at 1065 PS3, Line 1065: vty_out(vty, " ip.access stream ID: 0x%02x ", trx->rsl_tei); (I like above "OML Link", maybe we can also say "RSL Link" here ... but since you're just editing existing code, maybe nevermind instead) -- To view, visit https://gerrit.osmocom.org/11290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f Gerrit-Change-Number: 11290 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 11 Oct 2018 12:40:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 12:40:31 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 12:40:31 +0000 Subject: Change in osmo-bsc[master]: vty 'show bts'/'show trx': display IPs and ports In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11290 ) Change subject: vty 'show bts'/'show trx': display IPs and ports ...................................................................... Patch Set 3: -Verified Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f Gerrit-Change-Number: 11290 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 11 Oct 2018 12:40:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 12:50:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 12:50:52 +0000 Subject: Change in osmo-bsc[master]: vty 'show bts'/'show trx': display IPs and ports In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11290 ) Change subject: vty 'show bts'/'show trx': display IPs and ports ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11290/3/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11290/3/src/osmo-bsc/bsc_vty.c at 293 PS3, Line 293: /*! Dump the IP addresses and ports of the input signal link's timeslot. > wow, the API doc totally omits that fact. how blind am I. It says so twice even. -- To view, visit https://gerrit.osmocom.org/11290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f Gerrit-Change-Number: 11290 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 11 Oct 2018 12:50:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 12:55:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 12:55:15 +0000 Subject: Change in libosmo-abis[master]: ipaccess: add e1inp_sign_link_name() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11294 ) Change subject: ipaccess: add e1inp_sign_link_name() ...................................................................... Patch Set 1: Code-Review-2 (1 comment) https://gerrit.osmocom.org/#/c/11294/1/src/e1_input.c File src/e1_input.c: https://gerrit.osmocom.org/#/c/11294/1/src/e1_input.c at 554 PS1, Line 554: return osmo_sock_get_name(NULL, link->ts->driver.ipaccess.fd.fd); we don't ever want to allocate under a NULL ctx. After the comment to the other patch, we might as well drop this entire patch..? Instead of a wrapper like this, I'd suggest to introduce osmo_sock_get_name2() with better API: * use static buffer * don't return '()' braces around the string, leave that up to the caller but I guess we don't need it? -- To view, visit https://gerrit.osmocom.org/11294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1e78ee4dc5c9bd10592c090b9a3b35baf61a6d69 Gerrit-Change-Number: 11294 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 11 Oct 2018 12:55:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 13:15:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 13:15:38 +0000 Subject: Change in osmo-msc[master]: gsm_04_08_cc: Add global guard timer for MNCC In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11307 ) Change subject: gsm_04_08_cc: Add global guard timer for MNCC ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/11307/1/src/libmsc/gsm_04_08_cc.c File src/libmsc/gsm_04_08_cc.c: https://gerrit.osmocom.org/#/c/11307/1/src/libmsc/gsm_04_08_cc.c at 76 PS1, Line 76: #define GUARD_TIMEOUT 65 should this be configurable? https://gerrit.osmocom.org/#/c/11307/1/src/libmsc/gsm_04_08_cc.c at 90 PS1, Line 90: DEBUGP(DCC, "stopping pending guard timer for subscr %s\n", place the context information first, like below in line 173. I'd also prefer to use vlr_subscr_name() to match most other logging. -- To view, visit https://gerrit.osmocom.org/11307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7375d1e17cd746aac4eadfe1e587e82cf1630d3d Gerrit-Change-Number: 11307 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 11 Oct 2018 13:15:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 13:23:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 13:23:51 +0000 Subject: Change in docker-playground[master]: regen_docs: Add a script that extracts counter and vty info In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10273 ) Change subject: regen_docs: Add a script that extracts counter and vty info ...................................................................... Patch Set 1: (1 comment) what is the idea, to then manually commit them to osmo-gsm-manuals? it doesn't update automatically, does it? https://gerrit.osmocom.org/#/c/10273/1/regen_docs/regen_docs.sh File regen_docs/regen_docs.sh: https://gerrit.osmocom.org/#/c/10273/1/regen_docs/regen_docs.sh at 43 PS1, Line 43: container_create osmo-bsc-master 172.18.12.11 (whitespace) -- To view, visit https://gerrit.osmocom.org/10273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4e57a64caccfbc982199f8f25bbb14c2d96e11a6 Gerrit-Change-Number: 10273 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Thu, 11 Oct 2018 13:23:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Oct 11 15:13:18 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 11 Oct 2018 15:13:18 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-asn1c_=C2=BB_a1=3Dde?= =?UTF-8?Q?fault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#273?= In-Reply-To: <1965523020.25.1539184206243.JavaMail.jenkins@jenkins.osmocom.org> References: <1965523020.25.1539184206243.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <44211286.34.1539270798144.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:15:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:15:22 +0000 Subject: Change in osmo-bsc[master]: fix counters for inter-BSC outgoing Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11308 Change subject: fix counters for inter-BSC outgoing ...................................................................... fix counters for inter-BSC outgoing Fix copy-paste error that resulted in counting outgoing inter-BSC HOs as incoming ones. Change-Id: I188b5db9e98c76153fdfb6f864d2cbfaea77bd5d --- M src/osmo-bsc/handover_fsm.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/08/11308/1 diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 0ba5061..90d5f6c 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -641,14 +641,14 @@ static int result_counter_INTER_BSC_HO_OUT(enum handover_result result) { switch (result) { case HO_RESULT_OK: - return BSC_CTR_INTER_BSC_HO_IN_COMPLETED; + return BSC_CTR_INTER_BSC_HO_OUT_COMPLETED; case HO_RESULT_FAIL_TIMEOUT: - return BSC_CTR_INTER_BSC_HO_IN_TIMEOUT; + return BSC_CTR_INTER_BSC_HO_OUT_TIMEOUT; case HO_RESULT_CONN_RELEASE: - return BSC_CTR_INTER_BSC_HO_IN_STOPPED; + return BSC_CTR_INTER_BSC_HO_OUT_STOPPED; default: case HO_RESULT_ERROR: - return BSC_CTR_INTER_BSC_HO_IN_ERROR; + return BSC_CTR_INTER_BSC_HO_OUT_ERROR; } } -- To view, visit https://gerrit.osmocom.org/11308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I188b5db9e98c76153fdfb6f864d2cbfaea77bd5d Gerrit-Change-Number: 11308 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:15:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:15:22 +0000 Subject: Change in osmo-bsc[master]: gscon_forget_lchan(): no Clear Request after Clear Command Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11309 Change subject: gscon_forget_lchan(): no Clear Request after Clear Command ...................................................................... gscon_forget_lchan(): no Clear Request after Clear Command Send a BSSMAP Clear Request only if we are not already in ST_CLEARING, i.e. haven't received a BSSMAP Clear Command yet. Related: osmo-ttcn3-hacks If772dbbc5f9790d3f911465e1303dd0a99811154 Change-Id: Idc749068580da45e821e0af04cfa14cc7ce5c432 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/09/11309/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 32375d4..3c9be56 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -644,7 +644,9 @@ conn->ho.new_lchan = NULL; if (conn->lchan == lchan) conn->lchan = NULL; - if (!conn->lchan) + + if (conn->fi->state != ST_CLEARING + && !conn->lchan) gscon_bssmap_clear(conn, GSM0808_CAUSE_EQUIPMENT_FAILURE); } -- To view, visit https://gerrit.osmocom.org/11309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idc749068580da45e821e0af04cfa14cc7ce5c432 Gerrit-Change-Number: 11309 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:15:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:15:23 +0000 Subject: Change in osmo-bsc[master]: gscon_forget_lchan(): Clear Request iff no lchans remain Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11310 Change subject: gscon_forget_lchan(): Clear Request iff no lchans remain ...................................................................... gscon_forget_lchan(): Clear Request iff no lchans remain Send a BSSMAP Clear Request only if absolutely no lchan remains associated to the conn, anywhere (Assignment, Handover as well as primary lchan). Conceivable would be a situation where e.g. we're in handover and a new lchan is ready, when just at a time where it doesn't matter anymore the old lchan fails. We could just carry on with the new one then. Change-Id: Ibd8e38ccf7759b8834efdedf742c46c227b26e91 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/10/11310/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 3c9be56..a8b3183 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -646,7 +646,9 @@ conn->lchan = NULL; if (conn->fi->state != ST_CLEARING - && !conn->lchan) + && !conn->lchan + && !conn->ho.new_lchan + && !conn->assignment.new_lchan) gscon_bssmap_clear(conn, GSM0808_CAUSE_EQUIPMENT_FAILURE); } -- To view, visit https://gerrit.osmocom.org/11310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd8e38ccf7759b8834efdedf742c46c227b26e91 Gerrit-Change-Number: 11310 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:15:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:15:23 +0000 Subject: Change in osmo-bsc[master]: subscr conn: properly forget lchan before release Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11311 Change subject: subscr conn: properly forget lchan before release ...................................................................... subscr conn: properly forget lchan before release Clear all lchan->conn pointers when the subscr conn code is choosing to release an lchan, with gscon_release_lchan(). Rationale: when an lchan releases in error, it should trigger the conn to be notified and cause a BSSMAP Clear. However, if the conn is actively requesting for an lchan release, it is already taking care of the situation. Related: osmo-ttcn3-hacks If772dbbc5f9790d3f911465e1303dd0a99811154 Change-Id: I4fd582b41ba4599af704d670af83651d2450b1db --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 22 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/11/11311/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index a8b3183..52afd54 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -149,6 +149,24 @@ gscon_sigtran_send(conn, resp); } + +/* Release an lchan in such a way that it doesn't fire events back to the conn. */ +static void gscon_release_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan, + bool do_sacch_deact, bool err, enum gsm48_rr_cause cause_rr) +{ + if (!lchan || !conn) + return; + if (lchan->conn == conn) + lchan_forget_conn(lchan); + if (conn->lchan == lchan) + conn->lchan = NULL; + if (conn->ho.fi && conn->ho.new_lchan == lchan) + conn->ho.new_lchan = NULL; + if (conn->assignment.new_lchan == lchan) + conn->assignment.new_lchan = NULL; + lchan_release(lchan, do_sacch_deact, err, cause_rr); +} + void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_sacch_deact) { if (conn->ho.fi) @@ -156,9 +174,7 @@ assignment_reset(conn); - lchan_release(conn->lchan, do_sacch_deact, false, 0); - lchan_forget_conn(conn->lchan); - conn->lchan = NULL; + gscon_release_lchan(conn, conn->lchan, do_sacch_deact, false, 0); } static void handle_bssap_n_connect(struct osmo_fsm_inst *fi, struct osmo_scu_prim *scu_prim) @@ -602,10 +618,8 @@ if (conn->lchan->fi_rtp) osmo_fsm_inst_dispatch(conn->lchan->fi_rtp, LCHAN_RTP_EV_ESTABLISHED, 0); - if (old_lchan && (old_lchan != new_lchan)) { - lchan_forget_conn(old_lchan); - lchan_release(old_lchan, false, false, 0); - } + if (old_lchan && (old_lchan != new_lchan)) + gscon_release_lchan(conn, old_lchan, false, false, 0); } void gscon_lchan_releasing(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan) @@ -769,7 +783,7 @@ switch (fi->T) { case 993210: - lchan_release(conn->lchan, false, true, RSL_ERR_INTERWORKING); + gscon_release_lchan(conn, conn->lchan, false, true, RSL_ERR_INTERWORKING); /* MSC has not responded/confirmed connection with CC, this * could indicate a bad SCCP connection. We now inform the the -- To view, visit https://gerrit.osmocom.org/11311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4fd582b41ba4599af704d670af83651d2450b1db Gerrit-Change-Number: 11311 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:15:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:15:23 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: fix failure handling: notify conn when released Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11312 Change subject: lchan_fsm: fix failure handling: notify conn when released ...................................................................... lchan_fsm: fix failure handling: notify conn when released Usually, conn->lchan is set to NULL before/upon releasing it. However, if the lchan is still associated with a conn upon/after release, make sure the conn realizes it has no lchan and sends a BSSMAP Clear Request to the MSC. lchan_reset() is the last step before an lchan is fully unused. In there, make sure to notify any conn that might still be associated, with gscon_forget_lchan(). lchan_cleanup() does the same, but in fact this is only called when an lchan is *deallocated*, but instead it usually merely goes to the UNUSED state. It may make sense to call gscon_forget_lchan() sooner, e.g. when entering a releasing state. This here nevertheless is a final safeguard. Related: osmo-ttcn3-hacks If772dbbc5f9790d3f911465e1303dd0a99811154 Change-Id: I88337a18246c44ba48da64bb611a3cbb647a750e --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/12/11312/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 4aaedde..9f2d6c3 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -368,6 +368,9 @@ { LOG_LCHAN(lchan, LOGL_DEBUG, "Clearing lchan state\n"); + if (lchan->conn) + gscon_forget_lchan(lchan->conn, lchan); + if (lchan->rqd_ref) { talloc_free(lchan->rqd_ref); lchan->rqd_ref = NULL; -- To view, visit https://gerrit.osmocom.org/11312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I88337a18246c44ba48da64bb611a3cbb647a750e Gerrit-Change-Number: 11312 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:15:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:15:23 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: notify conn of released lchan upon RF Release Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11313 Change subject: lchan_fsm: notify conn of released lchan upon RF Release ...................................................................... lchan_fsm: notify conn of released lchan upon RF Release Related: osmo-ttcn3-hacks If772dbbc5f9790d3f911465e1303dd0a99811154 Change-Id: I7621616c24588c2db15ad1ae7ca68cfa0fb76f66 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/13/11313/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 9f2d6c3..39edaff 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -993,6 +993,13 @@ { int rc; struct gsm_lchan *lchan = lchan_fi_lchan(fi); + + /* For planned releases, a conn has already forgotten about the lchan. And later on, in + * lchan_reset(), we make sure it does. But in case of releases from error handling, the + * conn might as well notice now already that its lchan is becoming unusable. */ + if (lchan->conn) + gscon_forget_lchan(lchan->conn, lchan); + rc = rsl_tx_rf_chan_release(lchan); if (rc) LOG_LCHAN(lchan, LOGL_ERROR, "Failed to Tx RSL RF Channel Release: rc=%d %s\n", -- To view, visit https://gerrit.osmocom.org/11313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7621616c24588c2db15ad1ae7ca68cfa0fb76f66 Gerrit-Change-Number: 11313 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:15:24 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:15:24 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: adjust inter-BSC HO failure handling to spec Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11314 Change subject: handover_fsm: adjust inter-BSC HO failure handling to spec ...................................................................... handover_fsm: adjust inter-BSC HO failure handling to spec Inter-BSC outgoing lacked the required BSSMAP HO Failure dispatch. Not all cases should send BSSMAP HO Failure, name the relevant spec paragraphs in comments and adjust handling. Related: osmo-ttcn3-hacks If772dbbc5f9790d3f911465e1303dd0a99811154 Change-Id: I0980cacb9713e41a1eef3a0a7f6cc892e8a20da5 --- M src/osmo-bsc/handover_fsm.c 1 file changed, 33 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/14/11314/1 diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 90d5f6c..4286084 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -40,6 +40,7 @@ #include #include #include +#include #define LOG_FMT_BTS "bts %u lac-ci %u-%u arfcn-bsic %d-%d" #define LOG_ARGS_BTS(bts) \ @@ -697,9 +698,39 @@ result = HO_RESULT_ERROR; } else result = bsc_tx_bssmap_ho_complete(conn, ho->new_lchan); - } else { + } + /* Not 'else': above checks may still result in HO_RESULT_ERROR. */ + if (result == HO_RESULT_ERROR) { + /* Return a BSSMAP Handover Failure, as described in 3GPP TS 48.008 3.1.5.2.2 + * "Handover Resource Allocation Failure" */ bsc_tx_bssmap_ho_failure(conn); - /* TODO: Also send BSSMAP Clear Request? */ + } + } else if (ho->scope & HO_INTER_BSC_OUT) { + switch (result) { + case HO_RESULT_OK: + break; + case HO_RESULT_FAIL_RR_HO_FAIL: + /* Return a BSSMAP Handover Failure, as described in 3GPP TS 48.008 3.1.5.3.2 + * "Handover Failure" */ + bsc_tx_bssmap_ho_failure(conn); + break; + default: + case HO_RESULT_FAIL_TIMEOUT: + switch (ho->fi->state) { + case HO_OUT_ST_WAIT_HO_COMMAND: + /* MSC never replied with a Handover Command. Fail and ignore the + * handover, continue to use the lchan. */ + break; + default: + case HO_OUT_ST_WAIT_CLEAR: + /* 3GPP TS 48.008 3.1.5.3.3 "Abnormal Conditions": if neither MS reports + * HO Failure nor the MSC sends a Clear Command, we should release the + * dedicated radio resources and send a Clear Request to the MSC. */ + lchan_release(conn->lchan, false, true, GSM48_RR_CAUSE_ABNORMAL_TIMER); + /* Once the channel release is through, the BSSMAP Clear will follow. */ + break; + } + break; } } -- To view, visit https://gerrit.osmocom.org/11314 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0980cacb9713e41a1eef3a0a7f6cc892e8a20da5 Gerrit-Change-Number: 11314 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:21:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:21:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add 3 tests for inter-BSC HO outgoing failures Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11315 Change subject: bsc: add 3 tests for inter-BSC HO outgoing failures ...................................................................... bsc: add 3 tests for inter-BSC HO outgoing failures Add * TC_ho_out_fail_no_msc_response() * TC_ho_out_fail_rr_ho_failure() * TC_ho_out_fail_no_ho_detect() Depends: I0980cacb9713e41a1eef3a0a7f6cc892e8a20da5 (osmo-bsc) Change-Id: If772dbbc5f9790d3f911465e1303dd0a99811154 --- M bsc/BSC_Tests.ttcn M bsc/expected-results.xml M library/BSSMAP_Templates.ttcn 3 files changed, 234 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/15/11315/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 754f7b3..5f77021 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2274,6 +2274,214 @@ vc_conn.done; } +/* BSC asks for inter-BSC HO, but the MSC decides that it won't happen and + * simply never sends a BSSMAP Handover Command. */ +private function f_tc_ho_out_fail_no_msc_response(charstring id) runs on MSC_ConnHdlr { + g_pars := valueof(t_def_TestHdlrPars); + + var PDU_BSSAP ass_req := f_gen_ass_req(); + ass_req.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_req.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + f_establish_fully(ass_req, exp_compl); + + f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); + + BSSAP.receive(tr_BSSMAP_HandoverRequired); + + /* osmo-bsc should time out 10 seconds after the handover started. + * Let's give it a bit extra. */ + f_sleep(15.0); + + /* The old lchan and conn should still be active. See that arbitrary L3 + * is still going through. */ + var octetstring l3 := '0123456789'O; + RSL.send(ts_RSL_DATA_IND(g_chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3)); + var template PDU_BSSAP exp_data := { + discriminator := '1'B, + spare := '0000000'B, + dlci := '00'O, + lengthIndicator := 5, + pdu := { + dtap := l3 + } + }; + BSSAP.receive(exp_data); + setverdict(pass); + f_sleep(1.0); +} +testcase TC_ho_out_fail_no_msc_response() runs on test_CT { + var MSC_ConnHdlr vc_conn; + + f_init(1, true); + f_sleep(1.0); + + vc_conn := f_start_handler(refers(f_tc_ho_out_fail_no_msc_response)); + vc_conn.done; +} + +/* BSC asks for inter-BSC HO, receives BSSMAP Handover Command, but MS reports + * RR Handover Failure. */ +private function f_tc_ho_out_fail_rr_ho_failure(charstring id) runs on MSC_ConnHdlr { + g_pars := valueof(t_def_TestHdlrPars); + + var PDU_BSSAP ass_req := f_gen_ass_req(); + ass_req.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_req.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + f_establish_fully(ass_req, exp_compl); + + f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); + + BSSAP.receive(tr_BSSMAP_HandoverRequired); + + f_sleep(0.5); + /* The MSC negotiates Handover Request and Handover Request Ack with + * the other BSS and comes back with a BSSMAP Handover Command + * containing an RR Handover Command coming from the target BSS... */ + + var PDU_ML3_NW_MS rr_ho_cmd := valueof(ts_RR_HandoverCommand); + log("Remote cell's RR Handover Command passed through as L3 Info: ", rr_ho_cmd); + var octetstring rr_ho_cmd_enc := enc_PDU_ML3_NW_MS(rr_ho_cmd); + log("Remote cell's RR Handover Command passed through as L3 Info, encoded: ", rr_ho_cmd_enc); + BSSAP.send(ts_BSSMAP_HandoverCommand(rr_ho_cmd_enc)); + + /* expect the Handover Command to go out on RR */ + var RSL_Message rsl_ho_cmd + RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, ?)) -> value rsl_ho_cmd; + log("RSL Data Req went out to first BTS: ", rsl_ho_cmd); + var RSL_IE_Body rsl_ho_cmd_l3; + if (not f_rsl_find_ie(rsl_ho_cmd, RSL_IE_L3_INFO, rsl_ho_cmd_l3)) { + log("RSL message contains no L3 Info IE, expected RR Handover Command"); + setverdict(fail); + } else { + log("Found L3 Info: ", rsl_ho_cmd_l3); + if (rsl_ho_cmd_l3.l3_info.payload != rr_ho_cmd_enc) { + log("FAIL: the BSC sent out a different L3 Info, not matching the RR Handover Command the other BSS forwarded."); + setverdict(fail); + } else { + log("Success: the BSC sent out the same RR Handover Command the other BSS forwarded."); + setverdict(pass); + } + } + + f_sleep(0.2); + f_rsl_send_l3(ts_RRM_HandoverFailure('00'O)); + + /* Should tell the MSC about the failure */ + BSSAP.receive(tr_BSSMAP_HandoverFailure); + + f_sleep(1.0); + + /* The old lchan and conn should still be active. See that arbitrary L3 + * is still going through. */ + var octetstring l3 := '0123456789'O; + RSL.send(ts_RSL_DATA_IND(g_chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3)); + var template PDU_BSSAP exp_data := { + discriminator := '1'B, + spare := '0000000'B, + dlci := '00'O, + lengthIndicator := 5, + pdu := { + dtap := l3 + } + }; + BSSAP.receive(exp_data); + setverdict(pass); + f_sleep(1.0); + + setverdict(pass); + f_sleep(1.0); +} +testcase TC_ho_out_fail_rr_ho_failure() runs on test_CT { + var MSC_ConnHdlr vc_conn; + + f_init(1, true); + f_sleep(1.0); + + vc_conn := f_start_handler(refers(f_tc_ho_out_fail_rr_ho_failure)); + vc_conn.done; +} + +/* BSC asks for inter-BSC HO, receives BSSMAP Handover Command, but MS reports + * RR Handover Failure. */ +private function f_tc_ho_out_fail_no_ho_detect(charstring id) runs on MSC_ConnHdlr { + g_pars := valueof(t_def_TestHdlrPars); + + var PDU_BSSAP ass_req := f_gen_ass_req(); + ass_req.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_req.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + f_establish_fully(ass_req, exp_compl); + + f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); + + BSSAP.receive(tr_BSSMAP_HandoverRequired); + + f_sleep(0.5); + /* The MSC negotiates Handover Request and Handover Request Ack with + * the other BSS and comes back with a BSSMAP Handover Command + * containing an RR Handover Command coming from the target BSS... */ + + var PDU_ML3_NW_MS rr_ho_cmd := valueof(ts_RR_HandoverCommand); + log("Remote cell's RR Handover Command passed through as L3 Info: ", rr_ho_cmd); + var octetstring rr_ho_cmd_enc := enc_PDU_ML3_NW_MS(rr_ho_cmd); + log("Remote cell's RR Handover Command passed through as L3 Info, encoded: ", rr_ho_cmd_enc); + BSSAP.send(ts_BSSMAP_HandoverCommand(rr_ho_cmd_enc)); + + /* expect the Handover Command to go out on RR */ + var RSL_Message rsl_ho_cmd + RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, ?)) -> value rsl_ho_cmd; + log("RSL Data Req went out to first BTS: ", rsl_ho_cmd); + var RSL_IE_Body rsl_ho_cmd_l3; + if (not f_rsl_find_ie(rsl_ho_cmd, RSL_IE_L3_INFO, rsl_ho_cmd_l3)) { + log("RSL message contains no L3 Info IE, expected RR Handover Command"); + setverdict(fail); + } else { + log("Found L3 Info: ", rsl_ho_cmd_l3); + if (rsl_ho_cmd_l3.l3_info.payload != rr_ho_cmd_enc) { + log("FAIL: the BSC sent out a different L3 Info, not matching the RR Handover Command the other BSS forwarded."); + setverdict(fail); + } else { + log("Success: the BSC sent out the same RR Handover Command the other BSS forwarded."); + setverdict(pass); + } + } + + /* The MS never shows up on the remote BSS. Eventually the BSC times + * out and we run into 3GPP TS 48.008 3.1.5.3.3 "Abnormal Conditions": + * RR should be released and Clear Request should go to the MSC. */ + + var MgcpCommand mgcp; + interleave { + [] RSL.receive(tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL)) { + log("Got RF Chan Rel"); + RSL.send(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr)); + } + [] BSSAP.receive(tr_BSSMAP_ClearRequest) { + log("Got BSSMAP Clear Request"); + } + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got first DLCX: ", mgcp); + } + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got second DLCX: ", mgcp); + } + } + + setverdict(pass); + f_sleep(1.0); +} +testcase TC_ho_out_fail_no_ho_detect() runs on test_CT { + var MSC_ConnHdlr vc_conn; + + f_init(1, true); + f_sleep(1.0); + + vc_conn := f_start_handler(refers(f_tc_ho_out_fail_no_ho_detect)); + vc_conn.done; +} + private function f_tc_ho_into_this_bsc(charstring id) runs on MSC_ConnHdlr { /* Hack: the proper way would be to wait for the BSSMAP Handover Request ACK and extract the * actual assigned chan_nr from its L3 (RR Handover Command) message. But osmo-bsc starts acting @@ -2847,6 +3055,9 @@ execute( TC_ho_int() ); execute( TC_ho_out_of_this_bsc() ); + execute( TC_ho_out_fail_no_msc_response() ); + execute( TC_ho_out_fail_rr_ho_failure() ); + execute( TC_ho_out_fail_no_ho_detect() ); execute( TC_ho_into_this_bsc() ); execute( TC_bssap_rlsd_does_not_cause_bssmap_reset() ); diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index 64d0444..cd808d8 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -70,6 +70,9 @@ + + + diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index adfcc9e..118168e 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -699,6 +699,25 @@ } } +template PDU_BSSAP tr_BSSMAP_HandoverFailure modifies tr_BSSAP_BSSMAP := { + pdu := { + bssmap := { + handoverFailure := { + messageType := '16'O, + cause := ?, + rR_Cause := *, + circuitPool := *, + circuitPoolList := *, + gERANClassmark := *, + newBSSToOldBSSInfo := *, + interSystemInformation := *, + talkerPriority := *, + codecList := * + } + } + } +} + template PDU_BSSAP ts_BSSMAP_HandoverRequest( template BSSMAP_IE_CircuitIdentityCode cic := omit, template BSSMAP_IE_AoIP_TransportLayerAddress aoip_tla := omit, -- To view, visit https://gerrit.osmocom.org/11315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If772dbbc5f9790d3f911465e1303dd0a99811154 Gerrit-Change-Number: 11315 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:36:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:36:01 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: tweak coments Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11316 Change subject: handover_decision_2.c: tweak coments ...................................................................... handover_decision_2.c: tweak coments Change-Id: I8bae3431dfaf23301e72f8f572286753b63a99b9 --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/16/11316/1 diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index 4e9b02c..70be050 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -471,6 +471,7 @@ break; default: LOGPHOLCHANTOBTS(lchan, bts, LOGL_DEBUG, "Not even considering: src is not a SPEECH mode lchan\n"); + /* FIXME: should allow handover of non-speech lchans */ return 0; } @@ -556,7 +557,7 @@ } #endif - /* the maximum number of unsynchonized handovers must no be exceeded */ + /* the maximum number of unsynchronized handovers must no be exceeded */ if (current_bts != bts && bts_handover_count(bts, HO_SCOPE_ALL) >= ho_get_hodec2_ho_max(bts->ho)) { LOGPHOLCHANTOBTS(lchan, bts, LOGL_DEBUG, @@ -679,7 +680,7 @@ return 0; } -/* debug collected candidates */ +/* verbosely log about a handover candidate */ static inline void debug_candidate(struct gsm_lchan *lchan, struct ho_candidate *candidate, struct gsm_bts *neighbor, int8_t rxlev, int tchf_count, int tchh_count) { -- To view, visit https://gerrit.osmocom.org/11316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8bae3431dfaf23301e72f8f572286753b63a99b9 Gerrit-Change-Number: 11316 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:36:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:36:02 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: tweak ho candidate logging Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11317 Change subject: handover_decision_2.c: tweak ho candidate logging ...................................................................... handover_decision_2.c: tweak ho candidate logging Use a common LOGPHOCAND() to transparently log both local and remote candidates. Change-Id: I694e3832c55b4e972e05422e5e4508a74a222a71 --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 65 insertions(+), 49 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/17/11317/1 diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index 70be050..fc94d61 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -64,6 +64,26 @@ bsc_subscr_name(lchan->conn? lchan->conn->bsub : NULL), \ ## args) +#define LOGPHOLCHANTOREMOTE(lchan, remote_cil, level, fmt, args...) \ + LOGP(DHODEC, level, "(lchan %u.%u%u%u %s %s)->(remote-BSS %s) (subscr %s) " fmt, \ + lchan->ts->trx->bts->nr, \ + lchan->ts->trx->nr, \ + lchan->ts->nr, \ + lchan->nr, \ + gsm_lchant_name(lchan->type), \ + gsm48_chan_mode_name(lchan->tch_mode), \ + gsm0808_cell_id_list_name(remote_cil), \ + bsc_subscr_name(lchan->conn? lchan->conn->bsub : NULL), \ + ## args) + +#define LOGPHOCAND(candidate, level, fmt, args...) do {\ + if ((candidate)->bts) \ + LOGPHOLCHANTOBTS((candidate)->lchan, (candidate)->bts, level, fmt, ## args); \ + else if ((candidate)->cil) \ + LOGPHOLCHANTOREMOTE((candidate)->lchan, (candidate)->cil, level, fmt, ## args); \ + } while(0) + + #define REQUIREMENT_A_TCHF 0x01 #define REQUIREMENT_B_TCHF 0x02 #define REQUIREMENT_C_TCHF 0x04 @@ -634,7 +654,6 @@ /* change to full rate if AFS is improved and a candidate */ if (afs_bias > 0 && (requirements & REQUIREMENT_TCHF_MASK)) { full_rate = true; - LOGPHOLCHAN(lchan, LOGL_DEBUG, "[Improve AHS->AFS]\n"); break; } /* change to full rate if the only candidate */ @@ -749,7 +768,7 @@ .bsic = nmp->bsic, }; int avg; - struct ho_candidate *c; + struct ho_candidate c; int min_rxlev; /* skip empty slots */ @@ -791,16 +810,22 @@ /* calculate average rxlev for this cell over the window */ avg = neigh_meas_avg(nmp, ho_get_hodec2_rxlev_neigh_avg_win(bts->ho)); + c = (struct ho_candidate){ + .lchan = lchan, + .avg = avg, + .bts = neighbor_bts, + }; + /* Heed rxlev hysteresis only if the RXLEV/RXQUAL/TA levels of the MS aren't critically bad and * we're just looking for an improvement. If levels are critical, we desperately need a handover * and thus skip the hysteresis check. */ if (!include_weaker_rxlev) { unsigned int pwr_hyst = ho_get_hodec2_pwr_hysteresis(bts->ho); if (avg <= (av_rxlev + pwr_hyst)) { - LOGPHOLCHAN(lchan, LOGL_DEBUG, - "BTS %d is not a candidate, because RX level (%d) is lower" - " or equal than current RX level (%d) + hysteresis (%d)\n", - neighbor_bts->nr, rxlev2dbm(avg), rxlev2dbm(av_rxlev), pwr_hyst); + LOGPHOCAND(&c, LOGL_DEBUG, + "Not a candidate, because RX level (%d) is lower" + " or equal than current RX level (%d) + hysteresis (%d)\n", + rxlev2dbm(avg), rxlev2dbm(av_rxlev), pwr_hyst); return; } } @@ -808,22 +833,20 @@ /* if the minimum level is not reached */ min_rxlev = ho_get_hodec2_min_rxlev(neighbor_bts->ho); if (rxlev2dbm(avg) < min_rxlev) { - LOGPHOLCHAN(lchan, LOGL_DEBUG, - "BTS %d is not a candidate, because RX level (%d) is lower" - " than its minimum required RX level (%d)\n", - neighbor_bts->nr, rxlev2dbm(avg), min_rxlev); + LOGPHOCAND(&c, LOGL_DEBUG, + "Not a candidate, because RX level (%d) is lower" + " than the minimum required RX level (%d)\n", + rxlev2dbm(avg), min_rxlev); return; } tchf_count = bts_count_free_ts(neighbor_bts, GSM_PCHAN_TCH_F); tchh_count = bts_count_free_ts(neighbor_bts, GSM_PCHAN_TCH_H); - c = &clist[*candidates]; - c->lchan = lchan; - c->bts = neighbor_bts; - c->requirements = check_requirements(lchan, neighbor_bts, tchf_count, - tchh_count); - c->avg = avg; - debug_candidate(lchan, c, neighbor_bts, av_rxlev, tchf_count, tchh_count); + c.requirements = check_requirements(lchan, neighbor_bts, tchf_count, tchh_count); + + debug_candidate(lchan, &c, neighbor_bts, av_rxlev, tchf_count, tchh_count); + + clist[*candidates] = c; (*candidates)++; } @@ -973,9 +996,9 @@ /* perform handover, if there is a candidate */ if (best_cand) { - LOGPHOLCHANTOBTS(lchan, best_cand->bts, LOGL_INFO, "Best candidate, RX level %d%s\n", - rxlev2dbm(best_cand->avg), - best_applied_afs_bias ? " (applied AHS -> AFS rxlev bias)" : ""); + LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate, RX level %d%s\n", + rxlev2dbm(best_cand->avg), + best_applied_afs_bias ? " (applied AHS -> AFS rxlev bias)" : ""); return trigger_handover_or_assignment(lchan, best_cand->bts, best_cand->requirements & REQUIREMENT_B_MASK); } @@ -1002,9 +1025,9 @@ /* perform handover, if there is a candidate */ if (best_cand) { - LOGPHOLCHANTOBTS(lchan, best_cand->bts, LOGL_INFO, "Best candidate, RX level %d%s\n", - rxlev2dbm(best_cand->avg), - best_applied_afs_bias? " (applied AHS -> AFS rxlev bias)" : ""); + LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate, RX level %d%s\n", + rxlev2dbm(best_cand->avg), + best_applied_afs_bias? " (applied AHS -> AFS rxlev bias)" : ""); return trigger_handover_or_assignment(lchan, best_cand->bts, best_cand->requirements & REQUIREMENT_C_MASK); } @@ -1037,10 +1060,9 @@ /* perform handover, if there is a candidate */ if (best_cand) { - LOGPHOLCHANTOBTS(lchan, best_cand->bts, LOGL_INFO, "Best candidate, RX level %d" - " with greater congestion found%s\n", - rxlev2dbm(best_cand->avg), - best_applied_afs_bias ? " (applied AHS -> AFS rxlev bias)" : ""); + LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate: RX level %d%s\n", + rxlev2dbm(best_cand->avg), + best_applied_afs_bias ? " (applied AHS -> AFS rxlev bias)" : ""); return trigger_handover_or_assignment(lchan, best_cand->bts, best_cand->requirements & REQUIREMENT_A_MASK); } @@ -1337,9 +1359,8 @@ if (log_check_level(DHODEC, LOGL_DEBUG)) { LOGPHOBTS(bts, LOGL_DEBUG, "Considering %u candidates to solve congestion:\n", candidates); for (i = 0; i < candidates; i++) { - LOGPHOLCHANTOBTS(clist[i].lchan, clist[i].bts, LOGL_DEBUG, - "#%d: req=0x%x avg-rxlev=%d\n", - i, clist[i].requirements, clist[i].avg); + LOGPHOCAND(&clist[i], LOGL_DEBUG, "#%d: req=0x%x avg-rxlev=%d\n", + i, clist[i].requirements, clist[i].avg); } } @@ -1381,7 +1402,8 @@ is_improved = 1; } else is_improved = 0; - LOGP(DHODEC, LOGL_DEBUG, "candidate %d: avg=%d best_avg_db=%d\n", i, avg, best_avg_db); + LOGPHOCAND(&clist[i], LOGL_DEBUG, "candidate %d: avg=%d best_avg_db=%d\n", + i, avg, best_avg_db); if (avg > best_avg_db) { best_cand = &clist[i]; best_avg_db = avg; @@ -1391,10 +1413,9 @@ /* perform handover, if there is a candidate */ if (best_cand) { any_ho = 1; - LOGPHOLCHAN(best_cand->lchan, LOGL_DEBUG, - "Best candidate BTS %u (RX level %d%s) without congestion found\n", - best_cand->bts->nr, rxlev2dbm(best_cand->avg), - is_improved ? ", RX quality improved by AHS->AFS" : ""); + LOGPHOCAND(best_cand, LOGL_DEBUG, "Best candidate: RX level %d%s\n", + rxlev2dbm(best_cand->avg), + is_improved ? " (applied AHS->AFS bias)" : ""); trigger_handover_or_assignment(best_cand->lchan, best_cand->bts, best_cand->requirements & REQUIREMENT_B_MASK); #if 0 @@ -1461,10 +1482,9 @@ /* perform handover, if there is a candidate */ if (worst_cand) { any_ho = 1; - LOGP(DHODEC, LOGL_INFO, "Worst candidate for assignment " - "(RX level %d%s) from TCH/H -> TCH/F without congestion " - "found\n", rxlev2dbm(worst_cand->avg), - is_improved ? ", RX quality improved by AHS->AFS" : ""); + LOGPHOCAND(worst_cand, LOGL_INFO, "Worst candidate: RX level %d from TCH/H -> TCH/F%s\n", + rxlev2dbm(worst_cand->avg), + is_improved ? " (applied AHS -> AFS rxlev bias)" : ""); trigger_handover_or_assignment(worst_cand->lchan, worst_cand->bts, worst_cand->requirements & REQUIREMENT_B_MASK); @@ -1533,12 +1553,9 @@ /* perform handover, if there is a candidate */ if (best_cand) { any_ho = 1; - LOGP(DHODEC, LOGL_INFO, "Best candidate BTS %d (RX level %d) " - "with less or equal congestion found\n", - best_cand->bts->nr, rxlev2dbm(best_cand->avg)); - if (is_improved) - LOGP(DHODEC, LOGL_INFO, "(is improved due to " - "AHS -> AFS)\n"); + LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate: RX level %d%s\n", + rxlev2dbm(best_cand->avg), + is_improved ? " (applied AHS -> AFS rxlev bias)" : ""); trigger_handover_or_assignment(best_cand->lchan, best_cand->bts, best_cand->requirements & REQUIREMENT_C_MASK); #if 0 @@ -1610,10 +1627,9 @@ /* perform handover, if there is a candidate */ if (worst_cand) { any_ho = 1; - LOGP(DHODEC, LOGL_INFO, "Worst candidate for assignment " - "(RX level %d%s) from TCH/H -> TCH/F with less or equal " - "congestion found\n", rxlev2dbm(worst_cand->avg), - is_improved ? ", RX quality improved by AHS->AFS" : ""); + LOGPHOCAND(worst_cand, LOGL_INFO, "Worst candidate: RX level %d from TCH/H -> TCH/F%s\n", + rxlev2dbm(worst_cand->avg), + is_improved ? " (applied AHS -> AFS rxlev bias)" : ""); trigger_handover_or_assignment(worst_cand->lchan, worst_cand->bts, worst_cand->requirements & REQUIREMENT_C_MASK); -- To view, visit https://gerrit.osmocom.org/11317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I694e3832c55b4e972e05422e5e4508a74a222a71 Gerrit-Change-Number: 11317 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:36:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:36:03 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: find_alternative_lchan: drop goto Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11318 Change subject: handover_decision_2.c: find_alternative_lchan: drop goto ...................................................................... handover_decision_2.c: find_alternative_lchan: drop goto Don't goto the function end just to log something. Rather log right away and exit early. Change-Id: I6558a6948e8973cc91dae240375af074a5f5547e --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 9 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/18/11318/1 diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index fc94d61..67ba26d 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -971,8 +971,10 @@ /* If assignment is disabled and no neighbor cell report exists, or no neighbor cell qualifies, * we may not even have any candidates. */ - if (!candidates) - goto no_candidates; + if (!candidates) { + LOGPHOLCHAN(lchan, LOGL_INFO, "No viable neighbor cells found\n"); + return 0; + } /* select best candidate that fulfills requirement B: no congestion after HO */ best_better_db = 0; @@ -1033,8 +1035,10 @@ } /* we are done in case the MS RXLEV/RXQUAL/TA aren't critical and we're avoiding congestion. */ - if (!include_weaker_rxlev) - goto no_candidates; + if (!include_weaker_rxlev) { + LOGPHOLCHAN(lchan, LOGL_INFO, "No better/less congested neighbor cell found\n"); + return 0; + } /* Select best candidate that fulfills requirement A: can service the call. * >From above we know that there are no options that avoid congestion. Here we're trying to find @@ -1069,13 +1073,7 @@ /* Damn, all is congested, has too low RXLEV or cannot service the voice call due to codec * restrictions or because all lchans are taken. */ - -no_candidates: - if (include_weaker_rxlev) - LOGPHOLCHAN(lchan, LOGL_INFO, "No alternative lchan found\n"); - else - LOGPHOLCHAN(lchan, LOGL_INFO, "No better/less congested neighbor cell found\n"); - + LOGPHOLCHAN(lchan, LOGL_INFO, "No alternative lchan found\n"); return 0; } -- To view, visit https://gerrit.osmocom.org/11318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6558a6948e8973cc91dae240375af074a5f5547e Gerrit-Change-Number: 11318 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:36:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:36:04 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: drop redundant debug_candidate() args Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11319 Change subject: handover_decision_2.c: drop redundant debug_candidate() args ...................................................................... handover_decision_2.c: drop redundant debug_candidate() args No functional change. Change-Id: Ida186946f40d30f4d9ed94d9c1ff9bdb70048626 --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 14 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/19/11319/1 diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index 67ba26d..64fc2dd 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -700,9 +700,11 @@ } /* verbosely log about a handover candidate */ -static inline void debug_candidate(struct gsm_lchan *lchan, struct ho_candidate *candidate, - struct gsm_bts *neighbor, int8_t rxlev, int tchf_count, int tchh_count) +static inline void debug_candidate(struct ho_candidate *candidate, + int8_t rxlev, int tchf_count, int tchh_count) { + struct gsm_lchan *lchan = candidate->lchan; + #define HO_CANDIDATE_FMT(tchx, TCHX) "TCH/" #TCHX "={free %d (want %d), [%s%s%s]%s}" #define HO_CANDIDATE_ARGS(tchx, TCHX) \ tch##tchx##_count, ho_get_hodec2_tch##tchx##_min_slots(candidate->bts->ho), \ @@ -718,18 +720,18 @@ /* now has to be candidate->requirements & REQUIREMENT_C_TCHX != 0: */ \ " less-or-equal congestion")) - if (neighbor) - LOGPHOLCHANTOBTS(lchan, neighbor, LOGL_DEBUG, - "RX level %d -> %d; " - HO_CANDIDATE_FMT(f, F) "; " HO_CANDIDATE_FMT(h, H) "\n", - rxlev2dbm(rxlev), rxlev2dbm(candidate->avg), - HO_CANDIDATE_ARGS(f, F), HO_CANDIDATE_ARGS(h, H)); - else - LOGPHOLCHANTOBTS(lchan, lchan->ts->trx->bts, LOGL_DEBUG, + if (candidate->bts == lchan->ts->trx->bts) + LOGPHOLCHANTOBTS(lchan, candidate->bts, LOGL_DEBUG, "RX level %d; " HO_CANDIDATE_FMT(f, F) "; " HO_CANDIDATE_FMT(h, H) "\n", rxlev2dbm(candidate->avg), HO_CANDIDATE_ARGS(f, F), HO_CANDIDATE_ARGS(h, H)); + else if (candidate->bts) + LOGPHOLCHANTOBTS(lchan, candidate->bts, LOGL_DEBUG, + "RX level %d -> %d; " + HO_CANDIDATE_FMT(f, F) "; " HO_CANDIDATE_FMT(h, H) "\n", + rxlev2dbm(rxlev), rxlev2dbm(candidate->avg), + HO_CANDIDATE_ARGS(f, F), HO_CANDIDATE_ARGS(h, H)); } /* add candidate for re-assignment within the current cell */ @@ -748,7 +750,7 @@ c->bts = bts; c->requirements = check_requirements(lchan, bts, tchf_count, tchh_count); c->avg = av_rxlev; - debug_candidate(lchan, c, NULL, 0, tchf_count, tchh_count); + debug_candidate(c, 0, tchf_count, tchh_count); (*candidates)++; } @@ -844,7 +846,7 @@ tchh_count = bts_count_free_ts(neighbor_bts, GSM_PCHAN_TCH_H); c.requirements = check_requirements(lchan, neighbor_bts, tchf_count, tchh_count); - debug_candidate(lchan, &c, neighbor_bts, av_rxlev, tchf_count, tchh_count); + debug_candidate(&c, av_rxlev, tchf_count, tchh_count); clist[*candidates] = c; (*candidates)++; -- To view, visit https://gerrit.osmocom.org/11319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ida186946f40d30f4d9ed94d9c1ff9bdb70048626 Gerrit-Change-Number: 11319 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:36:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:36:04 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: refactor trigger_*() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11320 Change subject: handover_decision_2.c: refactor trigger_*() ...................................................................... handover_decision_2.c: refactor trigger_*() a) Prepare for triggering handover for any candidate, remote or local. b) drop redundant arguments. Change-Id: I5ba8b556703010c8e232b516285a837c999f87ef --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 18 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/20/11320/1 diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index 64fc2dd..457d57a 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -620,8 +620,10 @@ } /* Trigger handover or assignment depending on the target BTS */ -static int trigger_handover_or_assignment(struct gsm_lchan *lchan, struct gsm_bts *new_bts, uint8_t requirements) +static int trigger_local_ho_or_as(struct ho_candidate *c, uint8_t requirements) { + struct gsm_lchan *lchan = c->lchan; + struct gsm_bts *new_bts = c->bts; struct handover_out_req req; struct gsm_bts *current_bts = lchan->ts->trx->bts; int afs_bias = 0; @@ -699,6 +701,14 @@ return 0; } +static int trigger_ho(struct ho_candidate *c, uint8_t requirements) +{ + if (c->bts) + return trigger_local_ho_or_as(c, requirements); + else + return 0; /* TODO: remote candidates */ +} + /* verbosely log about a handover candidate */ static inline void debug_candidate(struct ho_candidate *candidate, int8_t rxlev, int tchf_count, int tchh_count) @@ -1003,8 +1013,7 @@ LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate, RX level %d%s\n", rxlev2dbm(best_cand->avg), best_applied_afs_bias ? " (applied AHS -> AFS rxlev bias)" : ""); - return trigger_handover_or_assignment(lchan, best_cand->bts, - best_cand->requirements & REQUIREMENT_B_MASK); + return trigger_ho(best_cand, best_cand->requirements & REQUIREMENT_B_MASK); } /* select best candidate that fulfills requirement C: less or equal congestion after HO */ @@ -1032,8 +1041,7 @@ LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate, RX level %d%s\n", rxlev2dbm(best_cand->avg), best_applied_afs_bias? " (applied AHS -> AFS rxlev bias)" : ""); - return trigger_handover_or_assignment(lchan, best_cand->bts, - best_cand->requirements & REQUIREMENT_C_MASK); + return trigger_ho(best_cand, best_cand->requirements & REQUIREMENT_C_MASK); } /* we are done in case the MS RXLEV/RXQUAL/TA aren't critical and we're avoiding congestion. */ @@ -1069,8 +1077,7 @@ LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate: RX level %d%s\n", rxlev2dbm(best_cand->avg), best_applied_afs_bias ? " (applied AHS -> AFS rxlev bias)" : ""); - return trigger_handover_or_assignment(lchan, best_cand->bts, - best_cand->requirements & REQUIREMENT_A_MASK); + return trigger_ho(best_cand, best_cand->requirements & REQUIREMENT_A_MASK); } /* Damn, all is congested, has too low RXLEV or cannot service the voice call due to codec @@ -1416,8 +1423,7 @@ LOGPHOCAND(best_cand, LOGL_DEBUG, "Best candidate: RX level %d%s\n", rxlev2dbm(best_cand->avg), is_improved ? " (applied AHS->AFS bias)" : ""); - trigger_handover_or_assignment(best_cand->lchan, best_cand->bts, - best_cand->requirements & REQUIREMENT_B_MASK); + trigger_ho(best_cand, best_cand->requirements & REQUIREMENT_B_MASK); #if 0 /* if there is still congestion, mark lchan as deleted * and redo this process */ @@ -1485,9 +1491,7 @@ LOGPHOCAND(worst_cand, LOGL_INFO, "Worst candidate: RX level %d from TCH/H -> TCH/F%s\n", rxlev2dbm(worst_cand->avg), is_improved ? " (applied AHS -> AFS rxlev bias)" : ""); - trigger_handover_or_assignment(worst_cand->lchan, - worst_cand->bts, - worst_cand->requirements & REQUIREMENT_B_MASK); + trigger_ho(worst_cand, worst_cand->requirements & REQUIREMENT_B_MASK); #if 0 /* if there is still congestion, mark lchan as deleted * and redo this process */ @@ -1556,8 +1560,7 @@ LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate: RX level %d%s\n", rxlev2dbm(best_cand->avg), is_improved ? " (applied AHS -> AFS rxlev bias)" : ""); - trigger_handover_or_assignment(best_cand->lchan, best_cand->bts, - best_cand->requirements & REQUIREMENT_C_MASK); + trigger_ho(best_cand, best_cand->requirements & REQUIREMENT_C_MASK); #if 0 /* if there is still congestion, mark lchan as deleted * and redo this process */ @@ -1630,9 +1633,7 @@ LOGPHOCAND(worst_cand, LOGL_INFO, "Worst candidate: RX level %d from TCH/H -> TCH/F%s\n", rxlev2dbm(worst_cand->avg), is_improved ? " (applied AHS -> AFS rxlev bias)" : ""); - trigger_handover_or_assignment(worst_cand->lchan, - worst_cand->bts, - worst_cand->requirements & REQUIREMENT_C_MASK); + trigger_ho(worst_cand, worst_cand->requirements & REQUIREMENT_C_MASK); #if 0 /* if there is still congestion, mark lchan as deleted * and redo this process */ -- To view, visit https://gerrit.osmocom.org/11320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5ba8b556703010c8e232b516285a837c999f87ef Gerrit-Change-Number: 11320 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:36:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:36:05 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: implement HO to remote BSS Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11321 Change subject: handover_decision_2.c: implement HO to remote BSS ...................................................................... handover_decision_2.c: implement HO to remote BSS Implement basic support for inter-BSC HO from handover_decision_2: do inter-BSC handover only when rxlev / rxqual / ta drop below the minimum requirements. I considered adding a vty config flag to disable/enable remote-BSS handover, but to avoid inter-BSC HO the user can simply refrain from configuring neighbors for a particular cell. Related: OS#3638 Change-Id: Id78ac1b2016998a2931a23d62ec7a3f37bb764c6 --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 183 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/21/11321/1 diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index 457d57a..5b50a89 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -98,8 +98,9 @@ struct ho_candidate { struct gsm_lchan *lchan; /* candidate for whom */ + struct neighbor_ident_key nik; /* neighbor ARFCN+BSIC */ struct gsm_bts *bts; /* target BTS in local BSS */ - struct gsm0808_cell_id_list2 *cil; /* target cells in remote BSS */ + const struct gsm0808_cell_id_list2 *cil; /* target cells in remote BSS */ uint8_t requirements; /* what is fulfilled */ int avg; /* average RX level */ }; @@ -619,6 +620,83 @@ return requirement; } +static uint8_t check_requirements_remote_bss(struct gsm_lchan *lchan, + const struct gsm0808_cell_id_list2 *cil) +{ + uint8_t requirement = 0; + unsigned int penalty_time; + struct gsm_bts *current_bts = lchan->ts->trx->bts; + + /* Requirement A */ + + /* the handover/assignment must not be disabled */ + if (!ho_get_hodec2_inter_bsc_active(current_bts->ho)) { + LOGPHOLCHANTOREMOTE(lchan, cil, LOGL_DEBUG, + "not a candidate, inter-BSC handover is disabled from this BTS\n"); + return 0; + } + + /* the handover penalty timer must not run for this bts */ + penalty_time = conn_penalty_time_remaining(lchan->conn, cil); + if (penalty_time) { + LOGPHOLCHANTOREMOTE(lchan, cil, LOGL_DEBUG, + "not a candidate, target BSS still in penalty time" + " (%u seconds left)\n", penalty_time); + return 0; + } + + /* compatibility check for codecs -- we have no notion of what the remote BSS supports. We can + * only assume that a handover would work, and use only the local requirements. */ + switch (lchan->tch_mode) { + case GSM48_CMODE_SPEECH_V1: + switch (lchan->type) { + case GSM_LCHAN_TCH_F: /* mandatory */ + requirement |= REQUIREMENT_A_TCHF; + break; + case GSM_LCHAN_TCH_H: + if (codec_type_is_supported(lchan->conn, GSM0808_SCT_HR1)) + requirement |= REQUIREMENT_A_TCHH; + break; + default: + LOGPHOLCHAN(lchan, LOGL_ERROR, "Unexpected channel type: neither TCH/F nor TCH/H for %s\n", + get_value_string(gsm48_chan_mode_names, lchan->tch_mode)); + return 0; + } + break; + case GSM48_CMODE_SPEECH_EFR: + if (codec_type_is_supported(lchan->conn, GSM0808_SCT_FR2)) + requirement |= REQUIREMENT_A_TCHF; + break; + case GSM48_CMODE_SPEECH_AMR: + if (codec_type_is_supported(lchan->conn, GSM0808_SCT_FR3)) + requirement |= REQUIREMENT_A_TCHF; + if (codec_type_is_supported(lchan->conn, GSM0808_SCT_HR3)) + requirement |= REQUIREMENT_A_TCHH; + break; + default: + LOGPHOLCHAN(lchan, LOGL_DEBUG, "Not even considering: src is not a SPEECH mode lchan\n"); + /* FIXME: should allow handover of non-speech lchans */ + return 0; + } + + if (!requirement) { + LOGPHOLCHAN(lchan, LOGL_ERROR, "lchan doesn't fit its own requirements??\n"); + return 0; + } + + /* Requirement B and C */ + + /* We don't know how many timeslots are free in the remote BSS. We can only indicate that it + * would work out and hope for the best. */ + if (requirement & REQUIREMENT_A_TCHF) + requirement |= REQUIREMENT_B_TCHF | REQUIREMENT_C_TCHF; + if (requirement & REQUIREMENT_A_TCHH) + requirement |= REQUIREMENT_B_TCHH | REQUIREMENT_C_TCHH; + + /* return mask of fulfilled requirements */ + return requirement; +} + /* Trigger handover or assignment depending on the target BTS */ static int trigger_local_ho_or_as(struct ho_candidate *c, uint8_t requirements) { @@ -701,12 +779,29 @@ return 0; } +static int trigger_remote_bss_ho(struct ho_candidate *c, uint8_t requirements) +{ + struct handover_out_req req; + + LOGPHOLCHANTOREMOTE(c->lchan, c->cil, LOGL_INFO, + "Triggering inter-BSC handover, due to %s\n", + ho_reason_name(global_ho_reason)); + + req = (struct handover_out_req){ + .from_hodec_id = HODEC2, + .old_lchan = c->lchan, + .target_nik = c->nik, + }; + handover_request(&req); + return 0; +} + static int trigger_ho(struct ho_candidate *c, uint8_t requirements) { if (c->bts) return trigger_local_ho_or_as(c, requirements); else - return 0; /* TODO: remote candidates */ + return trigger_remote_bss_ho(c, requirements); } /* verbosely log about a handover candidate */ @@ -730,6 +825,16 @@ /* now has to be candidate->requirements & REQUIREMENT_C_TCHX != 0: */ \ " less-or-equal congestion")) + if (!candidate->bts && !candidate->cil) + LOGPHOLCHAN(lchan, LOGL_DEBUG, "Empty candidate\n"); + if (candidate->bts && candidate->cil) + LOGPHOLCHAN(lchan, LOGL_ERROR, "Invalid candidate: both local- and remote-BSS target\n"); + + if (candidate->cil) + LOGPHOLCHANTOREMOTE(lchan, candidate->cil, LOGL_DEBUG, + "RX level %d -> %d\n", + rxlev2dbm(rxlev), rxlev2dbm(candidate->avg)); + if (candidate->bts == lchan->ts->trx->bts) LOGPHOLCHANTOBTS(lchan, candidate->bts, LOGL_DEBUG, "RX level %d; " @@ -771,7 +876,8 @@ int *neighbors_count) { struct gsm_bts *bts = lchan->ts->trx->bts; - int tchf_count, tchh_count; + int tchf_count = 0; + int tchh_count = 0; struct gsm_bts *neighbor_bts; const struct gsm0808_cell_id_list2 *neighbor_cil; struct neighbor_ident_key ni = { @@ -782,6 +888,7 @@ int avg; struct ho_candidate c; int min_rxlev; + struct handover_cfg *neigh_cfg; /* skip empty slots */ if (nmp->arfcn == 0) @@ -799,15 +906,19 @@ } neighbor_bts = bts_by_neighbor_ident(bts->network, &ni); - if (!neighbor_bts) { - neighbor_cil = neighbor_ident_get(bts->network->neighbor_bss_cells, &ni); - if (neighbor_cil) { - LOGPHOBTS(bts, LOGL_ERROR, "would inter-BSC handover to ARFCN %u BSIC %u," - " but inter-BSC handover not implemented for ho decision 2\n", - nmp->arfcn, nmp->bsic); - return; - } + neighbor_cil = neighbor_ident_get(bts->network->neighbor_bss_cells, &ni); + + if (neighbor_bts && neighbor_cil) { + LOGPHOBTS(bts, LOGL_ERROR, "Configuration error: %s exists as both local" + " neighbor (bts %u) and remote-BSS neighbor (%s). Will consider only" + " the locali-BSS neighbor.\n", + neighbor_ident_key_name(&ni), + neighbor_bts->nr, gsm0808_cell_id_list_name(neighbor_cil)); + neighbor_cil = NULL; + } + + if (!neighbor_bts && !neighbor_cil) { LOGPHOBTS(bts, LOGL_DEBUG, "no neighbor ARFCN %u BSIC %u configured for this cell\n", nmp->arfcn, nmp->bsic); return; @@ -819,13 +930,19 @@ return; } + /* For cells in a remote BSS, we cannot query the target cell's handover config, and hence + * instead assume the local BTS' config to apply. */ + neigh_cfg = (neighbor_bts ? : bts)->ho; + /* calculate average rxlev for this cell over the window */ avg = neigh_meas_avg(nmp, ho_get_hodec2_rxlev_neigh_avg_win(bts->ho)); c = (struct ho_candidate){ .lchan = lchan, .avg = avg, + .nik = ni, .bts = neighbor_bts, + .cil = neighbor_cil, }; /* Heed rxlev hysteresis only if the RXLEV/RXQUAL/TA levels of the MS aren't critically bad and @@ -842,8 +959,9 @@ } } - /* if the minimum level is not reached */ - min_rxlev = ho_get_hodec2_min_rxlev(neighbor_bts->ho); + /* if the minimum level is not reached. + * In case of a remote-BSS, use the current BTS' configuration. */ + min_rxlev = ho_get_hodec2_min_rxlev(neigh_cfg); if (rxlev2dbm(avg) < min_rxlev) { LOGPHOCAND(&c, LOGL_DEBUG, "Not a candidate, because RX level (%d) is lower" @@ -852,9 +970,13 @@ return; } - tchf_count = bts_count_free_ts(neighbor_bts, GSM_PCHAN_TCH_F); - tchh_count = bts_count_free_ts(neighbor_bts, GSM_PCHAN_TCH_H); - c.requirements = check_requirements(lchan, neighbor_bts, tchf_count, tchh_count); + if (neighbor_bts) { + tchf_count = bts_count_free_ts(neighbor_bts, GSM_PCHAN_TCH_F); + tchh_count = bts_count_free_ts(neighbor_bts, GSM_PCHAN_TCH_H); + c.requirements = check_requirements(lchan, neighbor_bts, tchf_count, + tchh_count); + } else + c.requirements = check_requirements_remote_bss(lchan, neighbor_cil); debug_candidate(&c, av_rxlev, tchf_count, tchh_count); @@ -988,13 +1110,19 @@ return 0; } - /* select best candidate that fulfills requirement B: no congestion after HO */ + /* select best candidate that fulfills requirement B: no congestion after HO. + * Exclude remote-BSS neighbors: to avoid oscillation between neighboring BSS, + * rather keep subscribers in the local BSS unless there is critical RXLEV/TA. */ best_better_db = 0; for (i = 0; i < candidates; i++) { int afs_bias; if (!(clist[i].requirements & REQUIREMENT_B_MASK)) continue; + /* Only consider Local-BSS cells */ + if (!clist[i].bts) + continue; + better = clist[i].avg - av_rxlev; /* Apply AFS bias? */ afs_bias = 0; @@ -1016,13 +1144,18 @@ return trigger_ho(best_cand, best_cand->requirements & REQUIREMENT_B_MASK); } - /* select best candidate that fulfills requirement C: less or equal congestion after HO */ + /* select best candidate that fulfills requirement C: less or equal congestion after HO, + * again excluding remote-BSS neighbors. */ best_better_db = 0; for (i = 0; i < candidates; i++) { int afs_bias; if (!(clist[i].requirements & REQUIREMENT_C_MASK)) continue; + /* Only consider Local-BSS cells */ + if (!clist[i].bts) + continue; + better = clist[i].avg - av_rxlev; /* Apply AFS bias? */ afs_bias = 0; @@ -1052,7 +1185,8 @@ /* Select best candidate that fulfills requirement A: can service the call. * From above we know that there are no options that avoid congestion. Here we're trying to find - * *any* free lchan that has no critically low RXLEV and is able to handle the MS. */ + * *any* free lchan that has no critically low RXLEV and is able to handle the MS. + * We're also prepared to handover to remote BSS. */ best_better_db = 0; for (i = 0; i < candidates; i++) { int afs_bias; @@ -1060,9 +1194,11 @@ continue; better = clist[i].avg - av_rxlev; - /* Apply AFS bias? */ + /* Apply AFS bias? + * (never to remote-BSS neighbors, since we will not change the lchan type for those.) */ afs_bias = 0; - if (ahs && (clist[i].requirements & REQUIREMENT_A_TCHF)) + if (ahs && (clist[i].requirements & REQUIREMENT_A_TCHF) + && clist[i].bts) afs_bias = ho_get_hodec2_afs_bias_rxlev(clist[i].bts->ho); better += afs_bias; if (better > best_better_db) { @@ -1385,6 +1521,14 @@ if (!clist[i].lchan) continue; + /* Do not resolve congestion towards remote BSS, which would cause oscillation if the + * remote BSS is also congested. */ + /* TODO: attempt inter-BSC HO if no local cells qualify, and rely on the remote BSS to + * deny receiving the handover if it also considers itself congested. Maybe do that only + * when the cell is absolutely full, i.e. not only min-free-slots. (x) */ + if (!clist[i].bts) + continue; + if (!(clist[i].requirements & REQUIREMENT_B_MASK)) continue; /* omit assignment from AHS to AFS */ @@ -1462,6 +1606,12 @@ if (!clist[i].lchan) continue; + /* Do not resolve congestion towards remote BSS, which would cause oscillation if + * the remote BSS is also congested. */ + /* TODO: see (x) above */ + if (!clist[i].bts) + continue; + if (!(clist[i].requirements & REQUIREMENT_B_MASK)) continue; /* omit all but assignment from AHS to AFS */ @@ -1524,6 +1674,12 @@ if (!clist[i].lchan) continue; + /* Do not resolve congestion towards remote BSS, which would cause oscillation if + * the remote BSS is also congested. */ + /* TODO: see (x) above */ + if (!clist[i].bts) + continue; + if (!(clist[i].requirements & REQUIREMENT_C_MASK)) continue; /* omit assignment from AHS to AFS */ @@ -1602,6 +1758,12 @@ if (!clist[i].lchan) continue; + /* Do not resolve congestion towards remote BSS, which would cause oscillation if + * the remote BSS is also congested. */ + /* TODO: see (x) above */ + if (!clist[i].bts) + continue; + if (!(clist[i].requirements & REQUIREMENT_C_MASK)) continue; /* omit all but assignment from AHS to AFS */ -- To view, visit https://gerrit.osmocom.org/11321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id78ac1b2016998a2931a23d62ec7a3f37bb764c6 Gerrit-Change-Number: 11321 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:36:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:36:27 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: tweak comments In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11316 ) Change subject: handover_decision_2.c: tweak comments ...................................................................... handover_decision_2.c: tweak comments Change-Id: I8bae3431dfaf23301e72f8f572286753b63a99b9 --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/16/11316/2 -- To view, visit https://gerrit.osmocom.org/11316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8bae3431dfaf23301e72f8f572286753b63a99b9 Gerrit-Change-Number: 11316 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:36:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:36:27 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: tweak ho candidate logging In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11317 ) Change subject: handover_decision_2.c: tweak ho candidate logging ...................................................................... handover_decision_2.c: tweak ho candidate logging Use a common LOGPHOCAND() to transparently log both local and remote candidates. Change-Id: I694e3832c55b4e972e05422e5e4508a74a222a71 --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 65 insertions(+), 49 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/17/11317/2 -- To view, visit https://gerrit.osmocom.org/11317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I694e3832c55b4e972e05422e5e4508a74a222a71 Gerrit-Change-Number: 11317 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:36:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:36:27 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: find_alternative_lchan: drop goto In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11318 ) Change subject: handover_decision_2.c: find_alternative_lchan: drop goto ...................................................................... handover_decision_2.c: find_alternative_lchan: drop goto Don't goto the function end just to log something. Rather log right away and exit early. Change-Id: I6558a6948e8973cc91dae240375af074a5f5547e --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 9 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/18/11318/2 -- To view, visit https://gerrit.osmocom.org/11318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6558a6948e8973cc91dae240375af074a5f5547e Gerrit-Change-Number: 11318 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:36:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:36:27 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: drop redundant debug_candidate() args In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11319 ) Change subject: handover_decision_2.c: drop redundant debug_candidate() args ...................................................................... handover_decision_2.c: drop redundant debug_candidate() args No functional change. Change-Id: Ida186946f40d30f4d9ed94d9c1ff9bdb70048626 --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 14 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/19/11319/2 -- To view, visit https://gerrit.osmocom.org/11319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ida186946f40d30f4d9ed94d9c1ff9bdb70048626 Gerrit-Change-Number: 11319 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:36:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:36:27 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: refactor trigger_*() In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11320 ) Change subject: handover_decision_2.c: refactor trigger_*() ...................................................................... handover_decision_2.c: refactor trigger_*() a) Prepare for triggering handover for any candidate, remote or local. b) drop redundant arguments. Change-Id: I5ba8b556703010c8e232b516285a837c999f87ef --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 18 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/20/11320/2 -- To view, visit https://gerrit.osmocom.org/11320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5ba8b556703010c8e232b516285a837c999f87ef Gerrit-Change-Number: 11320 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:36:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:36:27 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: implement HO to remote BSS In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11321 ) Change subject: handover_decision_2.c: implement HO to remote BSS ...................................................................... handover_decision_2.c: implement HO to remote BSS Implement basic support for inter-BSC HO from handover_decision_2: do inter-BSC handover only when rxlev / rxqual / ta drop below the minimum requirements. I considered adding a vty config flag to disable/enable remote-BSS handover, but to avoid inter-BSC HO the user can simply refrain from configuring neighbors for a particular cell. Related: OS#3638 Change-Id: Id78ac1b2016998a2931a23d62ec7a3f37bb764c6 --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 183 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/21/11321/2 -- To view, visit https://gerrit.osmocom.org/11321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id78ac1b2016998a2931a23d62ec7a3f37bb764c6 Gerrit-Change-Number: 11321 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:47:31 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 11 Oct 2018 15:47:31 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: implement HO to remote BSS In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11321 to look at the new patch set (#3). Change subject: handover_decision_2.c: implement HO to remote BSS ...................................................................... handover_decision_2.c: implement HO to remote BSS Implement basic support for inter-BSC HO from handover_decision_2: do inter-BSC handover only when rxlev / rxqual / ta drop below the minimum requirements. I considered adding a vty config flag to disable/enable remote-BSS handover, but to avoid inter-BSC HO the user can simply refrain from configuring neighbors for a particular cell. In collect_assignment_candidate(), it is important to clear out any new candidate entry. Hence adopt the same pattern as below: first compose a new (cleared) candidate, then write the entry into the list. Related: OS#3638 Change-Id: Id78ac1b2016998a2931a23d62ec7a3f37bb764c6 --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 185 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/21/11321/3 -- To view, visit https://gerrit.osmocom.org/11321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id78ac1b2016998a2931a23d62ec7a3f37bb764c6 Gerrit-Change-Number: 11321 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 15:57:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 11 Oct 2018 15:57:57 +0000 Subject: Change in osmo-gsm-tester[master]: ttcn3: Support running tests without PCU socket avail Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11322 Change subject: ttcn3: Support running tests without PCU socket avail ...................................................................... ttcn3: Support running tests without PCU socket avail Change-Id: I902af460b798ffdba09d77d457bac672db606368 --- M src/osmo_gsm_tester/bts.py A ttcn3/scenarios/sysmo.conf M ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl M ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh M ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py 5 files changed, 23 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/22/11322/1 diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py index 041b2bc..f05a1ba 100644 --- a/src/osmo_gsm_tester/bts.py +++ b/src/osmo_gsm_tester/bts.py @@ -157,6 +157,10 @@ 'Get the Pcu object associated with the BTS' pass + def bts_type(self): + 'Get the type of BTS' + return self.conf.get('type') + def set_bsc(self, bsc): self.bsc = bsc diff --git a/ttcn3/scenarios/sysmo.conf b/ttcn3/scenarios/sysmo.conf new file mode 120000 index 0000000..5374081 --- /dev/null +++ b/ttcn3/scenarios/sysmo.conf @@ -0,0 +1 @@ +../../example/scenarios/sysmo.conf \ No newline at end of file diff --git a/ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl b/ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl index 7379528..03d2721 100644 --- a/ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl +++ b/ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl @@ -10,7 +10,11 @@ [MODULE_PARAMETERS] BTS_Tests.mp_rsl_ip := "172.18.9.10" BTS_Tests.mp_bb_trxc_ip := "127.0.0.1" +%if pcu_available: BTS_Tests.mp_pcu_socket := "/data/unix_pcu/pcu_bts" +%else: +BTS_Tests.mp_pcu_socket := "" +%endif BTS_Tests.mp_bb_trxc_port := -1 L1CTL_PortType.m_l1ctl_sock_path := "/data/unix_l2/osmocom_l2" BTS_Tests.mp_ctrl_ip := "${btsvty_ctrl_hostname}" diff --git a/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh b/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh index 64987b3..d583f90 100755 --- a/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh +++ b/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh @@ -63,12 +63,17 @@ echo Starting container with BTS testsuite docker kill ${DOCKER_NAME} +if [ "x$PCU_SOCKET_PATH" != "x" ]; then + MOUNT_PCU_SOCKET_OPT="--mount type=bind,source=\"$(dirname "$PCU_SOCKET_PATH")\",destination=/data/unix_pcu" +else + MOUNT_PCU_SOCKET_OPT="" +fi docker run --rm \ --network $NET_NAME --ip 172.18.9.10 \ -e "TTCN3_PCAP_PATH=/data" \ --mount type=bind,source=$VOL_BASE_DIR/bts-tester,destination=/data \ --mount type=bind,source="$(dirname "$L2_SOCKET_PATH")",destination=/data/unix_l2 \ - --mount type=bind,source="$(dirname "$PCU_SOCKET_PATH")",destination=/data/unix_pcu \ + $MOUNT_PCU_SOCKET_OPT \ --name ${DOCKER_NAME} \ $REPO_USER/${SUITE_NAME} & child_ps=$! diff --git a/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py b/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py index b3ca946..f36b023 100755 --- a/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py +++ b/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py @@ -46,11 +46,17 @@ script_run_dir = test.get_run_dir().new_dir('ttcn3') bts_cfg_file = os.path.join(str(script_run_dir), 'BTS_Tests.cfg') junit_ttcn3_dst_file = os.path.join(str(suite.trial.get_run_dir()), 'trial-') + suite.name() + '.xml' -docker_cmd = (script_file, str(script_run_dir), junit_ttcn3_dst_file, osmocon.l2_socket_path(), bts.pcu_socket_path()) +if bts.bts_type() == 'osmo-bts-trx': + pcu_available = True + pcu_sk = bts.pcu_socket_path() +else: # PCU unix socket not available locally + pcu_available = False + pcu_sk = '' +docker_cmd = (script_file, str(script_run_dir), junit_ttcn3_dst_file, osmocon.l2_socket_path(), pcu_sk) print('Creating template') mytemplate = Template(filename=bts_tmpl_file) -r = mytemplate.render(btsvty_ctrl_hostname=bts.remote_addr()) +r = mytemplate.render(btsvty_ctrl_hostname=bts.remote_addr(), pcu_available=pcu_available) with open(bts_cfg_file, 'w') as f: f.write(r) -- To view, visit https://gerrit.osmocom.org/11322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I902af460b798ffdba09d77d457bac672db606368 Gerrit-Change-Number: 11322 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 22:35:13 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 11 Oct 2018 22:35:13 +0000 Subject: Change in libosmocore[master]: stats_statsd: Send all stat_items as gauges Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11323 Change subject: stats_statsd: Send all stat_items as gauges ...................................................................... stats_statsd: Send all stat_items as gauges When sending a statsd metric we need to specify a type which can be a "g"auge, "c"ounter, "t"imer, "h"istogram, and "m"eter. We used to just pass the stat_item unit into this field, but that is the unit of the metric (Seconds for a timer, % for utilization, ...). Change the type field so stat_items are sent as "g"auges. Note that negative values don't seem to be supported by statsd. Change-Id: Ia16270d36c9a14521594de4b99a48c83e4ac07d4 --- M src/stats_statsd.c 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/23/11323/1 diff --git a/src/stats_statsd.c b/src/stats_statsd.c index 5ae2570..d3b139e 100644 --- a/src/stats_statsd.c +++ b/src/stats_statsd.c @@ -187,17 +187,16 @@ const char *unit = desc->unit; if (unit == OSMO_STAT_ITEM_NO_UNIT) { - unit = "g"; if (value < 0) osmo_stats_reporter_statsd_send(srep, statg->desc->group_name_prefix, statg->idx, - desc->name, 0, unit); + desc->name, 0, "g"); } return osmo_stats_reporter_statsd_send(srep, statg->desc->group_name_prefix, statg->idx, - desc->name, value, unit); + desc->name, value, "g"); } #endif /* !EMBEDDED */ -- To view, visit https://gerrit.osmocom.org/11323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia16270d36c9a14521594de4b99a48c83e4ac07d4 Gerrit-Change-Number: 11323 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 11 22:39:08 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 11 Oct 2018 22:39:08 +0000 Subject: Change in osmo-bsc[master]: debian: Require libcdk and install meas_vis osmo-bsc-meas-utils Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11324 Change subject: debian: Require libcdk and install meas_vis osmo-bsc-meas-utils ...................................................................... debian: Require libcdk and install meas_vis osmo-bsc-meas-utils Change-Id: Ibe977a92acb93a78e323a40f53d653059b07bc0f --- M debian/control M debian/osmo-bsc-meas-utils.install 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/24/11324/1 diff --git a/debian/control b/debian/control index 1c6c379..141cb5e 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ libtool, pkg-config, python-minimal, + libcdk5-dev, libtalloc-dev, libosmocore-dev (>= 0.12.0), libosmo-sccp-dev (>= 0.10.0), diff --git a/debian/osmo-bsc-meas-utils.install b/debian/osmo-bsc-meas-utils.install index d8fb318..94a03d0 100644 --- a/debian/osmo-bsc-meas-utils.install +++ b/debian/osmo-bsc-meas-utils.install @@ -1 +1,2 @@ usr/bin/meas_json +usr/bin/meas_vis -- To view, visit https://gerrit.osmocom.org/11324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibe977a92acb93a78e323a40f53d653059b07bc0f Gerrit-Change-Number: 11324 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:15:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:15:20 +0000 Subject: Change in libosmocore[master]: stats_statsd: Send all stat_items as gauges In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11323 ) Change subject: stats_statsd: Send all stat_items as gauges ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia16270d36c9a14521594de4b99a48c83e4ac07d4 Gerrit-Change-Number: 11323 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 12 Oct 2018 06:15:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:15:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:15:31 +0000 Subject: Change in osmo-bsc[master]: debian: Require libcdk and install meas_vis osmo-bsc-meas-utils In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11324 ) Change subject: debian: Require libcdk and install meas_vis osmo-bsc-meas-utils ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe977a92acb93a78e323a40f53d653059b07bc0f Gerrit-Change-Number: 11324 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 12 Oct 2018 06:15:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:15:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:15:34 +0000 Subject: Change in osmo-bsc[master]: debian: Require libcdk and install meas_vis osmo-bsc-meas-utils In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11324 ) Change subject: debian: Require libcdk and install meas_vis osmo-bsc-meas-utils ...................................................................... debian: Require libcdk and install meas_vis osmo-bsc-meas-utils Change-Id: Ibe977a92acb93a78e323a40f53d653059b07bc0f --- M debian/control M debian/osmo-bsc-meas-utils.install 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/control b/debian/control index 1c6c379..141cb5e 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ libtool, pkg-config, python-minimal, + libcdk5-dev, libtalloc-dev, libosmocore-dev (>= 0.12.0), libosmo-sccp-dev (>= 0.10.0), diff --git a/debian/osmo-bsc-meas-utils.install b/debian/osmo-bsc-meas-utils.install index d8fb318..94a03d0 100644 --- a/debian/osmo-bsc-meas-utils.install +++ b/debian/osmo-bsc-meas-utils.install @@ -1 +1,2 @@ usr/bin/meas_json +usr/bin/meas_vis -- To view, visit https://gerrit.osmocom.org/11324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibe977a92acb93a78e323a40f53d653059b07bc0f Gerrit-Change-Number: 11324 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:16:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:16:04 +0000 Subject: Change in osmo-gsm-tester[master]: ttcn3: Support running tests without PCU socket avail In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11322 ) Change subject: ttcn3: Support running tests without PCU socket avail ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I902af460b798ffdba09d77d457bac672db606368 Gerrit-Change-Number: 11322 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 06:16:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:19:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:19:28 +0000 Subject: Change in osmo-bsc[master]: fix counters for inter-BSC outgoing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11308 ) Change subject: fix counters for inter-BSC outgoing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I188b5db9e98c76153fdfb6f864d2cbfaea77bd5d Gerrit-Change-Number: 11308 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 06:19:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:19:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:19:30 +0000 Subject: Change in osmo-bsc[master]: fix counters for inter-BSC outgoing In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11308 ) Change subject: fix counters for inter-BSC outgoing ...................................................................... fix counters for inter-BSC outgoing Fix copy-paste error that resulted in counting outgoing inter-BSC HOs as incoming ones. Change-Id: I188b5db9e98c76153fdfb6f864d2cbfaea77bd5d --- M src/osmo-bsc/handover_fsm.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 0ba5061..90d5f6c 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -641,14 +641,14 @@ static int result_counter_INTER_BSC_HO_OUT(enum handover_result result) { switch (result) { case HO_RESULT_OK: - return BSC_CTR_INTER_BSC_HO_IN_COMPLETED; + return BSC_CTR_INTER_BSC_HO_OUT_COMPLETED; case HO_RESULT_FAIL_TIMEOUT: - return BSC_CTR_INTER_BSC_HO_IN_TIMEOUT; + return BSC_CTR_INTER_BSC_HO_OUT_TIMEOUT; case HO_RESULT_CONN_RELEASE: - return BSC_CTR_INTER_BSC_HO_IN_STOPPED; + return BSC_CTR_INTER_BSC_HO_OUT_STOPPED; default: case HO_RESULT_ERROR: - return BSC_CTR_INTER_BSC_HO_IN_ERROR; + return BSC_CTR_INTER_BSC_HO_OUT_ERROR; } } -- To view, visit https://gerrit.osmocom.org/11308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I188b5db9e98c76153fdfb6f864d2cbfaea77bd5d Gerrit-Change-Number: 11308 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:19:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:19:44 +0000 Subject: Change in osmo-bsc[master]: gscon_forget_lchan(): no Clear Request after Clear Command In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11309 ) Change subject: gscon_forget_lchan(): no Clear Request after Clear Command ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idc749068580da45e821e0af04cfa14cc7ce5c432 Gerrit-Change-Number: 11309 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 06:19:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:20:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:20:08 +0000 Subject: Change in osmo-bsc[master]: gscon_forget_lchan(): Clear Request iff no lchans remain In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11310 ) Change subject: gscon_forget_lchan(): Clear Request iff no lchans remain ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibd8e38ccf7759b8834efdedf742c46c227b26e91 Gerrit-Change-Number: 11310 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 06:20:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:20:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:20:37 +0000 Subject: Change in osmo-bsc[master]: subscr conn: properly forget lchan before release In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11311 ) Change subject: subscr conn: properly forget lchan before release ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4fd582b41ba4599af704d670af83651d2450b1db Gerrit-Change-Number: 11311 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 06:20:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:21:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:21:03 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: fix failure handling: notify conn when released In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11312 ) Change subject: lchan_fsm: fix failure handling: notify conn when released ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I88337a18246c44ba48da64bb611a3cbb647a750e Gerrit-Change-Number: 11312 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 06:21:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:21:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:21:36 +0000 Subject: Change in osmo-bsc[master]: gscon_forget_lchan(): no Clear Request after Clear Command In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11309 ) Change subject: gscon_forget_lchan(): no Clear Request after Clear Command ...................................................................... gscon_forget_lchan(): no Clear Request after Clear Command Send a BSSMAP Clear Request only if we are not already in ST_CLEARING, i.e. haven't received a BSSMAP Clear Command yet. Related: osmo-ttcn3-hacks If772dbbc5f9790d3f911465e1303dd0a99811154 Change-Id: Idc749068580da45e821e0af04cfa14cc7ce5c432 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 32375d4..3c9be56 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -644,7 +644,9 @@ conn->ho.new_lchan = NULL; if (conn->lchan == lchan) conn->lchan = NULL; - if (!conn->lchan) + + if (conn->fi->state != ST_CLEARING + && !conn->lchan) gscon_bssmap_clear(conn, GSM0808_CAUSE_EQUIPMENT_FAILURE); } -- To view, visit https://gerrit.osmocom.org/11309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idc749068580da45e821e0af04cfa14cc7ce5c432 Gerrit-Change-Number: 11309 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:21:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:21:36 +0000 Subject: Change in osmo-bsc[master]: gscon_forget_lchan(): Clear Request iff no lchans remain In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11310 ) Change subject: gscon_forget_lchan(): Clear Request iff no lchans remain ...................................................................... gscon_forget_lchan(): Clear Request iff no lchans remain Send a BSSMAP Clear Request only if absolutely no lchan remains associated to the conn, anywhere (Assignment, Handover as well as primary lchan). Conceivable would be a situation where e.g. we're in handover and a new lchan is ready, when just at a time where it doesn't matter anymore the old lchan fails. We could just carry on with the new one then. Change-Id: Ibd8e38ccf7759b8834efdedf742c46c227b26e91 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 3c9be56..a8b3183 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -646,7 +646,9 @@ conn->lchan = NULL; if (conn->fi->state != ST_CLEARING - && !conn->lchan) + && !conn->lchan + && !conn->ho.new_lchan + && !conn->assignment.new_lchan) gscon_bssmap_clear(conn, GSM0808_CAUSE_EQUIPMENT_FAILURE); } -- To view, visit https://gerrit.osmocom.org/11310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibd8e38ccf7759b8834efdedf742c46c227b26e91 Gerrit-Change-Number: 11310 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:21:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:21:36 +0000 Subject: Change in osmo-bsc[master]: subscr conn: properly forget lchan before release In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11311 ) Change subject: subscr conn: properly forget lchan before release ...................................................................... subscr conn: properly forget lchan before release Clear all lchan->conn pointers when the subscr conn code is choosing to release an lchan, with gscon_release_lchan(). Rationale: when an lchan releases in error, it should trigger the conn to be notified and cause a BSSMAP Clear. However, if the conn is actively requesting for an lchan release, it is already taking care of the situation. Related: osmo-ttcn3-hacks If772dbbc5f9790d3f911465e1303dd0a99811154 Change-Id: I4fd582b41ba4599af704d670af83651d2450b1db --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 22 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index a8b3183..52afd54 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -149,6 +149,24 @@ gscon_sigtran_send(conn, resp); } + +/* Release an lchan in such a way that it doesn't fire events back to the conn. */ +static void gscon_release_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan, + bool do_sacch_deact, bool err, enum gsm48_rr_cause cause_rr) +{ + if (!lchan || !conn) + return; + if (lchan->conn == conn) + lchan_forget_conn(lchan); + if (conn->lchan == lchan) + conn->lchan = NULL; + if (conn->ho.fi && conn->ho.new_lchan == lchan) + conn->ho.new_lchan = NULL; + if (conn->assignment.new_lchan == lchan) + conn->assignment.new_lchan = NULL; + lchan_release(lchan, do_sacch_deact, err, cause_rr); +} + void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_sacch_deact) { if (conn->ho.fi) @@ -156,9 +174,7 @@ assignment_reset(conn); - lchan_release(conn->lchan, do_sacch_deact, false, 0); - lchan_forget_conn(conn->lchan); - conn->lchan = NULL; + gscon_release_lchan(conn, conn->lchan, do_sacch_deact, false, 0); } static void handle_bssap_n_connect(struct osmo_fsm_inst *fi, struct osmo_scu_prim *scu_prim) @@ -602,10 +618,8 @@ if (conn->lchan->fi_rtp) osmo_fsm_inst_dispatch(conn->lchan->fi_rtp, LCHAN_RTP_EV_ESTABLISHED, 0); - if (old_lchan && (old_lchan != new_lchan)) { - lchan_forget_conn(old_lchan); - lchan_release(old_lchan, false, false, 0); - } + if (old_lchan && (old_lchan != new_lchan)) + gscon_release_lchan(conn, old_lchan, false, false, 0); } void gscon_lchan_releasing(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan) @@ -769,7 +783,7 @@ switch (fi->T) { case 993210: - lchan_release(conn->lchan, false, true, RSL_ERR_INTERWORKING); + gscon_release_lchan(conn, conn->lchan, false, true, RSL_ERR_INTERWORKING); /* MSC has not responded/confirmed connection with CC, this * could indicate a bad SCCP connection. We now inform the the -- To view, visit https://gerrit.osmocom.org/11311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4fd582b41ba4599af704d670af83651d2450b1db Gerrit-Change-Number: 11311 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:21:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:21:37 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: fix failure handling: notify conn when released In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11312 ) Change subject: lchan_fsm: fix failure handling: notify conn when released ...................................................................... lchan_fsm: fix failure handling: notify conn when released Usually, conn->lchan is set to NULL before/upon releasing it. However, if the lchan is still associated with a conn upon/after release, make sure the conn realizes it has no lchan and sends a BSSMAP Clear Request to the MSC. lchan_reset() is the last step before an lchan is fully unused. In there, make sure to notify any conn that might still be associated, with gscon_forget_lchan(). lchan_cleanup() does the same, but in fact this is only called when an lchan is *deallocated*, but instead it usually merely goes to the UNUSED state. It may make sense to call gscon_forget_lchan() sooner, e.g. when entering a releasing state. This here nevertheless is a final safeguard. Related: osmo-ttcn3-hacks If772dbbc5f9790d3f911465e1303dd0a99811154 Change-Id: I88337a18246c44ba48da64bb611a3cbb647a750e --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 4aaedde..9f2d6c3 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -368,6 +368,9 @@ { LOG_LCHAN(lchan, LOGL_DEBUG, "Clearing lchan state\n"); + if (lchan->conn) + gscon_forget_lchan(lchan->conn, lchan); + if (lchan->rqd_ref) { talloc_free(lchan->rqd_ref); lchan->rqd_ref = NULL; -- To view, visit https://gerrit.osmocom.org/11312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I88337a18246c44ba48da64bb611a3cbb647a750e Gerrit-Change-Number: 11312 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:23:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:23:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add 3 tests for inter-BSC HO outgoing failures In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11315 ) Change subject: bsc: add 3 tests for inter-BSC HO outgoing failures ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If772dbbc5f9790d3f911465e1303dd0a99811154 Gerrit-Change-Number: 11315 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 06:23:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:23:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:23:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add 3 tests for inter-BSC HO outgoing failures In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11315 ) Change subject: bsc: add 3 tests for inter-BSC HO outgoing failures ...................................................................... bsc: add 3 tests for inter-BSC HO outgoing failures Add * TC_ho_out_fail_no_msc_response() * TC_ho_out_fail_rr_ho_failure() * TC_ho_out_fail_no_ho_detect() Depends: I0980cacb9713e41a1eef3a0a7f6cc892e8a20da5 (osmo-bsc) Change-Id: If772dbbc5f9790d3f911465e1303dd0a99811154 --- M bsc/BSC_Tests.ttcn M bsc/expected-results.xml M library/BSSMAP_Templates.ttcn 3 files changed, 234 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 754f7b3..5f77021 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2274,6 +2274,214 @@ vc_conn.done; } +/* BSC asks for inter-BSC HO, but the MSC decides that it won't happen and + * simply never sends a BSSMAP Handover Command. */ +private function f_tc_ho_out_fail_no_msc_response(charstring id) runs on MSC_ConnHdlr { + g_pars := valueof(t_def_TestHdlrPars); + + var PDU_BSSAP ass_req := f_gen_ass_req(); + ass_req.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_req.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + f_establish_fully(ass_req, exp_compl); + + f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); + + BSSAP.receive(tr_BSSMAP_HandoverRequired); + + /* osmo-bsc should time out 10 seconds after the handover started. + * Let's give it a bit extra. */ + f_sleep(15.0); + + /* The old lchan and conn should still be active. See that arbitrary L3 + * is still going through. */ + var octetstring l3 := '0123456789'O; + RSL.send(ts_RSL_DATA_IND(g_chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3)); + var template PDU_BSSAP exp_data := { + discriminator := '1'B, + spare := '0000000'B, + dlci := '00'O, + lengthIndicator := 5, + pdu := { + dtap := l3 + } + }; + BSSAP.receive(exp_data); + setverdict(pass); + f_sleep(1.0); +} +testcase TC_ho_out_fail_no_msc_response() runs on test_CT { + var MSC_ConnHdlr vc_conn; + + f_init(1, true); + f_sleep(1.0); + + vc_conn := f_start_handler(refers(f_tc_ho_out_fail_no_msc_response)); + vc_conn.done; +} + +/* BSC asks for inter-BSC HO, receives BSSMAP Handover Command, but MS reports + * RR Handover Failure. */ +private function f_tc_ho_out_fail_rr_ho_failure(charstring id) runs on MSC_ConnHdlr { + g_pars := valueof(t_def_TestHdlrPars); + + var PDU_BSSAP ass_req := f_gen_ass_req(); + ass_req.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_req.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + f_establish_fully(ass_req, exp_compl); + + f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); + + BSSAP.receive(tr_BSSMAP_HandoverRequired); + + f_sleep(0.5); + /* The MSC negotiates Handover Request and Handover Request Ack with + * the other BSS and comes back with a BSSMAP Handover Command + * containing an RR Handover Command coming from the target BSS... */ + + var PDU_ML3_NW_MS rr_ho_cmd := valueof(ts_RR_HandoverCommand); + log("Remote cell's RR Handover Command passed through as L3 Info: ", rr_ho_cmd); + var octetstring rr_ho_cmd_enc := enc_PDU_ML3_NW_MS(rr_ho_cmd); + log("Remote cell's RR Handover Command passed through as L3 Info, encoded: ", rr_ho_cmd_enc); + BSSAP.send(ts_BSSMAP_HandoverCommand(rr_ho_cmd_enc)); + + /* expect the Handover Command to go out on RR */ + var RSL_Message rsl_ho_cmd + RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, ?)) -> value rsl_ho_cmd; + log("RSL Data Req went out to first BTS: ", rsl_ho_cmd); + var RSL_IE_Body rsl_ho_cmd_l3; + if (not f_rsl_find_ie(rsl_ho_cmd, RSL_IE_L3_INFO, rsl_ho_cmd_l3)) { + log("RSL message contains no L3 Info IE, expected RR Handover Command"); + setverdict(fail); + } else { + log("Found L3 Info: ", rsl_ho_cmd_l3); + if (rsl_ho_cmd_l3.l3_info.payload != rr_ho_cmd_enc) { + log("FAIL: the BSC sent out a different L3 Info, not matching the RR Handover Command the other BSS forwarded."); + setverdict(fail); + } else { + log("Success: the BSC sent out the same RR Handover Command the other BSS forwarded."); + setverdict(pass); + } + } + + f_sleep(0.2); + f_rsl_send_l3(ts_RRM_HandoverFailure('00'O)); + + /* Should tell the MSC about the failure */ + BSSAP.receive(tr_BSSMAP_HandoverFailure); + + f_sleep(1.0); + + /* The old lchan and conn should still be active. See that arbitrary L3 + * is still going through. */ + var octetstring l3 := '0123456789'O; + RSL.send(ts_RSL_DATA_IND(g_chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3)); + var template PDU_BSSAP exp_data := { + discriminator := '1'B, + spare := '0000000'B, + dlci := '00'O, + lengthIndicator := 5, + pdu := { + dtap := l3 + } + }; + BSSAP.receive(exp_data); + setverdict(pass); + f_sleep(1.0); + + setverdict(pass); + f_sleep(1.0); +} +testcase TC_ho_out_fail_rr_ho_failure() runs on test_CT { + var MSC_ConnHdlr vc_conn; + + f_init(1, true); + f_sleep(1.0); + + vc_conn := f_start_handler(refers(f_tc_ho_out_fail_rr_ho_failure)); + vc_conn.done; +} + +/* BSC asks for inter-BSC HO, receives BSSMAP Handover Command, but MS reports + * RR Handover Failure. */ +private function f_tc_ho_out_fail_no_ho_detect(charstring id) runs on MSC_ConnHdlr { + g_pars := valueof(t_def_TestHdlrPars); + + var PDU_BSSAP ass_req := f_gen_ass_req(); + ass_req.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_req.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + f_establish_fully(ass_req, exp_compl); + + f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); + + BSSAP.receive(tr_BSSMAP_HandoverRequired); + + f_sleep(0.5); + /* The MSC negotiates Handover Request and Handover Request Ack with + * the other BSS and comes back with a BSSMAP Handover Command + * containing an RR Handover Command coming from the target BSS... */ + + var PDU_ML3_NW_MS rr_ho_cmd := valueof(ts_RR_HandoverCommand); + log("Remote cell's RR Handover Command passed through as L3 Info: ", rr_ho_cmd); + var octetstring rr_ho_cmd_enc := enc_PDU_ML3_NW_MS(rr_ho_cmd); + log("Remote cell's RR Handover Command passed through as L3 Info, encoded: ", rr_ho_cmd_enc); + BSSAP.send(ts_BSSMAP_HandoverCommand(rr_ho_cmd_enc)); + + /* expect the Handover Command to go out on RR */ + var RSL_Message rsl_ho_cmd + RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, ?)) -> value rsl_ho_cmd; + log("RSL Data Req went out to first BTS: ", rsl_ho_cmd); + var RSL_IE_Body rsl_ho_cmd_l3; + if (not f_rsl_find_ie(rsl_ho_cmd, RSL_IE_L3_INFO, rsl_ho_cmd_l3)) { + log("RSL message contains no L3 Info IE, expected RR Handover Command"); + setverdict(fail); + } else { + log("Found L3 Info: ", rsl_ho_cmd_l3); + if (rsl_ho_cmd_l3.l3_info.payload != rr_ho_cmd_enc) { + log("FAIL: the BSC sent out a different L3 Info, not matching the RR Handover Command the other BSS forwarded."); + setverdict(fail); + } else { + log("Success: the BSC sent out the same RR Handover Command the other BSS forwarded."); + setverdict(pass); + } + } + + /* The MS never shows up on the remote BSS. Eventually the BSC times + * out and we run into 3GPP TS 48.008 3.1.5.3.3 "Abnormal Conditions": + * RR should be released and Clear Request should go to the MSC. */ + + var MgcpCommand mgcp; + interleave { + [] RSL.receive(tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL)) { + log("Got RF Chan Rel"); + RSL.send(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr)); + } + [] BSSAP.receive(tr_BSSMAP_ClearRequest) { + log("Got BSSMAP Clear Request"); + } + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got first DLCX: ", mgcp); + } + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got second DLCX: ", mgcp); + } + } + + setverdict(pass); + f_sleep(1.0); +} +testcase TC_ho_out_fail_no_ho_detect() runs on test_CT { + var MSC_ConnHdlr vc_conn; + + f_init(1, true); + f_sleep(1.0); + + vc_conn := f_start_handler(refers(f_tc_ho_out_fail_no_ho_detect)); + vc_conn.done; +} + private function f_tc_ho_into_this_bsc(charstring id) runs on MSC_ConnHdlr { /* Hack: the proper way would be to wait for the BSSMAP Handover Request ACK and extract the * actual assigned chan_nr from its L3 (RR Handover Command) message. But osmo-bsc starts acting @@ -2847,6 +3055,9 @@ execute( TC_ho_int() ); execute( TC_ho_out_of_this_bsc() ); + execute( TC_ho_out_fail_no_msc_response() ); + execute( TC_ho_out_fail_rr_ho_failure() ); + execute( TC_ho_out_fail_no_ho_detect() ); execute( TC_ho_into_this_bsc() ); execute( TC_bssap_rlsd_does_not_cause_bssmap_reset() ); diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index 64d0444..cd808d8 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -70,6 +70,9 @@ + + + diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index adfcc9e..118168e 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -699,6 +699,25 @@ } } +template PDU_BSSAP tr_BSSMAP_HandoverFailure modifies tr_BSSAP_BSSMAP := { + pdu := { + bssmap := { + handoverFailure := { + messageType := '16'O, + cause := ?, + rR_Cause := *, + circuitPool := *, + circuitPoolList := *, + gERANClassmark := *, + newBSSToOldBSSInfo := *, + interSystemInformation := *, + talkerPriority := *, + codecList := * + } + } + } +} + template PDU_BSSAP ts_BSSMAP_HandoverRequest( template BSSMAP_IE_CircuitIdentityCode cic := omit, template BSSMAP_IE_AoIP_TransportLayerAddress aoip_tla := omit, -- To view, visit https://gerrit.osmocom.org/11315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If772dbbc5f9790d3f911465e1303dd0a99811154 Gerrit-Change-Number: 11315 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:24:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:24:43 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: tweak comments In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11316 ) Change subject: handover_decision_2.c: tweak comments ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8bae3431dfaf23301e72f8f572286753b63a99b9 Gerrit-Change-Number: 11316 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 06:24:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:24:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:24:57 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: tweak ho candidate logging In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11317 ) Change subject: handover_decision_2.c: tweak ho candidate logging ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I694e3832c55b4e972e05422e5e4508a74a222a71 Gerrit-Change-Number: 11317 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 06:24:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:25:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:25:07 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: find_alternative_lchan: drop goto In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11318 ) Change subject: handover_decision_2.c: find_alternative_lchan: drop goto ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6558a6948e8973cc91dae240375af074a5f5547e Gerrit-Change-Number: 11318 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 06:25:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:25:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:25:20 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: drop redundant debug_candidate() args In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11319 ) Change subject: handover_decision_2.c: drop redundant debug_candidate() args ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ida186946f40d30f4d9ed94d9c1ff9bdb70048626 Gerrit-Change-Number: 11319 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 06:25:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:26:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:26:10 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: tweak comments In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11316 ) Change subject: handover_decision_2.c: tweak comments ...................................................................... handover_decision_2.c: tweak comments Change-Id: I8bae3431dfaf23301e72f8f572286753b63a99b9 --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index 4e9b02c..70be050 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -471,6 +471,7 @@ break; default: LOGPHOLCHANTOBTS(lchan, bts, LOGL_DEBUG, "Not even considering: src is not a SPEECH mode lchan\n"); + /* FIXME: should allow handover of non-speech lchans */ return 0; } @@ -556,7 +557,7 @@ } #endif - /* the maximum number of unsynchonized handovers must no be exceeded */ + /* the maximum number of unsynchronized handovers must no be exceeded */ if (current_bts != bts && bts_handover_count(bts, HO_SCOPE_ALL) >= ho_get_hodec2_ho_max(bts->ho)) { LOGPHOLCHANTOBTS(lchan, bts, LOGL_DEBUG, @@ -679,7 +680,7 @@ return 0; } -/* debug collected candidates */ +/* verbosely log about a handover candidate */ static inline void debug_candidate(struct gsm_lchan *lchan, struct ho_candidate *candidate, struct gsm_bts *neighbor, int8_t rxlev, int tchf_count, int tchh_count) { -- To view, visit https://gerrit.osmocom.org/11316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8bae3431dfaf23301e72f8f572286753b63a99b9 Gerrit-Change-Number: 11316 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:26:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:26:11 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: tweak ho candidate logging In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11317 ) Change subject: handover_decision_2.c: tweak ho candidate logging ...................................................................... handover_decision_2.c: tweak ho candidate logging Use a common LOGPHOCAND() to transparently log both local and remote candidates. Change-Id: I694e3832c55b4e972e05422e5e4508a74a222a71 --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 65 insertions(+), 49 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index 70be050..fc94d61 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -64,6 +64,26 @@ bsc_subscr_name(lchan->conn? lchan->conn->bsub : NULL), \ ## args) +#define LOGPHOLCHANTOREMOTE(lchan, remote_cil, level, fmt, args...) \ + LOGP(DHODEC, level, "(lchan %u.%u%u%u %s %s)->(remote-BSS %s) (subscr %s) " fmt, \ + lchan->ts->trx->bts->nr, \ + lchan->ts->trx->nr, \ + lchan->ts->nr, \ + lchan->nr, \ + gsm_lchant_name(lchan->type), \ + gsm48_chan_mode_name(lchan->tch_mode), \ + gsm0808_cell_id_list_name(remote_cil), \ + bsc_subscr_name(lchan->conn? lchan->conn->bsub : NULL), \ + ## args) + +#define LOGPHOCAND(candidate, level, fmt, args...) do {\ + if ((candidate)->bts) \ + LOGPHOLCHANTOBTS((candidate)->lchan, (candidate)->bts, level, fmt, ## args); \ + else if ((candidate)->cil) \ + LOGPHOLCHANTOREMOTE((candidate)->lchan, (candidate)->cil, level, fmt, ## args); \ + } while(0) + + #define REQUIREMENT_A_TCHF 0x01 #define REQUIREMENT_B_TCHF 0x02 #define REQUIREMENT_C_TCHF 0x04 @@ -634,7 +654,6 @@ /* change to full rate if AFS is improved and a candidate */ if (afs_bias > 0 && (requirements & REQUIREMENT_TCHF_MASK)) { full_rate = true; - LOGPHOLCHAN(lchan, LOGL_DEBUG, "[Improve AHS->AFS]\n"); break; } /* change to full rate if the only candidate */ @@ -749,7 +768,7 @@ .bsic = nmp->bsic, }; int avg; - struct ho_candidate *c; + struct ho_candidate c; int min_rxlev; /* skip empty slots */ @@ -791,16 +810,22 @@ /* calculate average rxlev for this cell over the window */ avg = neigh_meas_avg(nmp, ho_get_hodec2_rxlev_neigh_avg_win(bts->ho)); + c = (struct ho_candidate){ + .lchan = lchan, + .avg = avg, + .bts = neighbor_bts, + }; + /* Heed rxlev hysteresis only if the RXLEV/RXQUAL/TA levels of the MS aren't critically bad and * we're just looking for an improvement. If levels are critical, we desperately need a handover * and thus skip the hysteresis check. */ if (!include_weaker_rxlev) { unsigned int pwr_hyst = ho_get_hodec2_pwr_hysteresis(bts->ho); if (avg <= (av_rxlev + pwr_hyst)) { - LOGPHOLCHAN(lchan, LOGL_DEBUG, - "BTS %d is not a candidate, because RX level (%d) is lower" - " or equal than current RX level (%d) + hysteresis (%d)\n", - neighbor_bts->nr, rxlev2dbm(avg), rxlev2dbm(av_rxlev), pwr_hyst); + LOGPHOCAND(&c, LOGL_DEBUG, + "Not a candidate, because RX level (%d) is lower" + " or equal than current RX level (%d) + hysteresis (%d)\n", + rxlev2dbm(avg), rxlev2dbm(av_rxlev), pwr_hyst); return; } } @@ -808,22 +833,20 @@ /* if the minimum level is not reached */ min_rxlev = ho_get_hodec2_min_rxlev(neighbor_bts->ho); if (rxlev2dbm(avg) < min_rxlev) { - LOGPHOLCHAN(lchan, LOGL_DEBUG, - "BTS %d is not a candidate, because RX level (%d) is lower" - " than its minimum required RX level (%d)\n", - neighbor_bts->nr, rxlev2dbm(avg), min_rxlev); + LOGPHOCAND(&c, LOGL_DEBUG, + "Not a candidate, because RX level (%d) is lower" + " than the minimum required RX level (%d)\n", + rxlev2dbm(avg), min_rxlev); return; } tchf_count = bts_count_free_ts(neighbor_bts, GSM_PCHAN_TCH_F); tchh_count = bts_count_free_ts(neighbor_bts, GSM_PCHAN_TCH_H); - c = &clist[*candidates]; - c->lchan = lchan; - c->bts = neighbor_bts; - c->requirements = check_requirements(lchan, neighbor_bts, tchf_count, - tchh_count); - c->avg = avg; - debug_candidate(lchan, c, neighbor_bts, av_rxlev, tchf_count, tchh_count); + c.requirements = check_requirements(lchan, neighbor_bts, tchf_count, tchh_count); + + debug_candidate(lchan, &c, neighbor_bts, av_rxlev, tchf_count, tchh_count); + + clist[*candidates] = c; (*candidates)++; } @@ -973,9 +996,9 @@ /* perform handover, if there is a candidate */ if (best_cand) { - LOGPHOLCHANTOBTS(lchan, best_cand->bts, LOGL_INFO, "Best candidate, RX level %d%s\n", - rxlev2dbm(best_cand->avg), - best_applied_afs_bias ? " (applied AHS -> AFS rxlev bias)" : ""); + LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate, RX level %d%s\n", + rxlev2dbm(best_cand->avg), + best_applied_afs_bias ? " (applied AHS -> AFS rxlev bias)" : ""); return trigger_handover_or_assignment(lchan, best_cand->bts, best_cand->requirements & REQUIREMENT_B_MASK); } @@ -1002,9 +1025,9 @@ /* perform handover, if there is a candidate */ if (best_cand) { - LOGPHOLCHANTOBTS(lchan, best_cand->bts, LOGL_INFO, "Best candidate, RX level %d%s\n", - rxlev2dbm(best_cand->avg), - best_applied_afs_bias? " (applied AHS -> AFS rxlev bias)" : ""); + LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate, RX level %d%s\n", + rxlev2dbm(best_cand->avg), + best_applied_afs_bias? " (applied AHS -> AFS rxlev bias)" : ""); return trigger_handover_or_assignment(lchan, best_cand->bts, best_cand->requirements & REQUIREMENT_C_MASK); } @@ -1037,10 +1060,9 @@ /* perform handover, if there is a candidate */ if (best_cand) { - LOGPHOLCHANTOBTS(lchan, best_cand->bts, LOGL_INFO, "Best candidate, RX level %d" - " with greater congestion found%s\n", - rxlev2dbm(best_cand->avg), - best_applied_afs_bias ? " (applied AHS -> AFS rxlev bias)" : ""); + LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate: RX level %d%s\n", + rxlev2dbm(best_cand->avg), + best_applied_afs_bias ? " (applied AHS -> AFS rxlev bias)" : ""); return trigger_handover_or_assignment(lchan, best_cand->bts, best_cand->requirements & REQUIREMENT_A_MASK); } @@ -1337,9 +1359,8 @@ if (log_check_level(DHODEC, LOGL_DEBUG)) { LOGPHOBTS(bts, LOGL_DEBUG, "Considering %u candidates to solve congestion:\n", candidates); for (i = 0; i < candidates; i++) { - LOGPHOLCHANTOBTS(clist[i].lchan, clist[i].bts, LOGL_DEBUG, - "#%d: req=0x%x avg-rxlev=%d\n", - i, clist[i].requirements, clist[i].avg); + LOGPHOCAND(&clist[i], LOGL_DEBUG, "#%d: req=0x%x avg-rxlev=%d\n", + i, clist[i].requirements, clist[i].avg); } } @@ -1381,7 +1402,8 @@ is_improved = 1; } else is_improved = 0; - LOGP(DHODEC, LOGL_DEBUG, "candidate %d: avg=%d best_avg_db=%d\n", i, avg, best_avg_db); + LOGPHOCAND(&clist[i], LOGL_DEBUG, "candidate %d: avg=%d best_avg_db=%d\n", + i, avg, best_avg_db); if (avg > best_avg_db) { best_cand = &clist[i]; best_avg_db = avg; @@ -1391,10 +1413,9 @@ /* perform handover, if there is a candidate */ if (best_cand) { any_ho = 1; - LOGPHOLCHAN(best_cand->lchan, LOGL_DEBUG, - "Best candidate BTS %u (RX level %d%s) without congestion found\n", - best_cand->bts->nr, rxlev2dbm(best_cand->avg), - is_improved ? ", RX quality improved by AHS->AFS" : ""); + LOGPHOCAND(best_cand, LOGL_DEBUG, "Best candidate: RX level %d%s\n", + rxlev2dbm(best_cand->avg), + is_improved ? " (applied AHS->AFS bias)" : ""); trigger_handover_or_assignment(best_cand->lchan, best_cand->bts, best_cand->requirements & REQUIREMENT_B_MASK); #if 0 @@ -1461,10 +1482,9 @@ /* perform handover, if there is a candidate */ if (worst_cand) { any_ho = 1; - LOGP(DHODEC, LOGL_INFO, "Worst candidate for assignment " - "(RX level %d%s) from TCH/H -> TCH/F without congestion " - "found\n", rxlev2dbm(worst_cand->avg), - is_improved ? ", RX quality improved by AHS->AFS" : ""); + LOGPHOCAND(worst_cand, LOGL_INFO, "Worst candidate: RX level %d from TCH/H -> TCH/F%s\n", + rxlev2dbm(worst_cand->avg), + is_improved ? " (applied AHS -> AFS rxlev bias)" : ""); trigger_handover_or_assignment(worst_cand->lchan, worst_cand->bts, worst_cand->requirements & REQUIREMENT_B_MASK); @@ -1533,12 +1553,9 @@ /* perform handover, if there is a candidate */ if (best_cand) { any_ho = 1; - LOGP(DHODEC, LOGL_INFO, "Best candidate BTS %d (RX level %d) " - "with less or equal congestion found\n", - best_cand->bts->nr, rxlev2dbm(best_cand->avg)); - if (is_improved) - LOGP(DHODEC, LOGL_INFO, "(is improved due to " - "AHS -> AFS)\n"); + LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate: RX level %d%s\n", + rxlev2dbm(best_cand->avg), + is_improved ? " (applied AHS -> AFS rxlev bias)" : ""); trigger_handover_or_assignment(best_cand->lchan, best_cand->bts, best_cand->requirements & REQUIREMENT_C_MASK); #if 0 @@ -1610,10 +1627,9 @@ /* perform handover, if there is a candidate */ if (worst_cand) { any_ho = 1; - LOGP(DHODEC, LOGL_INFO, "Worst candidate for assignment " - "(RX level %d%s) from TCH/H -> TCH/F with less or equal " - "congestion found\n", rxlev2dbm(worst_cand->avg), - is_improved ? ", RX quality improved by AHS->AFS" : ""); + LOGPHOCAND(worst_cand, LOGL_INFO, "Worst candidate: RX level %d from TCH/H -> TCH/F%s\n", + rxlev2dbm(worst_cand->avg), + is_improved ? " (applied AHS -> AFS rxlev bias)" : ""); trigger_handover_or_assignment(worst_cand->lchan, worst_cand->bts, worst_cand->requirements & REQUIREMENT_C_MASK); -- To view, visit https://gerrit.osmocom.org/11317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I694e3832c55b4e972e05422e5e4508a74a222a71 Gerrit-Change-Number: 11317 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:26:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:26:11 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: find_alternative_lchan: drop goto In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11318 ) Change subject: handover_decision_2.c: find_alternative_lchan: drop goto ...................................................................... handover_decision_2.c: find_alternative_lchan: drop goto Don't goto the function end just to log something. Rather log right away and exit early. Change-Id: I6558a6948e8973cc91dae240375af074a5f5547e --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 9 insertions(+), 11 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index fc94d61..67ba26d 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -971,8 +971,10 @@ /* If assignment is disabled and no neighbor cell report exists, or no neighbor cell qualifies, * we may not even have any candidates. */ - if (!candidates) - goto no_candidates; + if (!candidates) { + LOGPHOLCHAN(lchan, LOGL_INFO, "No viable neighbor cells found\n"); + return 0; + } /* select best candidate that fulfills requirement B: no congestion after HO */ best_better_db = 0; @@ -1033,8 +1035,10 @@ } /* we are done in case the MS RXLEV/RXQUAL/TA aren't critical and we're avoiding congestion. */ - if (!include_weaker_rxlev) - goto no_candidates; + if (!include_weaker_rxlev) { + LOGPHOLCHAN(lchan, LOGL_INFO, "No better/less congested neighbor cell found\n"); + return 0; + } /* Select best candidate that fulfills requirement A: can service the call. * From above we know that there are no options that avoid congestion. Here we're trying to find @@ -1069,13 +1073,7 @@ /* Damn, all is congested, has too low RXLEV or cannot service the voice call due to codec * restrictions or because all lchans are taken. */ - -no_candidates: - if (include_weaker_rxlev) - LOGPHOLCHAN(lchan, LOGL_INFO, "No alternative lchan found\n"); - else - LOGPHOLCHAN(lchan, LOGL_INFO, "No better/less congested neighbor cell found\n"); - + LOGPHOLCHAN(lchan, LOGL_INFO, "No alternative lchan found\n"); return 0; } -- To view, visit https://gerrit.osmocom.org/11318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6558a6948e8973cc91dae240375af074a5f5547e Gerrit-Change-Number: 11318 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:26:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:26:11 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: drop redundant debug_candidate() args In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11319 ) Change subject: handover_decision_2.c: drop redundant debug_candidate() args ...................................................................... handover_decision_2.c: drop redundant debug_candidate() args No functional change. Change-Id: Ida186946f40d30f4d9ed94d9c1ff9bdb70048626 --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 14 insertions(+), 12 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index 67ba26d..64fc2dd 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -700,9 +700,11 @@ } /* verbosely log about a handover candidate */ -static inline void debug_candidate(struct gsm_lchan *lchan, struct ho_candidate *candidate, - struct gsm_bts *neighbor, int8_t rxlev, int tchf_count, int tchh_count) +static inline void debug_candidate(struct ho_candidate *candidate, + int8_t rxlev, int tchf_count, int tchh_count) { + struct gsm_lchan *lchan = candidate->lchan; + #define HO_CANDIDATE_FMT(tchx, TCHX) "TCH/" #TCHX "={free %d (want %d), [%s%s%s]%s}" #define HO_CANDIDATE_ARGS(tchx, TCHX) \ tch##tchx##_count, ho_get_hodec2_tch##tchx##_min_slots(candidate->bts->ho), \ @@ -718,18 +720,18 @@ /* now has to be candidate->requirements & REQUIREMENT_C_TCHX != 0: */ \ " less-or-equal congestion")) - if (neighbor) - LOGPHOLCHANTOBTS(lchan, neighbor, LOGL_DEBUG, - "RX level %d -> %d; " - HO_CANDIDATE_FMT(f, F) "; " HO_CANDIDATE_FMT(h, H) "\n", - rxlev2dbm(rxlev), rxlev2dbm(candidate->avg), - HO_CANDIDATE_ARGS(f, F), HO_CANDIDATE_ARGS(h, H)); - else - LOGPHOLCHANTOBTS(lchan, lchan->ts->trx->bts, LOGL_DEBUG, + if (candidate->bts == lchan->ts->trx->bts) + LOGPHOLCHANTOBTS(lchan, candidate->bts, LOGL_DEBUG, "RX level %d; " HO_CANDIDATE_FMT(f, F) "; " HO_CANDIDATE_FMT(h, H) "\n", rxlev2dbm(candidate->avg), HO_CANDIDATE_ARGS(f, F), HO_CANDIDATE_ARGS(h, H)); + else if (candidate->bts) + LOGPHOLCHANTOBTS(lchan, candidate->bts, LOGL_DEBUG, + "RX level %d -> %d; " + HO_CANDIDATE_FMT(f, F) "; " HO_CANDIDATE_FMT(h, H) "\n", + rxlev2dbm(rxlev), rxlev2dbm(candidate->avg), + HO_CANDIDATE_ARGS(f, F), HO_CANDIDATE_ARGS(h, H)); } /* add candidate for re-assignment within the current cell */ @@ -748,7 +750,7 @@ c->bts = bts; c->requirements = check_requirements(lchan, bts, tchf_count, tchh_count); c->avg = av_rxlev; - debug_candidate(lchan, c, NULL, 0, tchf_count, tchh_count); + debug_candidate(c, 0, tchf_count, tchh_count); (*candidates)++; } @@ -844,7 +846,7 @@ tchh_count = bts_count_free_ts(neighbor_bts, GSM_PCHAN_TCH_H); c.requirements = check_requirements(lchan, neighbor_bts, tchf_count, tchh_count); - debug_candidate(lchan, &c, neighbor_bts, av_rxlev, tchf_count, tchh_count); + debug_candidate(&c, av_rxlev, tchf_count, tchh_count); clist[*candidates] = c; (*candidates)++; -- To view, visit https://gerrit.osmocom.org/11319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ida186946f40d30f4d9ed94d9c1ff9bdb70048626 Gerrit-Change-Number: 11319 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 06:29:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 06:29:45 +0000 Subject: Change in osmo-msc[master]: gsm_04_08_cc: Add global guard timer for MNCC In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11307 ) Change subject: gsm_04_08_cc: Add global guard timer for MNCC ...................................................................... Patch Set 1: Code-Review-1 (1 comment) looks good, but the actual timeout value should receive some more consideration. https://gerrit.osmocom.org/#/c/11307/1/src/libmsc/gsm_04_08_cc.c File src/libmsc/gsm_04_08_cc.c: https://gerrit.osmocom.org/#/c/11307/1/src/libmsc/gsm_04_08_cc.c at 76 PS1, Line 76: #define GUARD_TIMEOUT 65 > should this be configurable? it should be configurable, and I am afraid 65 seconds is way too little. According to TS 04.07, we have something like 180 seconds of default timeout when alerting the remote end alone. This means that the phone of the called subscriber could be ringing for 3 minutes before an answer. And if the called party picks up after 2:50 minutes after starting to alert (which is probably easily more than 3 minutes after attempting the call), it is still a successful call. With 65 seconds global guard timer, we would kill the call too early. -- To view, visit https://gerrit.osmocom.org/11307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7375d1e17cd746aac4eadfe1e587e82cf1630d3d Gerrit-Change-Number: 11307 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 12 Oct 2018 06:29:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 08:59:35 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 12 Oct 2018 08:59:35 +0000 Subject: Change in osmo-dev[master]: find the terminal once and abort if missing In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11143 to look at the new patch set (#5). Change subject: find the terminal once and abort if missing ...................................................................... find the terminal once and abort if missing Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 --- M net/tmpl_std/run.sh 1 file changed, 18 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/43/11143/5 -- To view, visit https://gerrit.osmocom.org/11143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 Gerrit-Change-Number: 11143 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 08:59:35 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 12 Oct 2018 08:59:35 +0000 Subject: Change in osmo-dev[master]: Support osmo-sip-connector with kamailio In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11144 to look at the new patch set (#5). Change subject: Support osmo-sip-connector with kamailio ...................................................................... Support osmo-sip-connector with kamailio Kamailio is a SIP server, that is relatively easy to configure, in contrary to asterisk it only has one config file. The config file here is based on the example config provided in the wiki: To enable the osmo-sip-connector, build it, install kamailio and then set SIPCON_ENABLE=true in your copy of config_2g_3g. Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 --- M net/config_2g3g A net/tmpl_std/kamailio.cfg A net/tmpl_std/osmo-sip-connector.cfg M net/tmpl_std/run.sh 4 files changed, 462 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/44/11144/5 -- To view, visit https://gerrit.osmocom.org/11144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 Gerrit-Change-Number: 11144 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 09:10:07 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 12 Oct 2018 09:10:07 +0000 Subject: Change in libosmocore[master]: libosmogsm/gsup.c: assert message type in osmo_gsup_encode() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11325 Change subject: libosmogsm/gsup.c: assert message type in osmo_gsup_encode() ...................................................................... libosmogsm/gsup.c: assert message type in osmo_gsup_encode() Missing (unset) type of to be encoded message is not a memory allocation failure (-ENOMEM), this is definitely a mistake. Change-Id: Ibbac18e2b68b765c17c2bc959c4c085037953a7f --- M src/gsm/gsup.c 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/11325/1 diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index 9c2f817..fe13d95 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -534,9 +534,7 @@ size_t bcd_len; /* generic part */ - if(!gsup_msg->message_type) - return -ENOMEM; - + OSMO_ASSERT(gsup_msg->message_type != 0x00); msgb_v_put(msg, gsup_msg->message_type); bcd_len = gsm48_encode_bcd_number(bcd_buf, sizeof(bcd_buf), 0, -- To view, visit https://gerrit.osmocom.org/11325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibbac18e2b68b765c17c2bc959c4c085037953a7f Gerrit-Change-Number: 11325 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 09:12:12 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 12 Oct 2018 09:12:12 +0000 Subject: Change in osmo-dev[master]: find the terminal once and abort if missing In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11143 to look at the new patch set (#6). Change subject: find the terminal once and abort if missing ...................................................................... find the terminal once and abort if missing Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 --- M net/tmpl_std/run.sh 1 file changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/43/11143/6 -- To view, visit https://gerrit.osmocom.org/11143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 Gerrit-Change-Number: 11143 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 09:12:12 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 12 Oct 2018 09:12:12 +0000 Subject: Change in osmo-dev[master]: support osmo-sip-connector with kamailio In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11144 to look at the new patch set (#6). Change subject: support osmo-sip-connector with kamailio ...................................................................... support osmo-sip-connector with kamailio Kamailio is a SIP server, that is relatively easy to configure, in contrary to asterisk it only has one config file. The config file here is based on the example config provided in the wiki: To enable the osmo-sip-connector, build it, install kamailio and then set SIPCON_ENABLE=true in your copy of config_2g_3g. Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 --- M net/config_2g3g A net/tmpl_std/kamailio.cfg A net/tmpl_std/osmo-sip-connector.cfg M net/tmpl_std/run.sh 4 files changed, 465 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/44/11144/6 -- To view, visit https://gerrit.osmocom.org/11144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 Gerrit-Change-Number: 11144 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 09:16:29 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 12 Oct 2018 09:16:29 +0000 Subject: Change in osmo-dev[master]: run tcpdump *after* finding programs (not before) In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/11142 ) Change subject: run tcpdump *after* finding programs (not before) ...................................................................... Abandoned This is integrated here now, where it makes more sense: https://gerrit.osmocom.org/#/c/osmo-dev/+/11144/6 -- To view, visit https://gerrit.osmocom.org/11142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: If487c357cbae504410545d2ed00d7e22f5e60f4f Gerrit-Change-Number: 11142 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 09:38:25 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 12 Oct 2018 09:38:25 +0000 Subject: Change in osmo-bsc[master]: vty 'show bts'/'show trx': display IPs and ports In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11290 to look at the new patch set (#4). Change subject: vty 'show bts'/'show trx': display IPs and ports ...................................................................... vty 'show bts'/'show trx': display IPs and ports This quickly allows knowing which IP a BTS is using in order to SSH into it. Example output: OsmoBSC> show trx ... Baseband Transceiver NM State: Oper 'Enabled', Admin 'Unlocked', Avail 'OK' ip.access stream ID: 0x00 (r=192.168.1.178:34090<->l=192.168.1.37:3003) ... OsmoBSC> show bts ... Paging: 0 pending requests, 50 free slots OML Link: (r=192.168.1.178:57692<->l=192.168.1.37:3002) OML Link state: connected 0 days 0 hours 0 min. 17 sec. ... Related: OS#3145 Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f --- M src/osmo-bsc/bsc_vty.c 1 file changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/90/11290/4 -- To view, visit https://gerrit.osmocom.org/11290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f Gerrit-Change-Number: 11290 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 09:54:48 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 12 Oct 2018 09:54:48 +0000 Subject: Change in libosmo-abis[master]: ipaccess: add e1inp_sign_link_name() In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/11294 ) Change subject: ipaccess: add e1inp_sign_link_name() ...................................................................... Abandoned > we don't ever want to allocate under a NULL ctx. Understood. Nobody commented on that in the other patch: https://gerrit.osmocom.org/#/c/osmo-bsc/+/11290/ But I guess the difference is, that there we are directly freeing up the memory and not returning something allocated to a NULL ctx. > After the comment to the other patch, we might as well drop this entire patch..? Yes, abandoning it now. -- To view, visit https://gerrit.osmocom.org/11294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I1e78ee4dc5c9bd10592c090b9a3b35baf61a6d69 Gerrit-Change-Number: 11294 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 10:51:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 12 Oct 2018 10:51:01 +0000 Subject: Change in osmo-dev[master]: find the terminal once and abort if missing In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11143 ) Change subject: find the terminal once and abort if missing ...................................................................... Patch Set 6: Code-Review+2 (2 comments) https://gerrit.osmocom.org/#/c/11143/6/net/tmpl_std/run.sh File net/tmpl_std/run.sh: https://gerrit.osmocom.org/#/c/11143/6/net/tmpl_std/run.sh at 37 PS6, Line 37: find_term() { (I'd have just put it on the root level scope, but fine if you think a function looks better...) https://gerrit.osmocom.org/#/c/11143/6/net/tmpl_std/run.sh at 43 PS6, Line 43: [ -n "$terminal" ] && return I find the expanded 'if' clauses easier to read, especially for people not that familiar with shell scripting. Anyway. next time is fine. -- To view, visit https://gerrit.osmocom.org/11143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 Gerrit-Change-Number: 11143 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 12 Oct 2018 10:51:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 10:57:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 12 Oct 2018 10:57:20 +0000 Subject: Change in osmo-bsc[master]: vty 'show bts'/'show trx': display IPs and ports In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11290 ) Change subject: vty 'show bts'/'show trx': display IPs and ports ...................................................................... Patch Set 4: Code-Review+2 (3 comments) https://gerrit.osmocom.org/#/c/11290/4/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11290/4/src/osmo-bsc/bsc_vty.c at 293 PS4, Line 293: /*! Dump the IP addresses and ports of the input signal link's timeslot. (so far we have doxygen only in libosmocore...) (and I'm not actually aware of anyone reading that, instead of the code comments. But that's a different topic.) https://gerrit.osmocom.org/#/c/11290/4/src/osmo-bsc/bsc_vty.c at 301 PS4, Line 301: talloc_free(name); (reading this makes me want to write osmo_sock_get_name2()...) https://gerrit.osmocom.org/#/c/11290/4/src/osmo-bsc/bsc_vty.c at 1066 PS4, Line 1066: e1isl_dump_vty_tcp(vty, trx->rsl_link); (IMHO better to have the VTY_NEWLINE down here. Well, not that important here, just as a general pattern when writing strings.) plus, I notice it follows the general pattern of the existing e1isl_dump_vty() code. So nm. -- To view, visit https://gerrit.osmocom.org/11290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f Gerrit-Change-Number: 11290 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 12 Oct 2018 10:57:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 11:06:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 12 Oct 2018 11:06:49 +0000 Subject: Change in osmo-dev[master]: support osmo-sip-connector with kamailio In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11144 ) Change subject: support osmo-sip-connector with kamailio ...................................................................... Patch Set 6: Code-Review+1 (2 comments) good except for the root fs / sudo things https://gerrit.osmocom.org/#/c/11144/6/net/tmpl_std/run.sh File net/tmpl_std/run.sh: https://gerrit.osmocom.org/#/c/11144/6/net/tmpl_std/run.sh at 79 PS6, Line 79: kamailio="$(sudo which kamailio)" oof, ok ... maybe instead we should include /sbin or something in the $PATH? $(PATH="$PATH:/usr/sbin;/sbin" which kamailio) https://gerrit.osmocom.org/#/c/11144/6/net/tmpl_std/run.sh at 88 PS6, Line 88: sudo mkdir -p /var/run/kamailio can we instead keep the kamailio run dir as a local subdir? Is it not configurable in kamailio.cfg? Above sudo is intended only for configuring the network, all the remaining stuff should be userland and shouldn't modify the current root system. Hmm, I think we should even remove sudo from the tcpdumps, possibly skip tcpdump if the user has no setuid on dumpcap; and maybe even separate all network config sudo stuff to a separate script... (what was I thinking!) -- To view, visit https://gerrit.osmocom.org/11144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 Gerrit-Change-Number: 11144 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: daniel Gerrit-Comment-Date: Fri, 12 Oct 2018 11:06:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 11:40:35 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 12 Oct 2018 11:40:35 +0000 Subject: Change in osmo-dev[master]: support osmo-sip-connector with kamailio In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11144 to look at the new patch set (#7). Change subject: support osmo-sip-connector with kamailio ...................................................................... support osmo-sip-connector with kamailio Kamailio is a SIP server, that is relatively easy to configure, in contrary to asterisk it only has one config file. The config file here is based on the example config provided in the wiki: To enable the osmo-sip-connector, build it, install kamailio and then set SIPCON_ENABLE=true in your copy of config_2g_3g. Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 --- M net/config_2g3g A net/tmpl_std/kamailio.cfg A net/tmpl_std/osmo-sip-connector.cfg M net/tmpl_std/run.sh 4 files changed, 462 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/44/11144/7 -- To view, visit https://gerrit.osmocom.org/11144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 Gerrit-Change-Number: 11144 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 11:46:55 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 12 Oct 2018 11:46:55 +0000 Subject: Change in osmo-dev[master]: support osmo-sip-connector with kamailio In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11144 ) Change subject: support osmo-sip-connector with kamailio ...................................................................... Patch Set 6: (2 comments) https://gerrit.osmocom.org/#/c/11144/6/net/tmpl_std/run.sh File net/tmpl_std/run.sh: https://gerrit.osmocom.org/#/c/11144/6/net/tmpl_std/run.sh at 79 PS6, Line 79: kamailio="$(sudo which kamailio)" > oof, ok ... maybe instead we should include /sbin or something in the $PATH? [?] Done https://gerrit.osmocom.org/#/c/11144/6/net/tmpl_std/run.sh at 88 PS6, Line 88: sudo mkdir -p /var/run/kamailio > can we instead keep the kamailio run dir as a local subdir? Is it not configurable in kamailio.cfg? [?] Turns out, it is configurable as "rundir" in the config. I've set it to "/tmp/kamailio_rundir" now, and kamailio creates that folder and is happy with it. It would of course be better to not use /tmp for this either (or to have random names and clean it up properly). But then again we would need to change that for the socket path too, so I think it is good enough for now. Maybe at a later point we could add a well defined temporary directory to the script, which can be used with a variable in the configs. Your thoughts on sudo sound good to me. -- To view, visit https://gerrit.osmocom.org/11144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 Gerrit-Change-Number: 11144 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: daniel Gerrit-Comment-Date: Fri, 12 Oct 2018 11:46:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 12:13:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 12 Oct 2018 12:13:51 +0000 Subject: Change in openbsc[master]: mgcp: Avoid initing output without enabling osmux Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11326 Change subject: mgcp: Avoid initing output without enabling osmux ...................................................................... mgcp: Avoid initing output without enabling osmux Otherwise we end up in a weird state where we have timers set up but osmux is still flagged as not enabled. Change-Id: I15c3a1a6bdf2566b03d1d543d8d15e4117a53622 --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/26/11326/1 diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index 69f1c66..0a4441c 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -447,10 +447,6 @@ return -1; } - osmux_xfrm_output_init(&endp->osmux.out, - (endp->osmux.cid * rtp_ssrc_winlen) + - (random() % rtp_ssrc_winlen)); - endp->osmux.in = osmux_handle_lookup(endp->cfg, addr, port); if (!endp->osmux.in) { LOGP(DMGCP, LOGL_ERROR, "Cannot allocate input osmux handle\n"); @@ -463,6 +459,10 @@ return -1; } + osmux_xfrm_output_init(&endp->osmux.out, + (endp->osmux.cid * rtp_ssrc_winlen) + + (random() % rtp_ssrc_winlen)); + switch (endp->cfg->role) { case MGCP_BSC_NAT: endp->type = MGCP_OSMUX_BSC_NAT; -- To view, visit https://gerrit.osmocom.org/11326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I15c3a1a6bdf2566b03d1d543d8d15e4117a53622 Gerrit-Change-Number: 11326 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 12:13:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 12 Oct 2018 12:13:51 +0000 Subject: Change in openbsc[master]: mgcp: Log endpoint nr consistently as hex Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11327 Change subject: mgcp: Log endpoint nr consistently as hex ...................................................................... mgcp: Log endpoint nr consistently as hex Change-Id: I281964935312161d1da49e8035c5bf3bb7bf9c5c --- M openbsc/src/libmgcp/mgcp_network.c M openbsc/src/libmgcp/mgcp_osmux.c M openbsc/tests/mgcp/mgcp_test.c 3 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/27/11327/1 diff --git a/openbsc/src/libmgcp/mgcp_network.c b/openbsc/src/libmgcp/mgcp_network.c index 799d998..49500d9 100644 --- a/openbsc/src/libmgcp/mgcp_network.c +++ b/openbsc/src/libmgcp/mgcp_network.c @@ -763,7 +763,7 @@ break; } - LOGP(DMGCP, LOGL_ERROR, "Bad MGCP type %u on endpoint %u\n", + LOGP(DMGCP, LOGL_ERROR, "Bad MGCP type %u on endpoint 0x%x\n", endp->type, ENDPOINT_NUMBER(endp)); return 0; } @@ -856,7 +856,7 @@ break; /* Should not happen */ } - LOGP(DMGCP, LOGL_ERROR, "Bad MGCP type %u on endpoint %u\n", + LOGP(DMGCP, LOGL_ERROR, "Bad MGCP type %u on endpoint 0x%x\n", endp->type, ENDPOINT_NUMBER(endp)); return 0; } diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index 0a4441c..71e8eae 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -340,12 +340,12 @@ if (osmux_enable_endpoint(endp, &addr->sin_addr, addr->sin_port) < 0 ) { LOGP(DMGCP, LOGL_ERROR, - "Could not enable osmux in endpoint %d\n", + "Could not enable osmux in endpoint 0x%x\n", ENDPOINT_NUMBER(endp)); goto out; } - LOGP(DMGCP, LOGL_INFO, "Enabling osmux in endpoint %d for %s:%u\n", + LOGP(DMGCP, LOGL_INFO, "Enabling osmux in endpoint 0x%x for %s:%u\n", ENDPOINT_NUMBER(endp), inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); out: @@ -442,7 +442,7 @@ static const uint32_t rtp_ssrc_winlen = UINT32_MAX / (OSMUX_CID_MAX + 1); if (endp->osmux.state == OSMUX_STATE_DISABLED) { - LOGP(DMGCP, LOGL_ERROR, "Endpoint %u didn't request Osmux\n", + LOGP(DMGCP, LOGL_ERROR, "Endpoint 0x%x didn't request Osmux\n", ENDPOINT_NUMBER(endp)); return -1; } @@ -482,7 +482,7 @@ void osmux_disable_endpoint(struct mgcp_endpoint *endp) { - LOGP(DMGCP, LOGL_INFO, "Releasing endpoint %u using Osmux CID %u\n", + LOGP(DMGCP, LOGL_INFO, "Releasing endpoint 0x%x using Osmux CID %u\n", ENDPOINT_NUMBER(endp), endp->osmux.cid); /* We are closing, we don't need pending RTP packets to be transmitted */ @@ -528,7 +528,7 @@ if (osmux_enable_endpoint(endp, &endp->net_end.addr, htons(endp->cfg->osmux_port)) < 0) { LOGP(DMGCP, LOGL_ERROR, - "Could not activate osmux in endpoint %d\n", + "Could not activate osmux in endpoint 0x%x\n", ENDPOINT_NUMBER(endp)); } LOGP(DMGCP, LOGL_ERROR, diff --git a/openbsc/tests/mgcp/mgcp_test.c b/openbsc/tests/mgcp/mgcp_test.c index 92099db..e7a582a 100644 --- a/openbsc/tests/mgcp/mgcp_test.c +++ b/openbsc/tests/mgcp/mgcp_test.c @@ -436,7 +436,7 @@ static int mgcp_test_policy_cb(struct mgcp_trunk_config *cfg, int endpoint, int state, const char *transactio_id) { - fprintf(stderr, "Policy CB got state %d on endpoint %d\n", + fprintf(stderr, "Policy CB got state %d on endpoint 0x%x\n", state, endpoint); last_endpoint = endpoint; return MGCP_POLICY_CONT; @@ -603,7 +603,7 @@ OSMO_ASSERT(last_endpoint != -1); endp = &cfg->trunk.endpoints[last_endpoint]; - fprintf(stderr, "endpoint %d: " + fprintf(stderr, "endpoint 0x%x: " "payload type BTS %d (exp %d), NET %d (exp %d)\n", last_endpoint, endp->bts_end.codec.payload_type, t->exp_bts_ptype, -- To view, visit https://gerrit.osmocom.org/11327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I281964935312161d1da49e8035c5bf3bb7bf9c5c Gerrit-Change-Number: 11327 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 12:13:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 12 Oct 2018 12:13:52 +0000 Subject: Change in openbsc[master]: nat: Log endpoint nr consistently as hex Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11328 Change subject: nat: Log endpoint nr consistently as hex ...................................................................... nat: Log endpoint nr consistently as hex Change-Id: I581f40da47614223219800e97a334f8b5e06b13f --- M openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/28/11328/1 diff --git a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c index 986306c..06799bb 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c +++ b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c @@ -211,7 +211,7 @@ llist_for_each_entry(mcon, &con->bsc->nat->sccp_connections, list_entry) { if (mcon->msc_endp == endp) { LOGP(DNAT, LOGL_ERROR, - "Endpoint %d was assigned to 0x%x and now 0x%x\n", + "Endpoint 0x%x was assigned to 0x%x and now 0x%x\n", endp, sccp_src_ref_to_int(&mcon->patched_ref), sccp_src_ref_to_int(&con->patched_ref)); -- To view, visit https://gerrit.osmocom.org/11328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I581f40da47614223219800e97a334f8b5e06b13f Gerrit-Change-Number: 11328 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 13:16:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 13:16:39 +0000 Subject: Change in simtrace2[master]: libusb_util.c: Avoid gcc warning about strncpy() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11329 Change subject: libusb_util.c: Avoid gcc warning about strncpy() ...................................................................... libusb_util.c: Avoid gcc warning about strncpy() What we're doing is actually legal: We copy the full size of the destination array, and then overwrite the last byte with NUL. However, gcc isn't smart enough to see that: libusb_util.c:162:5: warning: ?strncpy? specified bound 20 equals destination size [-Wstringop-truncation] strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Let's copy one byte less to make it happy. Change-Id: I30ddacdc73e5245c7c38b92d1e94e39b13fae7d3 --- M host/libusb_util.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/29/11329/1 diff --git a/host/libusb_util.c b/host/libusb_util.c index cb435e2..45e3f50 100644 --- a/host/libusb_util.c +++ b/host/libusb_util.c @@ -159,7 +159,7 @@ out[out_idx].vendor = dev_desc.idVendor; out[out_idx].product = dev_desc.idProduct; out[out_idx].addr = addr; - strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)); + strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)-1); out[out_idx].path[sizeof(out[out_idx].path)-1] = '\0'; out[out_idx].configuration = conf_desc->bConfigurationValue; out[out_idx].interface = if_desc->bInterfaceNumber; -- To view, visit https://gerrit.osmocom.org/11329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I30ddacdc73e5245c7c38b92d1e94e39b13fae7d3 Gerrit-Change-Number: 11329 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 14:12:56 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 12 Oct 2018 14:12:56 +0000 Subject: Change in osmo-pcu[master]: fix width of mobile identity length in paging request [WIP] Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11330 Change subject: fix width of mobile identity length in paging request [WIP] ...................................................................... fix width of mobile identity length in paging request [WIP] Do not merge! This change is probably wrong. Only a WIP PCU test of mine relies on this. Change-Id: If5f6e79ada1df6d30d4f10bf6c93284ad1bf10ea --- M src/encoding.cpp 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/30/11330/1 diff --git a/src/encoding.cpp b/src/encoding.cpp index 1f96458..50ba9ac 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -623,8 +623,7 @@ bitvec_write_field(dest, &wp,0x0,4); // Channel Needed // Mobile Identity - bitvec_write_field(dest, &wp,ptmsi_len+1,8); // Mobile Identity length - bitvec_write_field(dest, &wp,0xf,4); // unused + bitvec_write_field(dest, &wp,ptmsi_len+1,4); // Mobile Identity length bitvec_write_field(dest, &wp,0x4,4); // PTMSI type for (int i = 0; i < ptmsi_len; i++) { -- To view, visit https://gerrit.osmocom.org/11330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If5f6e79ada1df6d30d4f10bf6c93284ad1bf10ea Gerrit-Change-Number: 11330 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 14:37:48 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 12 Oct 2018 14:37:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: use tag for test dependency commit Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11331 Change subject: use tag for test dependency commit ...................................................................... use tag for test dependency commit Use the output of 'git describe' to pin the commit checked out for dependency titan.ProtocolModules.SGsAP_13.2.0_commit, i.e. the tag which points to 81544cf008378058b95ff20d33f3770fadb7e235. Using a plain commit hash will always re-trigger an update of the working tree in this particular case because 'git describe' won't ever return an error. Change-Id: Ia994b5c4488fd9b0d410b992e515c6eec4dd23b1 --- M deps/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/11331/1 diff --git a/deps/Makefile b/deps/Makefile index f2f38bd..a1ac595 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -78,7 +78,7 @@ titan.ProtocolModules.RTP_commit= R.5.A titan.ProtocolModules.ROSE_commit= R.1.C titan.ProtocolModules.SCTP_commit= R.2.A -titan.ProtocolModules.SGsAP_13.2.0_commit= 81544cf008378058b95ff20d33f3770fadb7e235 +titan.ProtocolModules.SGsAP_13.2.0_commit= R.1.B titan.ProtocolModules.SDP_commit= R.14.A titan.ProtocolModules.SMPP_commit= R.2.A-2-gb7aee69 titan.ProtocolModules.SNDCP_v7.0.0_commit= R.2.A -- To view, visit https://gerrit.osmocom.org/11331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia994b5c4488fd9b0d410b992e515c6eec4dd23b1 Gerrit-Change-Number: 11331 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 15:05:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 12 Oct 2018 15:05:49 +0000 Subject: Change in openbsc[master]: nat: Log state of pending transaction Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11332 Change subject: nat: Log state of pending transaction ...................................................................... nat: Log state of pending transaction Change-Id: I9f686404517bf8a2044cf59dd5bfaf90eb4f798f --- M openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/32/11332/1 diff --git a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c index 06799bb..9fc8ba3 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c +++ b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c @@ -521,8 +521,8 @@ mgcp_endp = &nat->mgcp_cfg->trunk.endpoints[endpoint]; if (bsc_endp->transaction_id) { - LOGP(DMGCP, LOGL_ERROR, "Endpoint 0x%x had pending transaction: '%s'\n", - endpoint, bsc_endp->transaction_id); + LOGP(DMGCP, LOGL_ERROR, "Endpoint 0x%x had pending transaction: '%s' state %d\n", + endpoint, bsc_endp->transaction_id, bsc_endp->transaction_state); talloc_free(bsc_endp->transaction_id); bsc_endp->transaction_id = NULL; bsc_endp->transaction_state = 0; -- To view, visit https://gerrit.osmocom.org/11332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9f686404517bf8a2044cf59dd5bfaf90eb4f798f Gerrit-Change-Number: 11332 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 15:27:15 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Fri, 12 Oct 2018 15:27:15 +0000 Subject: Change in simtrace2[master]: libusb_util.c: Avoid gcc warning about strncpy() In-Reply-To: References: Message-ID: K?vin Redon has posted comments on this change. ( https://gerrit.osmocom.org/11329 ) Change subject: libusb_util.c: Avoid gcc warning about strncpy() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I30ddacdc73e5245c7c38b92d1e94e39b13fae7d3 Gerrit-Change-Number: 11329 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Fri, 12 Oct 2018 15:27:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 15:29:14 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Fri, 12 Oct 2018 15:29:14 +0000 Subject: Change in simtrace2[master]: libusb_util.c: Avoid gcc warning about strncpy() In-Reply-To: References: Message-ID: K?vin Redon has posted comments on this change. ( https://gerrit.osmocom.org/11329 ) Change subject: libusb_util.c: Avoid gcc warning about strncpy() ...................................................................... Patch Set 1: string is also null terminated just afterwards (strncpy doesn't ensure it) -- To view, visit https://gerrit.osmocom.org/11329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I30ddacdc73e5245c7c38b92d1e94e39b13fae7d3 Gerrit-Change-Number: 11329 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Fri, 12 Oct 2018 15:29:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 15:29:21 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Fri, 12 Oct 2018 15:29:21 +0000 Subject: Change in simtrace2[master]: libusb_util.c: Avoid gcc warning about strncpy() In-Reply-To: References: Message-ID: K?vin Redon has submitted this change and it was merged. ( https://gerrit.osmocom.org/11329 ) Change subject: libusb_util.c: Avoid gcc warning about strncpy() ...................................................................... libusb_util.c: Avoid gcc warning about strncpy() What we're doing is actually legal: We copy the full size of the destination array, and then overwrite the last byte with NUL. However, gcc isn't smart enough to see that: libusb_util.c:162:5: warning: ?strncpy? specified bound 20 equals destination size [-Wstringop-truncation] strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Let's copy one byte less to make it happy. Change-Id: I30ddacdc73e5245c7c38b92d1e94e39b13fae7d3 --- M host/libusb_util.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified K?vin Redon: Looks good to me, approved diff --git a/host/libusb_util.c b/host/libusb_util.c index cb435e2..45e3f50 100644 --- a/host/libusb_util.c +++ b/host/libusb_util.c @@ -159,7 +159,7 @@ out[out_idx].vendor = dev_desc.idVendor; out[out_idx].product = dev_desc.idProduct; out[out_idx].addr = addr; - strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)); + strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)-1); out[out_idx].path[sizeof(out[out_idx].path)-1] = '\0'; out[out_idx].configuration = conf_desc->bConfigurationValue; out[out_idx].interface = if_desc->bInterfaceNumber; -- To view, visit https://gerrit.osmocom.org/11329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I30ddacdc73e5245c7c38b92d1e94e39b13fae7d3 Gerrit-Change-Number: 11329 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 15:44:41 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 12 Oct 2018 15:44:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fix build of bsc bsc-nat, hlr, and msc tests Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11333 Change subject: fix build of bsc bsc-nat, hlr, and msc tests ...................................................................... fix build of bsc bsc-nat, hlr, and msc tests For some reason I missed build failures which were caused by my recent MobileIdentityLV type name change. With this commit, I can compile bsc, bsc-nat, hlr, and msc tests again. Change-Id: I72c369ccd9df88970a69c6dfb5d5255d14fe6aa8 Fixes: 59c15d67cabbd95dcbbb50c968cbe600f4462f64 --- M bsc-nat/gen_links.sh M hlr/gen_links.sh M library/L3_Templates.ttcn M msc/gen_links.sh 4 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/11333/1 diff --git a/bsc-nat/gen_links.sh b/bsc-nat/gen_links.sh index 453d8ca..15fff9b 100755 --- a/bsc-nat/gen_links.sh +++ b/bsc-nat/gen_links.sh @@ -47,7 +47,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn BSSMAP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn BSSAP_CodecPort.ttcn" +FILES="General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn BSSMAP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn BSSAP_CodecPort.ttcn RLCMAC_CSN1_Types.ttcn" gen_links $DIR $FILES ignore_pp_results diff --git a/hlr/gen_links.sh b/hlr/gen_links.sh index f9e80c5..ed67881 100755 --- a/hlr/gen_links.sh +++ b/hlr/gen_links.sh @@ -40,6 +40,7 @@ FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " FILES+="SS_Templates.ttcn USSD_Helpers.ttcn " +FILES+="RLCMAC_CSN1_Types.ttcn" gen_links $DIR $FILES diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index a05aba2..e2657f0 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -18,6 +18,7 @@ import from MobileL3_CC_Types all; import from MobileL3_GMM_SM_Types all; import from MobileL3_SMS_Types all; +import from RLCMAC_CSN1_Types all; /* TS 24.007 Table 11.3 TI Flag */ const BIT1 c_TIF_ORIG := '0'B; @@ -283,7 +284,7 @@ } } -template PDU_ML3_NW_MS tr_PAGING_REQ1(template MobileIdentityLV mi1 := ?, +template PDU_ML3_NW_MS tr_PAGING_REQ1(template MobileIdentityLV_Paging mi1 := ?, template MobileIdentityTLV mi2 := *) := { discriminator := '0110'B, tiOrSkip := { diff --git a/msc/gen_links.sh b/msc/gen_links.sh index df646d9..c5a1222 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -95,6 +95,7 @@ FILES+="SMPP_CodecPort.ttcn SMPP_CodecPort_CtrlFunct.ttcn SMPP_CodecPort_CtrlFunctDef.cc SMPP_Emulation.ttcn SMPP_Templates.ttcn " FILES+="SS_Templates.ttcn SCCP_Templates.ttcn USSD_Helpers.ttcn " FILES+="SGsAP_Templates.ttcn " +FILES+="RLCMAC_CSN1_Types.ttcn" gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/11333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I72c369ccd9df88970a69c6dfb5d5255d14fe6aa8 Gerrit-Change-Number: 11333 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 18:21:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 12 Oct 2018 18:21:57 +0000 Subject: Change in openbsc[master]: mgcp: osmux_send_dummy: Avoid logging incorrectly and sending if osmu... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11334 Change subject: mgcp: osmux_send_dummy: Avoid logging incorrectly and sending if osmux not enabled ...................................................................... mgcp: osmux_send_dummy: Avoid logging incorrectly and sending if osmux not enabled Change-Id: I5244cb9304adef3aa612b8126bf95e77562c801c --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/34/11334/1 diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index 71e8eae..33f5721 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -530,12 +530,20 @@ LOGP(DMGCP, LOGL_ERROR, "Could not activate osmux in endpoint 0x%x\n", ENDPOINT_NUMBER(endp)); + return 0; } LOGP(DMGCP, LOGL_ERROR, "Osmux CID %u for %s:%u is now enabled\n", endp->osmux.cid, inet_ntoa(endp->net_end.addr), endp->cfg->osmux_port); } + if(endp->osmux.state != OSMUX_STATE_ENABLED) { + LOGP(DMGCP, LOGL_ERROR, + "OSMUX dummy to %s CID %u: Osmux not enabled on endpoint 0x%x state %d\n", + inet_ntoa(endp->net_end.addr), endp->osmux.cid, + ENDPOINT_NUMBER(endp), endp->osmux.state); + return 0; + } LOGP(DMGCP, LOGL_DEBUG, "sending OSMUX dummy load to %s CID %u\n", inet_ntoa(endp->net_end.addr), endp->osmux.cid); -- To view, visit https://gerrit.osmocom.org/11334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5244cb9304adef3aa612b8126bf95e77562c801c Gerrit-Change-Number: 11334 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 18:21:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 12 Oct 2018 18:21:58 +0000 Subject: Change in openbsc[master]: mgcp: osmux: Don't process regular osmux frames if disabled by cfg Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11335 Change subject: mgcp: osmux: Don't process regular osmux frames if disabled by cfg ...................................................................... mgcp: osmux: Don't process regular osmux frames if disabled by cfg Prior to this commit, the check was only done on legacy dummy frames. Change-Id: Ief4e62fe68a11a60d90292c72d1263fd1f728356 --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/35/11335/1 diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index 33f5721..7590f18 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -275,6 +275,12 @@ if (!msg) return -1; + if (!cfg->osmux) { + LOGP(DMGCP, LOGL_ERROR, + "bsc-nat wants to use Osmux but bsc did not request it\n"); + goto out; + } + /* not any further processing dummy messages */ if (msg->data[0] == MGCP_DUMMY_LOAD) goto out; @@ -319,12 +325,6 @@ LOGP(DMGCP, LOGL_DEBUG, "Received Osmux dummy load from %s\n", inet_ntoa(addr->sin_addr)); - if (!cfg->osmux) { - LOGP(DMGCP, LOGL_ERROR, - "bsc wants to use Osmux but bsc-nat did not request it\n"); - goto out; - } - /* extract the osmux CID from the dummy message */ memcpy(&osmux_cid, &msg->data[1], sizeof(osmux_cid)); @@ -365,6 +365,12 @@ if (!msg) return -1; + if (!cfg->osmux) { + LOGP(DMGCP, LOGL_ERROR, + "bsc wants to use Osmux but bsc-nat did not request it\n"); + goto out; + } + /* not any further processing dummy messages */ if (msg->data[0] == MGCP_DUMMY_LOAD) return osmux_handle_dummy(cfg, &addr, msg); -- To view, visit https://gerrit.osmocom.org/11335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ief4e62fe68a11a60d90292c72d1263fd1f728356 Gerrit-Change-Number: 11335 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 18:21:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 12 Oct 2018 18:21:58 +0000 Subject: Change in openbsc[master]: mgcp: osmux: Move parse_cid of legacy dummy frames to own function Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11336 Change subject: mgcp: osmux: Move parse_cid of legacy dummy frames to own function ...................................................................... mgcp: osmux: Move parse_cid of legacy dummy frames to own function Change-Id: If9249fb0ee2e33c7dd2ab817480776acaa784cc2 --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 15 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/36/11336/1 diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index 7590f18..ea0372b 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -261,6 +261,20 @@ return msg; } +static int osmux_legacy_dummy_parse_cid(struct sockaddr_in *addr, struct msgb *msg, + uint8_t *osmux_cid) +{ + if (msg->len < 1 + sizeof(osmux_cid)) { + LOGP(DMGCP, LOGL_ERROR, + "Discarding truncated Osmux dummy load\n"); + return -1; + } + + /* extract the osmux CID from the dummy message */ + memcpy(osmux_cid, &msg->data[1], sizeof(*osmux_cid)); + return 0; +} + #define osmux_chunk_length(msg, rem) (rem - msg->len); int osmux_read_from_bsc_nat_cb(struct osmo_fd *ofd, unsigned int what) @@ -316,17 +330,8 @@ struct mgcp_endpoint *endp; uint8_t osmux_cid; - if (msg->len < 1 + sizeof(osmux_cid)) { - LOGP(DMGCP, LOGL_ERROR, - "Discarding truncated Osmux dummy load\n"); + if (osmux_legacy_dummy_parse_cid(addr, msg, &osmux_cid) < 0) goto out; - } - - LOGP(DMGCP, LOGL_DEBUG, "Received Osmux dummy load from %s\n", - inet_ntoa(addr->sin_addr)); - - /* extract the osmux CID from the dummy message */ - memcpy(&osmux_cid, &msg->data[1], sizeof(osmux_cid)); endp = endpoint_lookup(cfg, osmux_cid, &addr->sin_addr, MGCP_DEST_BTS); if (!endp) { -- To view, visit https://gerrit.osmocom.org/11336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If9249fb0ee2e33c7dd2ab817480776acaa784cc2 Gerrit-Change-Number: 11336 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 18:21:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 12 Oct 2018 18:21:59 +0000 Subject: Change in openbsc[master]: mgcp: osmux: Make func handling dummy frames independent of endp type Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11337 Change subject: mgcp: osmux: Make func handling dummy frames independent of endp type ...................................................................... mgcp: osmux: Make func handling dummy frames independent of endp type Change-Id: I285f1cb693b243ecd404337f2bb5b74ddd32b123 --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/37/11337/1 diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index ea0372b..b46ea10 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -325,7 +325,7 @@ /* This is called from the bsc-nat */ static int osmux_handle_dummy(struct mgcp_config *cfg, struct sockaddr_in *addr, - struct msgb *msg) + struct msgb *msg, int endp_type) { struct mgcp_endpoint *endp; uint8_t osmux_cid; @@ -333,7 +333,7 @@ if (osmux_legacy_dummy_parse_cid(addr, msg, &osmux_cid) < 0) goto out; - endp = endpoint_lookup(cfg, osmux_cid, &addr->sin_addr, MGCP_DEST_BTS); + endp = endpoint_lookup(cfg, osmux_cid, &addr->sin_addr, endp_type); if (!endp) { LOGP(DMGCP, LOGL_ERROR, "Cannot find endpoint for Osmux CID %d\n", osmux_cid); @@ -378,7 +378,7 @@ /* not any further processing dummy messages */ if (msg->data[0] == MGCP_DUMMY_LOAD) - return osmux_handle_dummy(cfg, &addr, msg); + return osmux_handle_dummy(cfg, &addr, msg, MGCP_DEST_BTS); rem = msg->len; while((osmuxh = osmux_xfrm_output_pull(msg)) != NULL) { -- To view, visit https://gerrit.osmocom.org/11337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I285f1cb693b243ecd404337f2bb5b74ddd32b123 Gerrit-Change-Number: 11337 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 18:21:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 12 Oct 2018 18:21:59 +0000 Subject: Change in openbsc[master]: mgcp: osmux: allow enabling osmux only on correct activating state Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11338 Change subject: mgcp: osmux: allow enabling osmux only on correct activating state ...................................................................... mgcp: osmux: allow enabling osmux only on correct activating state State ACTIVATING is set once negotiation between the 2 parts went successfuly. Change-Id: I21eb30fa8d48f3d592ff197bd74e673fdac51c1d --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/38/11338/1 diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index b46ea10..6be5eb2 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -452,9 +452,9 @@ */ static const uint32_t rtp_ssrc_winlen = UINT32_MAX / (OSMUX_CID_MAX + 1); - if (endp->osmux.state == OSMUX_STATE_DISABLED) { - LOGP(DMGCP, LOGL_ERROR, "Endpoint 0x%x didn't request Osmux\n", - ENDPOINT_NUMBER(endp)); + if (endp->osmux.state != OSMUX_STATE_ACTIVATING) { + LOGP(DMGCP, LOGL_ERROR, "Endpoint 0x%x didn't negotiate Osmux, state %d\n", + ENDPOINT_NUMBER(endp), endp->osmux.state); return -1; } -- To view, visit https://gerrit.osmocom.org/11338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I21eb30fa8d48f3d592ff197bd74e673fdac51c1d Gerrit-Change-Number: 11338 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 18:21:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 12 Oct 2018 18:21:59 +0000 Subject: Change in openbsc[master]: mgcp: osmux: Improve checks around activating and using enabled osmux Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11339 Change subject: mgcp: osmux: Improve checks around activating and using enabled osmux ...................................................................... mgcp: osmux: Improve checks around activating and using enabled osmux * Refactor code to have unified checks on all paths activating Osmux. * Improve checkings at activation time and add logging. * Code now enforces endp osmux status to be enabled before processing the frame through endp->osmux.out. Before, a delayed or bad pkt could arrive and be processed by an endp with osmux not enabled, using endp->osmux.out that was not initialized. Related: SYS#4350 Change-Id: I3536169c94e65f999aaa9c9e43cc7dab8551d30f --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 43 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/39/11339/1 diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index 6be5eb2..a0ac295 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -261,6 +261,34 @@ return msg; } +/* Updates endp osmux state and returns 0 if it can process messages, -1 otherwise */ +static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) +{ + switch(endp->osmux.state) { + case OSMUX_STATE_ACTIVATING: + if (osmux_enable_endpoint(endp, &addr->sin_addr, addr->sin_port) < 0 ) { + LOGP(DMGCP, LOGL_ERROR, + "Could not enable osmux in endpoint 0x%x for %s:%u\n", + ENDPOINT_NUMBER(endp), inet_ntoa(addr->sin_addr), + ntohs(addr->sin_port)); + return -1; + } + LOGP(DMGCP, LOGL_INFO, "Enabling osmux in endpoint 0x%x for %s:%u\n", + ENDPOINT_NUMBER(endp), inet_ntoa(addr->sin_addr), + ntohs(addr->sin_port)); + return 0; + case OSMUX_STATE_ENABLED: + return 0; + default: + LOGP(DMGCP, LOGL_ERROR, + "Osmux %s in endpoint 0x%x for %s:%u without full negotiation, state %d\n", + sending ? "sent" : "received", + ENDPOINT_NUMBER(endp), inet_ntoa(addr->sin_addr), + ntohs(addr->sin_port), endp->osmux.state); + return -1; + } +} + static int osmux_legacy_dummy_parse_cid(struct sockaddr_in *addr, struct msgb *msg, uint8_t *osmux_cid) { @@ -312,11 +340,12 @@ osmuxh->circuit_id); goto out; } - endp->osmux.stats.octets += osmux_chunk_length(msg, rem); - endp->osmux.stats.chunks++; + if (endp_osmux_state_check(endp, &addr, false) == 0) { + endp->osmux.stats.octets += osmux_chunk_length(msg, rem); + endp->osmux.stats.chunks++; + osmux_xfrm_output_sched(&endp->osmux.out, osmuxh); + } rem = msg->len; - - osmux_xfrm_output_sched(&endp->osmux.out, osmuxh); } out: msgb_free(msg); @@ -339,20 +368,8 @@ "Cannot find endpoint for Osmux CID %d\n", osmux_cid); goto out; } - - if (endp->osmux.state == OSMUX_STATE_ENABLED) - goto out; - - if (osmux_enable_endpoint(endp, &addr->sin_addr, addr->sin_port) < 0 ) { - LOGP(DMGCP, LOGL_ERROR, - "Could not enable osmux in endpoint 0x%x\n", - ENDPOINT_NUMBER(endp)); - goto out; - } - - LOGP(DMGCP, LOGL_INFO, "Enabling osmux in endpoint 0x%x for %s:%u\n", - ENDPOINT_NUMBER(endp), inet_ntoa(addr->sin_addr), - ntohs(addr->sin_port)); + endp_osmux_state_check(endp, addr, false); + /* Only needed to punch hole in firewall, it can be dropped */ out: msgb_free(msg); return 0; @@ -393,11 +410,12 @@ osmuxh->circuit_id); goto out; } - endp->osmux.stats.octets += osmux_chunk_length(msg, rem); - endp->osmux.stats.chunks++; + if (endp_osmux_state_check(endp, &addr, false) == 0) { + endp->osmux.stats.octets += osmux_chunk_length(msg, rem); + endp->osmux.stats.chunks++; + osmux_xfrm_output_sched(&endp->osmux.out, osmuxh); + } rem = msg->len; - - osmux_xfrm_output_sched(&endp->osmux.out, osmuxh); } out: msgb_free(msg); @@ -535,26 +553,9 @@ if (memcmp(&endp->net_end.addr, &addr_unset, sizeof(addr_unset)) == 0) return 0; - if (endp->osmux.state == OSMUX_STATE_ACTIVATING) { - if (osmux_enable_endpoint(endp, &endp->net_end.addr, - htons(endp->cfg->osmux_port)) < 0) { - LOGP(DMGCP, LOGL_ERROR, - "Could not activate osmux in endpoint 0x%x\n", - ENDPOINT_NUMBER(endp)); - return 0; - } - LOGP(DMGCP, LOGL_ERROR, - "Osmux CID %u for %s:%u is now enabled\n", - endp->osmux.cid, inet_ntoa(endp->net_end.addr), - endp->cfg->osmux_port); - } - if(endp->osmux.state != OSMUX_STATE_ENABLED) { - LOGP(DMGCP, LOGL_ERROR, - "OSMUX dummy to %s CID %u: Osmux not enabled on endpoint 0x%x state %d\n", - inet_ntoa(endp->net_end.addr), endp->osmux.cid, - ENDPOINT_NUMBER(endp), endp->osmux.state); - return 0; - } + if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) + return; + LOGP(DMGCP, LOGL_DEBUG, "sending OSMUX dummy load to %s CID %u\n", inet_ntoa(endp->net_end.addr), endp->osmux.cid); -- To view, visit https://gerrit.osmocom.org/11339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3536169c94e65f999aaa9c9e43cc7dab8551d30f Gerrit-Change-Number: 11339 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 18:55:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 12 Oct 2018 18:55:19 +0000 Subject: Change in openbsc[master]: mgcp: osmux: Improve checks around activating and using enabled osmux In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11339 to look at the new patch set (#2). Change subject: mgcp: osmux: Improve checks around activating and using enabled osmux ...................................................................... mgcp: osmux: Improve checks around activating and using enabled osmux * Refactor code to have unified checks on all paths activating Osmux. * Improve checkings at activation time and add logging. * Code now enforces endp osmux status to be enabled before processing the frame through endp->osmux.out. Before, a delayed or bad pkt could arrive and be processed by an endp with osmux not enabled, using endp->osmux.out that was not initialized and ended up crashing: libosmo-netif/src/osmux.c:281:3: runtime error: member access within null pointer of type 'struct msgb' This could also happen if a BSC started sending or we received (non legacy dummy) osmux frames before we received the BSC CRCX ACK agreeing on osmux negotiation and switching to ACTIVATING state. Related: SYS#4350 Change-Id: I3536169c94e65f999aaa9c9e43cc7dab8551d30f --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 43 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/39/11339/2 -- To view, visit https://gerrit.osmocom.org/11339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3536169c94e65f999aaa9c9e43cc7dab8551d30f Gerrit-Change-Number: 11339 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 19:16:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 12 Oct 2018 19:16:30 +0000 Subject: Change in openbsc[master]: osmux.h: Document enum osmux_state Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11340 Change subject: osmux.h: Document enum osmux_state ...................................................................... osmux.h: Document enum osmux_state Change-Id: If5de6e981e9af7b667dd3365d758f868f38bf6e0 --- M openbsc/include/openbsc/osmux.h 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/40/11340/1 diff --git a/openbsc/include/openbsc/osmux.h b/openbsc/include/openbsc/osmux.h index f3ea72a..6386125 100644 --- a/openbsc/include/openbsc/osmux.h +++ b/openbsc/include/openbsc/osmux.h @@ -26,10 +26,10 @@ int osmux_used_cid(void); enum osmux_state { - OSMUX_STATE_DISABLED = 0, - OSMUX_STATE_NEGOTIATING, - OSMUX_STATE_ACTIVATING, - OSMUX_STATE_ENABLED, + OSMUX_STATE_DISABLED = 0, /* Osmux not being currently used by endp */ + OSMUX_STATE_NEGOTIATING, /* Osmux was locally requested in MGCP CRCX */ + OSMUX_STATE_ACTIVATING, /* Osmux was accepted in MGCP CRCX ACK. It can now be enabled by \ref osmux_enable_endpoint. */ + OSMUX_STATE_ENABLED, /* Osmux was initialized by \ref osmux_enable_endpoint and can process frames */ }; enum osmux_usage { -- To view, visit https://gerrit.osmocom.org/11340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If5de6e981e9af7b667dd3365d758f868f38bf6e0 Gerrit-Change-Number: 11340 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 19:46:33 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 12 Oct 2018 19:46:33 +0000 Subject: Change in osmo-hlr[master]: hlr_ussd.c: fix: reject 'structured' SS requests Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11341 Change subject: hlr_ussd.c: fix: reject 'structured' SS requests ...................................................................... hlr_ussd.c: fix: reject 'structured' SS requests As we don't store any SS related information (e.g. call forwarding preferences) in the database, we don't handle 'structured' SS requests at all. Let's reject them by sending error message with FACILITY_NOT_SUPPORTED code. Change-Id: Ia1317c5d372a42473cce65c0c985103e43be77fd Related: OS#3651 --- M src/hlr_ussd.c 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/41/11341/1 diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c index c96f47c..ba373f3 100644 --- a/src/hlr_ussd.c +++ b/src/hlr_ussd.c @@ -399,8 +399,15 @@ LOGPSS(ss, LOGL_INFO, "SS CompType=%s, OpCode=%s\n", gsm0480_comp_type_name(comp_type), gsm0480_op_code_name(req->opcode)); - /* FIXME */ - return 0; + + /** + * FIXME: As we don't store any SS related information + * (e.g. call forwarding preferences) in the database, + * we don't handle "structured" SS requests at all. + */ + LOGPSS(ss, LOGL_NOTICE, "Structured SS requests are not supported, rejecting...\n"); + ss_tx_error(ss, req->invoke_id, GSM0480_ERR_CODE_FACILITY_NOT_SUPPORTED); + return -ENOTSUP; } /* Handle a USSD GSUP message for a given SS Session received from VLR or EUSE */ -- To view, visit https://gerrit.osmocom.org/11341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia1317c5d372a42473cce65c0c985103e43be77fd Gerrit-Change-Number: 11341 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Oct 12 19:50:41 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 12 Oct 2018 19:50:41 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5bc0fb2e56c78_2d455067c126626@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 46s] [203/245] installing libpython-stdlib-2.7.11-1 [ 46s] [204/245] installing libtimedate-perl-2.3000-2 [ 46s] Processing triggers for man-db (2.7.5-1) ... [ 46s] [205/245] installing intltool-debian-0.35.0+20060710.4 [ 46s] [206/245] installing libdpkg-perl-1.18.4ubuntu1 [ 46s] Processing triggers for man-db (2.7.5-1) ... [ 46s] [207/245] installing autoconf-2.69-9 [ 47s] Processing triggers for man-db (2.7.5-1) ... [ 47s] [208/245] installing hostname-3.16ubuntu2 [ 47s] Processing triggers for man-db (2.7.5-1) ... [ 47s] [209/245] installing python2.7-2.7.11-7ubuntu1 [ 48s] Segmentation fault (core dumped) [ 48s] dpkg: error processing package python2.7 (--install): [ 48s] subprocess installed post-installation script returned error exit status 139 [ 48s] Processing triggers for mime-support (3.59ubuntu1) ... [ 48s] Processing triggers for man-db (2.7.5-1) ... [ 48s] Errors were encountered while processing: [ 48s] python2.7 [ 48s] exit ... [ 48s] [ 48s] sheep81 failed "build libosmocore_0.12.0.81.4290.dsc" at Fri Oct 12 19:50:34 UTC 2018. [ 48s] [ 48s] ### VM INTERACTION START ### [ 51s] [ 43.698665] sysrq: SysRq : Power Off [ 51s] [ 43.707504] reboot: Power down [ 51s] ### VM INTERACTION END ### [ 51s] [ 51s] sheep81 failed "build libosmocore_0.12.0.81.4290.dsc" at Fri Oct 12 19:50:37 UTC 2018. [ 51s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Oct 12 20:01:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 20:01:47 +0000 Subject: Change in osmo-hlr[master]: hlr_ussd.c: fix: reject 'structured' SS requests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11341 ) Change subject: hlr_ussd.c: fix: reject 'structured' SS requests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia1317c5d372a42473cce65c0c985103e43be77fd Gerrit-Change-Number: 11341 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 20:01:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 20:01:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 20:01:52 +0000 Subject: Change in osmo-hlr[master]: hlr_ussd.c: fix: reject 'structured' SS requests In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11341 ) Change subject: hlr_ussd.c: fix: reject 'structured' SS requests ...................................................................... hlr_ussd.c: fix: reject 'structured' SS requests As we don't store any SS related information (e.g. call forwarding preferences) in the database, we don't handle 'structured' SS requests at all. Let's reject them by sending error message with FACILITY_NOT_SUPPORTED code. Change-Id: Ia1317c5d372a42473cce65c0c985103e43be77fd Related: OS#3651 --- M src/hlr_ussd.c 1 file changed, 9 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c index c96f47c..ba373f3 100644 --- a/src/hlr_ussd.c +++ b/src/hlr_ussd.c @@ -399,8 +399,15 @@ LOGPSS(ss, LOGL_INFO, "SS CompType=%s, OpCode=%s\n", gsm0480_comp_type_name(comp_type), gsm0480_op_code_name(req->opcode)); - /* FIXME */ - return 0; + + /** + * FIXME: As we don't store any SS related information + * (e.g. call forwarding preferences) in the database, + * we don't handle "structured" SS requests at all. + */ + LOGPSS(ss, LOGL_NOTICE, "Structured SS requests are not supported, rejecting...\n"); + ss_tx_error(ss, req->invoke_id, GSM0480_ERR_CODE_FACILITY_NOT_SUPPORTED); + return -ENOTSUP; } /* Handle a USSD GSUP message for a given SS Session received from VLR or EUSE */ -- To view, visit https://gerrit.osmocom.org/11341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia1317c5d372a42473cce65c0c985103e43be77fd Gerrit-Change-Number: 11341 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 20:02:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 20:02:07 +0000 Subject: Change in osmo-hlr[master]: hlr_ussd.c: fix: reject 'structured' SS requests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11341 ) Change subject: hlr_ussd.c: fix: reject 'structured' SS requests ...................................................................... Patch Set 1: would be great to have a related test case in the test suite. Thanks! -- To view, visit https://gerrit.osmocom.org/11341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia1317c5d372a42473cce65c0c985103e43be77fd Gerrit-Change-Number: 11341 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 20:02:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 20:02:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 20:02:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fix build of bsc bsc-nat, hlr, and msc tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11333 ) Change subject: fix build of bsc bsc-nat, hlr, and msc tests ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I72c369ccd9df88970a69c6dfb5d5255d14fe6aa8 Gerrit-Change-Number: 11333 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 20:02:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 20:03:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 20:03:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: use tag for test dependency commit In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11331 ) Change subject: use tag for test dependency commit ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia994b5c4488fd9b0d410b992e515c6eec4dd23b1 Gerrit-Change-Number: 11331 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 20:03:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 20:03:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 20:03:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: use tag for test dependency commit In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11331 ) Change subject: use tag for test dependency commit ...................................................................... use tag for test dependency commit Use the output of 'git describe' to pin the commit checked out for dependency titan.ProtocolModules.SGsAP_13.2.0_commit, i.e. the tag which points to 81544cf008378058b95ff20d33f3770fadb7e235. Using a plain commit hash will always re-trigger an update of the working tree in this particular case because 'git describe' won't ever return an error. Change-Id: Ia994b5c4488fd9b0d410b992e515c6eec4dd23b1 --- M deps/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/deps/Makefile b/deps/Makefile index f2f38bd..a1ac595 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -78,7 +78,7 @@ titan.ProtocolModules.RTP_commit= R.5.A titan.ProtocolModules.ROSE_commit= R.1.C titan.ProtocolModules.SCTP_commit= R.2.A -titan.ProtocolModules.SGsAP_13.2.0_commit= 81544cf008378058b95ff20d33f3770fadb7e235 +titan.ProtocolModules.SGsAP_13.2.0_commit= R.1.B titan.ProtocolModules.SDP_commit= R.14.A titan.ProtocolModules.SMPP_commit= R.2.A-2-gb7aee69 titan.ProtocolModules.SNDCP_v7.0.0_commit= R.2.A -- To view, visit https://gerrit.osmocom.org/11331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia994b5c4488fd9b0d410b992e515c6eec4dd23b1 Gerrit-Change-Number: 11331 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 20:04:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 20:04:08 +0000 Subject: Change in openbsc[master]: mgcp: Avoid initing output without enabling osmux In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11326 ) Change subject: mgcp: Avoid initing output without enabling osmux ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I15c3a1a6bdf2566b03d1d543d8d15e4117a53622 Gerrit-Change-Number: 11326 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 20:04:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 20:04:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 20:04:17 +0000 Subject: Change in openbsc[master]: mgcp: Log endpoint nr consistently as hex In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11327 ) Change subject: mgcp: Log endpoint nr consistently as hex ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I281964935312161d1da49e8035c5bf3bb7bf9c5c Gerrit-Change-Number: 11327 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 20:04:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 20:04:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 20:04:24 +0000 Subject: Change in openbsc[master]: nat: Log endpoint nr consistently as hex In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11328 ) Change subject: nat: Log endpoint nr consistently as hex ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I581f40da47614223219800e97a334f8b5e06b13f Gerrit-Change-Number: 11328 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 20:04:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 20:04:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 20:04:33 +0000 Subject: Change in openbsc[master]: nat: Log state of pending transaction In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11332 ) Change subject: nat: Log state of pending transaction ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f686404517bf8a2044cf59dd5bfaf90eb4f798f Gerrit-Change-Number: 11332 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 20:04:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 20:04:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 20:04:59 +0000 Subject: Change in openbsc[master]: mgcp: osmux: Don't process regular osmux frames if disabled by cfg In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11335 ) Change subject: mgcp: osmux: Don't process regular osmux frames if disabled by cfg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ief4e62fe68a11a60d90292c72d1263fd1f728356 Gerrit-Change-Number: 11335 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 20:04:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 20:05:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 20:05:11 +0000 Subject: Change in openbsc[master]: mgcp: osmux: Move parse_cid of legacy dummy frames to own function In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11336 ) Change subject: mgcp: osmux: Move parse_cid of legacy dummy frames to own function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If9249fb0ee2e33c7dd2ab817480776acaa784cc2 Gerrit-Change-Number: 11336 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 20:05:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 20:05:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 20:05:21 +0000 Subject: Change in openbsc[master]: mgcp: osmux: Make func handling dummy frames independent of endp type In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11337 ) Change subject: mgcp: osmux: Make func handling dummy frames independent of endp type ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I285f1cb693b243ecd404337f2bb5b74ddd32b123 Gerrit-Change-Number: 11337 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 20:05:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 20:05:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 20:05:28 +0000 Subject: Change in openbsc[master]: mgcp: Avoid initing output without enabling osmux In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11326 ) Change subject: mgcp: Avoid initing output without enabling osmux ...................................................................... mgcp: Avoid initing output without enabling osmux Otherwise we end up in a weird state where we have timers set up but osmux is still flagged as not enabled. Change-Id: I15c3a1a6bdf2566b03d1d543d8d15e4117a53622 --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index 69f1c66..0a4441c 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -447,10 +447,6 @@ return -1; } - osmux_xfrm_output_init(&endp->osmux.out, - (endp->osmux.cid * rtp_ssrc_winlen) + - (random() % rtp_ssrc_winlen)); - endp->osmux.in = osmux_handle_lookup(endp->cfg, addr, port); if (!endp->osmux.in) { LOGP(DMGCP, LOGL_ERROR, "Cannot allocate input osmux handle\n"); @@ -463,6 +459,10 @@ return -1; } + osmux_xfrm_output_init(&endp->osmux.out, + (endp->osmux.cid * rtp_ssrc_winlen) + + (random() % rtp_ssrc_winlen)); + switch (endp->cfg->role) { case MGCP_BSC_NAT: endp->type = MGCP_OSMUX_BSC_NAT; -- To view, visit https://gerrit.osmocom.org/11326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I15c3a1a6bdf2566b03d1d543d8d15e4117a53622 Gerrit-Change-Number: 11326 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 20:05:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 20:05:28 +0000 Subject: Change in openbsc[master]: mgcp: Log endpoint nr consistently as hex In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11327 ) Change subject: mgcp: Log endpoint nr consistently as hex ...................................................................... mgcp: Log endpoint nr consistently as hex Change-Id: I281964935312161d1da49e8035c5bf3bb7bf9c5c --- M openbsc/src/libmgcp/mgcp_network.c M openbsc/src/libmgcp/mgcp_osmux.c M openbsc/tests/mgcp/mgcp_test.c 3 files changed, 9 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/libmgcp/mgcp_network.c b/openbsc/src/libmgcp/mgcp_network.c index 799d998..49500d9 100644 --- a/openbsc/src/libmgcp/mgcp_network.c +++ b/openbsc/src/libmgcp/mgcp_network.c @@ -763,7 +763,7 @@ break; } - LOGP(DMGCP, LOGL_ERROR, "Bad MGCP type %u on endpoint %u\n", + LOGP(DMGCP, LOGL_ERROR, "Bad MGCP type %u on endpoint 0x%x\n", endp->type, ENDPOINT_NUMBER(endp)); return 0; } @@ -856,7 +856,7 @@ break; /* Should not happen */ } - LOGP(DMGCP, LOGL_ERROR, "Bad MGCP type %u on endpoint %u\n", + LOGP(DMGCP, LOGL_ERROR, "Bad MGCP type %u on endpoint 0x%x\n", endp->type, ENDPOINT_NUMBER(endp)); return 0; } diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index 0a4441c..71e8eae 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -340,12 +340,12 @@ if (osmux_enable_endpoint(endp, &addr->sin_addr, addr->sin_port) < 0 ) { LOGP(DMGCP, LOGL_ERROR, - "Could not enable osmux in endpoint %d\n", + "Could not enable osmux in endpoint 0x%x\n", ENDPOINT_NUMBER(endp)); goto out; } - LOGP(DMGCP, LOGL_INFO, "Enabling osmux in endpoint %d for %s:%u\n", + LOGP(DMGCP, LOGL_INFO, "Enabling osmux in endpoint 0x%x for %s:%u\n", ENDPOINT_NUMBER(endp), inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); out: @@ -442,7 +442,7 @@ static const uint32_t rtp_ssrc_winlen = UINT32_MAX / (OSMUX_CID_MAX + 1); if (endp->osmux.state == OSMUX_STATE_DISABLED) { - LOGP(DMGCP, LOGL_ERROR, "Endpoint %u didn't request Osmux\n", + LOGP(DMGCP, LOGL_ERROR, "Endpoint 0x%x didn't request Osmux\n", ENDPOINT_NUMBER(endp)); return -1; } @@ -482,7 +482,7 @@ void osmux_disable_endpoint(struct mgcp_endpoint *endp) { - LOGP(DMGCP, LOGL_INFO, "Releasing endpoint %u using Osmux CID %u\n", + LOGP(DMGCP, LOGL_INFO, "Releasing endpoint 0x%x using Osmux CID %u\n", ENDPOINT_NUMBER(endp), endp->osmux.cid); /* We are closing, we don't need pending RTP packets to be transmitted */ @@ -528,7 +528,7 @@ if (osmux_enable_endpoint(endp, &endp->net_end.addr, htons(endp->cfg->osmux_port)) < 0) { LOGP(DMGCP, LOGL_ERROR, - "Could not activate osmux in endpoint %d\n", + "Could not activate osmux in endpoint 0x%x\n", ENDPOINT_NUMBER(endp)); } LOGP(DMGCP, LOGL_ERROR, diff --git a/openbsc/tests/mgcp/mgcp_test.c b/openbsc/tests/mgcp/mgcp_test.c index 92099db..e7a582a 100644 --- a/openbsc/tests/mgcp/mgcp_test.c +++ b/openbsc/tests/mgcp/mgcp_test.c @@ -436,7 +436,7 @@ static int mgcp_test_policy_cb(struct mgcp_trunk_config *cfg, int endpoint, int state, const char *transactio_id) { - fprintf(stderr, "Policy CB got state %d on endpoint %d\n", + fprintf(stderr, "Policy CB got state %d on endpoint 0x%x\n", state, endpoint); last_endpoint = endpoint; return MGCP_POLICY_CONT; @@ -603,7 +603,7 @@ OSMO_ASSERT(last_endpoint != -1); endp = &cfg->trunk.endpoints[last_endpoint]; - fprintf(stderr, "endpoint %d: " + fprintf(stderr, "endpoint 0x%x: " "payload type BTS %d (exp %d), NET %d (exp %d)\n", last_endpoint, endp->bts_end.codec.payload_type, t->exp_bts_ptype, -- To view, visit https://gerrit.osmocom.org/11327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I281964935312161d1da49e8035c5bf3bb7bf9c5c Gerrit-Change-Number: 11327 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 20:05:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 20:05:29 +0000 Subject: Change in openbsc[master]: nat: Log endpoint nr consistently as hex In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11328 ) Change subject: nat: Log endpoint nr consistently as hex ...................................................................... nat: Log endpoint nr consistently as hex Change-Id: I581f40da47614223219800e97a334f8b5e06b13f --- M openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c index 986306c..06799bb 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c +++ b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c @@ -211,7 +211,7 @@ llist_for_each_entry(mcon, &con->bsc->nat->sccp_connections, list_entry) { if (mcon->msc_endp == endp) { LOGP(DNAT, LOGL_ERROR, - "Endpoint %d was assigned to 0x%x and now 0x%x\n", + "Endpoint 0x%x was assigned to 0x%x and now 0x%x\n", endp, sccp_src_ref_to_int(&mcon->patched_ref), sccp_src_ref_to_int(&con->patched_ref)); -- To view, visit https://gerrit.osmocom.org/11328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I581f40da47614223219800e97a334f8b5e06b13f Gerrit-Change-Number: 11328 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 20:05:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 20:05:29 +0000 Subject: Change in openbsc[master]: nat: Log state of pending transaction In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11332 ) Change subject: nat: Log state of pending transaction ...................................................................... nat: Log state of pending transaction Change-Id: I9f686404517bf8a2044cf59dd5bfaf90eb4f798f --- M openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c index 06799bb..9fc8ba3 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c +++ b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c @@ -521,8 +521,8 @@ mgcp_endp = &nat->mgcp_cfg->trunk.endpoints[endpoint]; if (bsc_endp->transaction_id) { - LOGP(DMGCP, LOGL_ERROR, "Endpoint 0x%x had pending transaction: '%s'\n", - endpoint, bsc_endp->transaction_id); + LOGP(DMGCP, LOGL_ERROR, "Endpoint 0x%x had pending transaction: '%s' state %d\n", + endpoint, bsc_endp->transaction_id, bsc_endp->transaction_state); talloc_free(bsc_endp->transaction_id); bsc_endp->transaction_id = NULL; bsc_endp->transaction_state = 0; -- To view, visit https://gerrit.osmocom.org/11332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9f686404517bf8a2044cf59dd5bfaf90eb4f798f Gerrit-Change-Number: 11332 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 20:05:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 20:05:39 +0000 Subject: Change in openbsc[master]: osmux.h: Document enum osmux_state In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11340 ) Change subject: osmux.h: Document enum osmux_state ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If5de6e981e9af7b667dd3365d758f868f38bf6e0 Gerrit-Change-Number: 11340 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 20:05:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 20:08:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 20:08:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fix build of bsc bsc-nat, hlr, and msc tests In-Reply-To: References: Message-ID: Harald Welte has removed a vote on this change. Change subject: fix build of bsc bsc-nat, hlr, and msc tests ...................................................................... Removed Code-Review+1 by Harald Welte -- To view, visit https://gerrit.osmocom.org/11333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: I72c369ccd9df88970a69c6dfb5d5255d14fe6aa8 Gerrit-Change-Number: 11333 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 12 20:08:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 12 Oct 2018 20:08:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fix build of bsc bsc-nat, hlr, and msc tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11333 ) Change subject: fix build of bsc bsc-nat, hlr, and msc tests ...................................................................... Patch Set 1: "make compile" works quite fine here on current master. Not sure what kind of build faiulres you are referring to? -- To view, visit https://gerrit.osmocom.org/11333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I72c369ccd9df88970a69c6dfb5d5255d14fe6aa8 Gerrit-Change-Number: 11333 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 12 Oct 2018 20:08:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 13 17:20:09 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 13 Oct 2018 17:20:09 +0000 Subject: Change in libosmocore[master]: stats_statsd: Send all stat_items as gauges In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/11323 ) Change subject: stats_statsd: Send all stat_items as gauges ...................................................................... Patch Set 1: (1 comment) Can you write or change a test for it? https://gerrit.osmocom.org/#/c/11323/1/src/stats_statsd.c File src/stats_statsd.c: https://gerrit.osmocom.org/#/c/11323/1/src/stats_statsd.c at 187 PS1, Line 187: const char *unit = desc->unit; Can you move this into the if below. -- To view, visit https://gerrit.osmocom.org/11323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia16270d36c9a14521594de4b99a48c83e4ac07d4 Gerrit-Change-Number: 11323 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sat, 13 Oct 2018 17:20:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 13 18:43:28 2018 From: gerrit-no-reply at lists.osmocom.org (roox) Date: Sat, 13 Oct 2018 18:43:28 +0000 Subject: Change in simtrace2[master]: Fix compiler warning: no-return-in-nonvoid-function simtrace2_usb.c Message-ID: roox has uploaded this change for review. ( https://gerrit.osmocom.org/11342 Change subject: Fix compiler warning: no-return-in-nonvoid-function simtrace2_usb.c ...................................................................... Fix compiler warning: no-return-in-nonvoid-function simtrace2_usb.c RPM post-build-checks found some issue and marks these as error: [ 61s] I: Program returns random data in a function [ 61s] E: simtrace2 no-return-in-nonvoid-function simtrace2_usb.c:88 Change-Id: Id16fb7fc4f13176b2b6443af02a5848d8fcfb069 --- M host/simtrace2_usb.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/42/11342/1 diff --git a/host/simtrace2_usb.c b/host/simtrace2_usb.c index 2016670..d662351 100644 --- a/host/simtrace2_usb.c +++ b/host/simtrace2_usb.c @@ -67,4 +67,5 @@ { libusb_init(NULL); find_devices(); + return 0; } -- To view, visit https://gerrit.osmocom.org/11342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id16fb7fc4f13176b2b6443af02a5848d8fcfb069 Gerrit-Change-Number: 11342 Gerrit-PatchSet: 1 Gerrit-Owner: roox -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 13 18:46:04 2018 From: gerrit-no-reply at lists.osmocom.org (roox) Date: Sat, 13 Oct 2018 18:46:04 +0000 Subject: Change in osmo-remsim[master]: Fix compiler warning: no-return-in-nonvoid-function main.c Message-ID: roox has uploaded this change for review. ( https://gerrit.osmocom.org/11343 Change subject: Fix compiler warning: no-return-in-nonvoid-function main.c ...................................................................... Fix compiler warning: no-return-in-nonvoid-function main.c RPM post-build-checks found some issue and marks these as error: [ 31s] I: Program returns random data in a function [ 31s] E: osmo-remsim no-return-in-nonvoid-function main.c:49 Change-Id: I18705488d0ef8a445004e6a7e81dd2483afb9bdb --- M src/main.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/43/11343/1 diff --git a/src/main.c b/src/main.c index 6ae47e8..23fa9d2 100644 --- a/src/main.c +++ b/src/main.c @@ -46,4 +46,5 @@ g_ctx = talloc_named_const(NULL, 0, "main"); talloc_asn1_ctx = talloc_named_const(g_ctx, 0, "asn1_context"); card_readers_probe(g_ctx); + return 0; } -- To view, visit https://gerrit.osmocom.org/11343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I18705488d0ef8a445004e6a7e81dd2483afb9bdb Gerrit-Change-Number: 11343 Gerrit-PatchSet: 1 Gerrit-Owner: roox -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 13 22:14:01 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Sat, 13 Oct 2018 22:14:01 +0000 Subject: Change in simtrace2[master]: Fix compiler warning: no-return-in-nonvoid-function simtrace2_usb.c In-Reply-To: References: Message-ID: K?vin Redon has posted comments on this change. ( https://gerrit.osmocom.org/11342 ) Change subject: Fix compiler warning: no-return-in-nonvoid-function simtrace2_usb.c ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id16fb7fc4f13176b2b6443af02a5848d8fcfb069 Gerrit-Change-Number: 11342 Gerrit-PatchSet: 1 Gerrit-Owner: roox Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Sat, 13 Oct 2018 22:14:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 13 22:14:06 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Sat, 13 Oct 2018 22:14:06 +0000 Subject: Change in simtrace2[master]: Fix compiler warning: no-return-in-nonvoid-function simtrace2_usb.c In-Reply-To: References: Message-ID: K?vin Redon has submitted this change and it was merged. ( https://gerrit.osmocom.org/11342 ) Change subject: Fix compiler warning: no-return-in-nonvoid-function simtrace2_usb.c ...................................................................... Fix compiler warning: no-return-in-nonvoid-function simtrace2_usb.c RPM post-build-checks found some issue and marks these as error: [ 61s] I: Program returns random data in a function [ 61s] E: simtrace2 no-return-in-nonvoid-function simtrace2_usb.c:88 Change-Id: Id16fb7fc4f13176b2b6443af02a5848d8fcfb069 --- M host/simtrace2_usb.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: K?vin Redon: Looks good to me, approved Jenkins Builder: Verified diff --git a/host/simtrace2_usb.c b/host/simtrace2_usb.c index cdfe29e..1e3104a 100644 --- a/host/simtrace2_usb.c +++ b/host/simtrace2_usb.c @@ -85,4 +85,5 @@ { libusb_init(NULL); find_devices(); + return 0; } -- To view, visit https://gerrit.osmocom.org/11342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id16fb7fc4f13176b2b6443af02a5848d8fcfb069 Gerrit-Change-Number: 11342 Gerrit-PatchSet: 2 Gerrit-Owner: roox Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 14 18:04:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 14 Oct 2018 18:04:44 +0000 Subject: Change in osmo-remsim[master]: Fix compiler warning: no-return-in-nonvoid-function main.c In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11343 ) Change subject: Fix compiler warning: no-return-in-nonvoid-function main.c ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18705488d0ef8a445004e6a7e81dd2483afb9bdb Gerrit-Change-Number: 11343 Gerrit-PatchSet: 1 Gerrit-Owner: roox Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 14 Oct 2018 18:04:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 14 18:04:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 14 Oct 2018 18:04:45 +0000 Subject: Change in osmo-remsim[master]: Fix compiler warning: no-return-in-nonvoid-function main.c In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11343 ) Change subject: Fix compiler warning: no-return-in-nonvoid-function main.c ...................................................................... Fix compiler warning: no-return-in-nonvoid-function main.c RPM post-build-checks found some issue and marks these as error: [ 31s] I: Program returns random data in a function [ 31s] E: osmo-remsim no-return-in-nonvoid-function main.c:49 Change-Id: I18705488d0ef8a445004e6a7e81dd2483afb9bdb --- M src/main.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/src/main.c b/src/main.c index 6ae47e8..23fa9d2 100644 --- a/src/main.c +++ b/src/main.c @@ -46,4 +46,5 @@ g_ctx = talloc_named_const(NULL, 0, "main"); talloc_asn1_ctx = talloc_named_const(g_ctx, 0, "asn1_context"); card_readers_probe(g_ctx); + return 0; } -- To view, visit https://gerrit.osmocom.org/11343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I18705488d0ef8a445004e6a7e81dd2483afb9bdb Gerrit-Change-Number: 11343 Gerrit-PatchSet: 1 Gerrit-Owner: roox Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 14 18:49:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 14 Oct 2018 18:49:52 +0000 Subject: Change in osmo-remsim[master]: Add contrib/jenkins.sh for build verification Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11344 Change subject: Add contrib/jenkins.sh for build verification ...................................................................... Add contrib/jenkins.sh for build verification Change-Id: I09a020966c3903673626e6d6bbe097d4ba69774b --- A contrib/jenkins.sh 1 file changed, 43 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/44/11344/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 0000000..6eee769 --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# jenkins build helper script for libosmo-abis. This is how we build on jenkins.osmocom.org + +if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then + echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" + exit 2 +fi + +set -ex + +base="$PWD" +deps="$base/deps" +inst="$deps/install" +export deps inst + +osmo-clean-workspace.sh + +mkdir "$deps" || true + +verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") + +osmo-build-dep.sh libosmocore "" --disable-doxygen +osmo-build-dep.sh libosmo-abis "" --disable-doxygen +osmo-build-dep.sh libosmo-netif "" --disable-doxygen + +export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" +export LD_LIBRARY_PATH="$inst/lib" + +set +x +echo +echo +echo +echo " =============================== libosmo-abis ===============================" +echo +set -x + +autoreconf --install --force +./configure --enable-sanitize #--enable-werror +$MAKE $PARALLEL_MAKE +$MAKE distcheck \ + || cat-testlogs.sh + +osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/11344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I09a020966c3903673626e6d6bbe097d4ba69774b Gerrit-Change-Number: 11344 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 14 18:51:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 14 Oct 2018 18:51:26 +0000 Subject: Change in osmo-ci[master]: osmocom_build_deps: Add liblimesuite-dev for osmo-trx-lms In-Reply-To: References: Message-ID: Harald Welte has abandoned this change. ( https://gerrit.osmocom.org/10969 ) Change subject: osmocom_build_deps: Add liblimesuite-dev for osmo-trx-lms ...................................................................... Abandoned this was already handled in I7fafae340221cac63e33bccabcce6fd8f4385514 -- To view, visit https://gerrit.osmocom.org/10969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I37d1f2482a03968f0a9d83a6ebda64651733a983 Gerrit-Change-Number: 10969 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 14 18:53:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 14 Oct 2018 18:53:04 +0000 Subject: Change in osmo-remsim[master]: Add contrib/jenkins.sh for build verification In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11344 ) Change subject: Add contrib/jenkins.sh for build verification ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I09a020966c3903673626e6d6bbe097d4ba69774b Gerrit-Change-Number: 11344 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 14 Oct 2018 18:53:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 14 18:53:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 14 Oct 2018 18:53:06 +0000 Subject: Change in osmo-remsim[master]: Add contrib/jenkins.sh for build verification In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11344 ) Change subject: Add contrib/jenkins.sh for build verification ...................................................................... Add contrib/jenkins.sh for build verification Change-Id: I09a020966c3903673626e6d6bbe097d4ba69774b --- A contrib/jenkins.sh 1 file changed, 43 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 0000000..6eee769 --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# jenkins build helper script for libosmo-abis. This is how we build on jenkins.osmocom.org + +if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then + echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" + exit 2 +fi + +set -ex + +base="$PWD" +deps="$base/deps" +inst="$deps/install" +export deps inst + +osmo-clean-workspace.sh + +mkdir "$deps" || true + +verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") + +osmo-build-dep.sh libosmocore "" --disable-doxygen +osmo-build-dep.sh libosmo-abis "" --disable-doxygen +osmo-build-dep.sh libosmo-netif "" --disable-doxygen + +export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" +export LD_LIBRARY_PATH="$inst/lib" + +set +x +echo +echo +echo +echo " =============================== libosmo-abis ===============================" +echo +set -x + +autoreconf --install --force +./configure --enable-sanitize #--enable-werror +$MAKE $PARALLEL_MAKE +$MAKE distcheck \ + || cat-testlogs.sh + +osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/11344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I09a020966c3903673626e6d6bbe097d4ba69774b Gerrit-Change-Number: 11344 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Oct 14 18:54:42 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 14 Oct 2018 18:54:42 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-remsim_=C2=BB_a1=3Ddef?= =?UTF-8?Q?ault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1?= Message-ID: <1529946312.57.1539543282346.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 68.20 KB...] make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in utils make[2]: Entering directory ' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o CCLD osmo-arfcn CCLD osmo-config-merge CCLD osmo-auc-gen CCLD osmo-sim-test make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge ' libtool: install: /usr/bin/install -c .libs/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in tests make[2]: Entering directory ' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[3]: Entering directory ' /bin/mkdir -p ' /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc libosmogb.pc libosmoctrl.pc libosmocoding.pc libosmosim.pc ' /usr/bin/install -c osmo-release.sh ' /usr/bin/install -c -m 644 osmo-release.mk ' make install-data-hook make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-hook'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' + STOW_DIR= stow --restow libosmocore + osmo-build-dep.sh libosmo-abis --disable-doxygen =============================== libosmo-abis =============================== + mkdir -p + cd + osmo-deps.sh libosmo-abis + project=libosmo-abis + branch=master + git branch -a + grep -c remotes/origin/master$ + [ x1 != x0 ] + branch=origin/master + test -d libosmo-abis + git clone git://git.osmocom.org/libosmo-abis libosmo-abis Cloning into 'libosmo-abis'... + cd libosmo-abis + git fetch --tags origin + git fetch origin + deps= osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD Your branch is up-to-date with 'origin/master'. + git clean -dxf + [ -d ] + [ -d layer1-headers ] + git checkout -f origin/master Note: checking out 'origin/master'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b HEAD is now at 4179207... e1_input.h: Set correct type for input_signal_data->link_type + git rev-parse HEAD 4179207e0ec2833c649174aef5b32b54431f23a8 + 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= --with-systemdsystemunitdir= --disable-doxygen configure: WARNING: unrecognized options: --with-systemdsystemunitdir, --disable-doxygen 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 checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking if gcc supports -fvisibility=hidden... yes checking for LIBOSMOCORE... no configure: error: Package requirements (libosmocore >= 0.12.0) were not met: Package libosmocore was not found in the pkg-config search path. Perhaps you should add the directory containing `libosmocore.pc' to the PKG_CONFIG_PATH environment variable Package 'libosmocore', required by 'world', not found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables LIBOSMOCORE_CFLAGS and LIBOSMOCORE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun Oct 14 18:55:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 14 Oct 2018 18:55:03 +0000 Subject: Change in osmo-remsim[master]: libusb_util.c: Avoid gcc warning about strncpy() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11345 Change subject: libusb_util.c: Avoid gcc warning about strncpy() ...................................................................... libusb_util.c: Avoid gcc warning about strncpy() What we're doing is actually legal: We copy the full size of the destination array, and then overwrite the last byte with NUL. However, gcc isn't smart enough to see that: libusb_util.c:162:5: warning: ?strncpy? specified bound 20 equals destination size [-Wstringop-truncation] strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Let's copy one byte less to make it happy. Change-Id: Iae13f7a4cf89230f308eb0183d993d7c31024907 --- M src/simtrace2/libusb_util.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/45/11345/1 diff --git a/src/simtrace2/libusb_util.c b/src/simtrace2/libusb_util.c index cb435e2..45e3f50 100644 --- a/src/simtrace2/libusb_util.c +++ b/src/simtrace2/libusb_util.c @@ -159,7 +159,7 @@ out[out_idx].vendor = dev_desc.idVendor; out[out_idx].product = dev_desc.idProduct; out[out_idx].addr = addr; - strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)); + strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)-1); out[out_idx].path[sizeof(out[out_idx].path)-1] = '\0'; out[out_idx].configuration = conf_desc->bConfigurationValue; out[out_idx].interface = if_desc->bInterfaceNumber; -- To view, visit https://gerrit.osmocom.org/11345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iae13f7a4cf89230f308eb0183d993d7c31024907 Gerrit-Change-Number: 11345 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 14 18:55:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 14 Oct 2018 18:55:04 +0000 Subject: Change in osmo-remsim[master]: move DMAIN definition to new debug.h Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11346 Change subject: move DMAIN definition to new debug.h ...................................................................... move DMAIN definition to new debug.h This way both client.h and bankd.h don't conflict with each other Change-Id: I68ffd64e1f32b90206f98c7f3ea707d7b2e11e61 --- M src/Makefile.am M src/bankd.h M src/client.h A src/debug.h 4 files changed, 8 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/46/11346/1 diff --git a/src/Makefile.am b/src/Makefile.am index 12b1e7b..ca799ce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,7 +12,7 @@ rspro/libosmo-asn1-rspro.la libosmo_rspro_la_SOURCES = rspro_util.c -noinst_HEADERS = bankd.h client.h internal.h rspro_util.h \ +noinst_HEADERS = debug.h bankd.h client.h internal.h rspro_util.h \ simtrace2/apdu_dispatch.h \ simtrace2/libusb_util.h \ simtrace2/simtrace2-discovery.h \ diff --git a/src/bankd.h b/src/bankd.h index 86a66b9..86b75cc 100644 --- a/src/bankd.h +++ b/src/bankd.h @@ -13,10 +13,7 @@ #include #include "rspro_util.h" - -enum { - DMAIN, -}; +#include "debug.h" struct bankd; diff --git a/src/client.h b/src/client.h index b772a20..df90404 100644 --- a/src/client.h +++ b/src/client.h @@ -4,10 +4,7 @@ #include #include "rspro_util.h" - -enum { - DMAIN, -}; +#include "debug.h" /* fsm.c */ diff --git a/src/debug.h b/src/debug.h new file mode 100644 index 0000000..187d895 --- /dev/null +++ b/src/debug.h @@ -0,0 +1,5 @@ +#pragma once + +enum { + DMAIN, +}; -- To view, visit https://gerrit.osmocom.org/11346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I68ffd64e1f32b90206f98c7f3ea707d7b2e11e61 Gerrit-Change-Number: 11346 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 14 18:55:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 14 Oct 2018 18:55:04 +0000 Subject: Change in osmo-remsim[master]: move 'struct rspro_server_conn' to client.h Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11347 Change subject: move 'struct rspro_server_conn' to client.h ...................................................................... move 'struct rspro_server_conn' to client.h Change-Id: Iab9183de086e76a214c23b2af340253a0428e445 --- M src/client.h M src/remsim_client_fsm.c 2 files changed, 16 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/47/11347/1 diff --git a/src/client.h b/src/client.h index df90404..7a3c476 100644 --- a/src/client.h +++ b/src/client.h @@ -14,6 +14,8 @@ BDC_E_CLIENT_CONN_RES, }; +extern struct osmo_fsm remsim_client_bankd_fsm; + enum server_conn_fsm_event { SRVC_E_TCP_UP, @@ -21,7 +23,20 @@ SRVC_E_CLIENT_CONN_RES, }; -extern struct osmo_fsm remsim_client_bankd_fsm; +/* representing a client-side connection to a RSPRO server */ +struct rspro_server_conn { + /* state */ + struct ipa_client_conn *conn; + struct osmo_fsm_inst *fi; + + /* our own component ID */ + struct app_comp_id own_comp_id; + + /* configuration */ + char *server_host; + uint16_t server_port; +}; + extern struct osmo_fsm remsim_client_server_fsm; /* main.c */ diff --git a/src/remsim_client_fsm.c b/src/remsim_client_fsm.c index 4fb57f3..0b514e6 100644 --- a/src/remsim_client_fsm.c +++ b/src/remsim_client_fsm.c @@ -240,20 +240,6 @@ { 0, NULL } }; -/* representing a client-side connection to a RSPRO server */ -struct rspro_server_conn { - /* state */ - struct ipa_client_conn *conn; - struct osmo_fsm_inst *fi; - - /* our own component ID */ - struct app_comp_id own_comp_id; - - /* configuration */ - char *server_host; - uint16_t server_port; -}; - static void srvc_updown_cb(struct ipa_client_conn *conn, int up) { struct rspro_server_conn *srvc = conn->data; -- To view, visit https://gerrit.osmocom.org/11347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iab9183de086e76a214c23b2af340253a0428e445 Gerrit-Change-Number: 11347 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 14 18:55:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 14 Oct 2018 18:55:04 +0000 Subject: Change in osmo-remsim[master]: move ipa_client_conn_send_rspro() into remsim_client_fsm.c Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11348 Change subject: move ipa_client_conn_send_rspro() into remsim_client_fsm.c ...................................................................... move ipa_client_conn_send_rspro() into remsim_client_fsm.c Change-Id: I805e7dee0e3dd5a591d215ad340da356b19d03dd --- M src/remsim_client.c M src/remsim_client_fsm.c M src/simtrace2-remsim_client.c 3 files changed, 15 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/48/11348/1 diff --git a/src/remsim_client.c b/src/remsim_client.c index 90e8de2..b60059d 100644 --- a/src/remsim_client.c +++ b/src/remsim_client.c @@ -16,21 +16,6 @@ #include "rspro_util.h" #include "client.h" -static void push_and_send(struct ipa_client_conn *ipa, struct msgb *msg_tx) -{ - ipa_prepend_header_ext(msg_tx, IPAC_PROTO_EXT_RSPRO); - ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO); - ipa_client_conn_send(ipa, msg_tx); - /* msg_tx is now queued and will be freed. */ -} - -void ipa_client_conn_send_rspro(struct ipa_client_conn *ipa, RsproPDU_t *rspro) -{ - struct msgb *msg = rspro_enc_msg(rspro); - OSMO_ASSERT(msg); - push_and_send(ipa, msg); -} - static int bankd_handle_msg(struct bankd_client *bc, struct msgb *msg) { RsproPDU_t *pdu = rspro_dec_msg(msg); diff --git a/src/remsim_client_fsm.c b/src/remsim_client_fsm.c index 0b514e6..84f9f4f 100644 --- a/src/remsim_client_fsm.c +++ b/src/remsim_client_fsm.c @@ -17,6 +17,21 @@ #define S(x) (1 << (x)) +static void push_and_send(struct ipa_client_conn *ipa, struct msgb *msg_tx) +{ + ipa_prepend_header_ext(msg_tx, IPAC_PROTO_EXT_RSPRO); + ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO); + ipa_client_conn_send(ipa, msg_tx); + /* msg_tx is now queued and will be freed. */ +} + +void ipa_client_conn_send_rspro(struct ipa_client_conn *ipa, RsproPDU_t *rspro) +{ + struct msgb *msg = rspro_enc_msg(rspro); + OSMO_ASSERT(msg); + push_and_send(ipa, msg); +} + static void bankd_updown_cb(struct ipa_client_conn *conn, int up) { struct bankd_client *bc = conn->data; diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index 3fc5da0..f54ace3 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -506,21 +506,6 @@ /** remsim_client **/ -static void push_and_send(struct ipa_client_conn *ipa, struct msgb *msg_tx) -{ - ipa_prepend_header_ext(msg_tx, IPAC_PROTO_EXT_RSPRO); - ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO); - ipa_client_conn_send(ipa, msg_tx); - /* msg_tx is now queued and will be freed. */ -} - -void ipa_client_conn_send_rspro(struct ipa_client_conn *ipa, RsproPDU_t *rspro) -{ - struct msgb *msg = rspro_enc_msg(rspro); - OSMO_ASSERT(msg); - push_and_send(ipa, msg); -} - static int bankd_handle_tpduCardToModem(struct bankd_client *bc, RsproPDU_t *pdu) { OSMO_ASSERT(pdu); -- To view, visit https://gerrit.osmocom.org/11348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I805e7dee0e3dd5a591d215ad340da356b19d03dd Gerrit-Change-Number: 11348 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 14 18:55:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 14 Oct 2018 18:55:04 +0000 Subject: Change in osmo-remsim[master]: server_conn_fsm_alloc(): add explicit talloc context argument Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11349 Change subject: server_conn_fsm_alloc(): add explicit talloc context argument ...................................................................... server_conn_fsm_alloc(): add explicit talloc context argument The rspro_server_conn might be a static member of a different struct and hence not suitable as a talloc context. Change-Id: I9fd78d558f791d452f2a5279f1af13fd596c1cd6 --- M src/client.h M src/remsim_client_fsm.c 2 files changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/49/11349/1 diff --git a/src/client.h b/src/client.h index 7a3c476..d85e647 100644 --- a/src/client.h +++ b/src/client.h @@ -37,6 +37,7 @@ uint16_t server_port; }; +int server_conn_fsm_alloc(void *ctx, struct rspro_server_conn *srvc); extern struct osmo_fsm remsim_client_server_fsm; /* main.c */ diff --git a/src/remsim_client_fsm.c b/src/remsim_client_fsm.c index 84f9f4f..8711934 100644 --- a/src/remsim_client_fsm.c +++ b/src/remsim_client_fsm.c @@ -302,7 +302,7 @@ struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv; int rc; - srvc->conn = ipa_client_conn_create(srvc, NULL, 0, srvc->server_host, srvc->server_port, + srvc->conn = ipa_client_conn_create(fi, NULL, 0, srvc->server_host, srvc->server_port, srvc_updown_cb, srvc_read_cb, NULL, srvc); if (!srvc->conn) { fprintf(stderr, "Unable to create socket: %s\n", strerror(errno)); @@ -450,11 +450,11 @@ .event_names = server_conn_fsm_event_names, }; -int server_conn_fsm_alloc(struct rspro_server_conn *srvc) +int server_conn_fsm_alloc(void *ctx, struct rspro_server_conn *srvc) { struct osmo_fsm_inst *fi; - fi = osmo_fsm_inst_alloc(&remsim_client_server_fsm, srvc, srvc, LOGL_DEBUG, "server"); + fi = osmo_fsm_inst_alloc(&remsim_client_server_fsm, ctx, srvc, LOGL_DEBUG, "server"); if (!fi) return -1; -- To view, visit https://gerrit.osmocom.org/11349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9fd78d558f791d452f2a5279f1af13fd596c1cd6 Gerrit-Change-Number: 11349 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 14 18:55:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 14 Oct 2018 18:55:05 +0000 Subject: Change in osmo-remsim[master]: rspro_gen_ConnectClientReq(): don't dereference optional 'client' Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11350 Change subject: rspro_gen_ConnectClientReq(): don't dereference optional 'client' ...................................................................... rspro_gen_ConnectClientReq(): don't dereference optional 'client' Change-Id: Id5ff7f1524bc34576095d6812935557c7f03b545 --- M src/rspro_util.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/50/11350/1 diff --git a/src/rspro_util.c b/src/rspro_util.c index 95e8cfc..0452728 100644 --- a/src/rspro_util.c +++ b/src/rspro_util.c @@ -118,7 +118,8 @@ return NULL; pdu->msg.present = RsproPDUchoice_PR_connectClientReq; fill_comp_id(&pdu->msg.choice.connectClientReq.identity, a_cid); - ASN_ALLOC_COPY(pdu->msg.choice.connectClientReq.clientSlot, client); + if (client) + ASN_ALLOC_COPY(pdu->msg.choice.connectClientReq.clientSlot, client); return pdu; } -- To view, visit https://gerrit.osmocom.org/11350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id5ff7f1524bc34576095d6812935557c7f03b545 Gerrit-Change-Number: 11350 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 14 18:55:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 14 Oct 2018 18:55:05 +0000 Subject: Change in osmo-remsim[master]: rspro_server_conn: Add handle_rx() call-back Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11351 Change subject: rspro_server_conn: Add handle_rx() call-back ...................................................................... rspro_server_conn: Add handle_rx() call-back This call-back receives all already-decoded RSPRO PDUs from the server. Change-Id: I5f410aa6071c9a987c2811f22fb2f3ff018b3cc1 --- M src/client.h M src/remsim_client_fsm.c 2 files changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/51/11351/1 diff --git a/src/client.h b/src/client.h index d85e647..6918560 100644 --- a/src/client.h +++ b/src/client.h @@ -2,6 +2,7 @@ #include #include +#include #include "rspro_util.h" #include "debug.h" @@ -23,11 +24,14 @@ SRVC_E_CLIENT_CONN_RES, }; +struct rspro_server_conn; + /* representing a client-side connection to a RSPRO server */ struct rspro_server_conn { /* state */ struct ipa_client_conn *conn; struct osmo_fsm_inst *fi; + int (*handle_rx)(struct rspro_server_conn *conn, RsproPDU_t *pdu); /* our own component ID */ struct app_comp_id own_comp_id; diff --git a/src/remsim_client_fsm.c b/src/remsim_client_fsm.c index 8711934..0776937 100644 --- a/src/remsim_client_fsm.c +++ b/src/remsim_client_fsm.c @@ -269,6 +269,7 @@ struct ipaccess_head *hh = (struct ipaccess_head *) msg->data; struct ipaccess_head_ext *he = (struct ipaccess_head_ext *) msgb_l2(msg); struct rspro_server_conn *srvc = conn->data; + RsproPDU_t *pdu; int rc; if (msgb_length(msg) < sizeof(*hh)) @@ -284,12 +285,12 @@ goto invalid; printf("Received RSPRO %s\n", msgb_hexdump(msg)); -#if 0 - rc = bankd_handle_msg(srvc, msg); - msgb_free(msg); + pdu = rspro_dec_msg(msg); + if (!pdu) + goto invalid; + rc = srvc->handle_rx(srvc, pdu); return rc; -#endif invalid: msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/11351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5f410aa6071c9a987c2811f22fb2f3ff018b3cc1 Gerrit-Change-Number: 11351 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 14 23:53:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 14 Oct 2018 23:53:09 +0000 Subject: Change in osmo-remsim[master]: rspro_util.c: Set pdu version to 2 for all generator functions Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11352 Change subject: rspro_util.c: Set pdu version to 2 for all generator functions ...................................................................... rspro_util.c: Set pdu version to 2 for all generator functions Change-Id: I83b87875b81491217315390f9ccefeeb39fb610b --- M src/rspro_util.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/52/11352/1 diff --git a/src/rspro_util.c b/src/rspro_util.c index 0452728..970aca5 100644 --- a/src/rspro_util.c +++ b/src/rspro_util.c @@ -103,6 +103,7 @@ RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); if (!pdu) return NULL; + pdu->version = 2; pdu->msg.present = RsproPDUchoice_PR_connectBankReq; fill_comp_id(&pdu->msg.choice.connectBankReq.identity, a_cid); pdu->msg.choice.connectBankReq.bankId = bank_id; @@ -116,6 +117,7 @@ RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); if (!pdu) return NULL; + pdu->version = 2; pdu->msg.present = RsproPDUchoice_PR_connectClientReq; fill_comp_id(&pdu->msg.choice.connectClientReq.identity, a_cid); if (client) @@ -143,6 +145,7 @@ RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); if (!pdu) return NULL; + pdu->version = 2; pdu->msg.present = RsproPDUchoice_PR_createMappingReq; pdu->msg.choice.createMappingReq.client = *client; pdu->msg.choice.createMappingReq.bank = *bank; @@ -155,6 +158,7 @@ RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); if (!pdu) return NULL; + pdu->version = 2; pdu->msg.present = RsproPDUchoice_PR_configClientReq; pdu->msg.choice.configClientReq.clientSlot = *client; fill_ip4_port(&pdu->msg.choice.configClientReq.bankd, ip, port); @@ -168,6 +172,7 @@ RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); if (!pdu) return NULL; + pdu->version = 2; pdu->msg.present = RsproPDUchoice_PR_setAtrReq; pdu->msg.choice.setAtrReq.slot.clientId = client_id; pdu->msg.choice.setAtrReq.slot.slotNr = slot_nr; @@ -182,6 +187,7 @@ RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); if (!pdu) return NULL; + pdu->version = 2; pdu->msg.present = RsproPDUchoice_PR_tpduModemToCard; OSMO_ASSERT(client); pdu->msg.choice.tpduModemToCard.fromClientSlot = *client; @@ -199,6 +205,7 @@ RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); if (!pdu) return NULL; + pdu->version = 2; pdu->msg.present = RsproPDUchoice_PR_tpduCardToModem; OSMO_ASSERT(bank); pdu->msg.choice.tpduCardToModem.fromBankSlot = *bank; -- To view, visit https://gerrit.osmocom.org/11352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I83b87875b81491217315390f9ccefeeb39fb610b Gerrit-Change-Number: 11352 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 14 23:53:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 14 Oct 2018 23:53:09 +0000 Subject: Change in osmo-remsim[master]: add rspro_gen_{Remove, Create}Mapping{Req, Res}() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11353 Change subject: add rspro_gen_{Remove,Create}Mapping{Req,Res}() ...................................................................... add rspro_gen_{Remove,Create}Mapping{Req,Res}() Change-Id: If86d34a1e723b7202b5fa2c40ea1d0b152381773 --- M src/rspro_util.c M src/rspro_util.h 2 files changed, 40 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/53/11353/1 diff --git a/src/rspro_util.c b/src/rspro_util.c index 970aca5..c8f4589 100644 --- a/src/rspro_util.c +++ b/src/rspro_util.c @@ -153,6 +153,43 @@ return pdu; } +RsproPDU_t *rspro_gen_CreateMappingRes(e_ResultCode res) +{ + RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); + if (!pdu) + return NULL; + pdu->version = 2; + pdu->msg.present = RsproPDUchoice_PR_createMappingRes; + pdu->msg.choice.createMappingRes.result = res; + + return pdu; +} + +RsproPDU_t *rspro_gen_RemoveMappingReq(const ClientSlot_t *client, const BankSlot_t *bank) +{ + RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); + if (!pdu) + return NULL; + pdu->version = 2; + pdu->msg.present = RsproPDUchoice_PR_removeMappingReq; + pdu->msg.choice.removeMappingReq.client = *client; + pdu->msg.choice.removeMappingReq.bank = *bank; + + return pdu; +} + +RsproPDU_t *rspro_gen_RemoveMappingRes(e_ResultCode res) +{ + RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); + if (!pdu) + return NULL; + pdu->version = 2; + pdu->msg.present = RsproPDUchoice_PR_removeMappingRes; + pdu->msg.choice.removeMappingRes.result = res; + + return pdu; +} + RsproPDU_t *rspro_gen_ConfigClientReq(const ClientSlot_t *client, uint32_t ip, uint16_t port) { RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); diff --git a/src/rspro_util.h b/src/rspro_util.h index 5411a48..bb2cf00 100644 --- a/src/rspro_util.h +++ b/src/rspro_util.h @@ -25,6 +25,9 @@ RsproPDU_t *rspro_gen_ConnectClientReq(const struct app_comp_id *a_cid, const ClientSlot_t *client); RsproPDU_t *rspro_gen_ConnectClientRes(const struct app_comp_id *a_cid, e_ResultCode res); RsproPDU_t *rspro_gen_CreateMappingReq(const ClientSlot_t *client, const BankSlot_t *bank); +RsproPDU_t *rspro_gen_CreateMappingRes(e_ResultCode res); +RsproPDU_t *rspro_gen_RemoveMappingReq(const ClientSlot_t *client, const BankSlot_t *bank); +RsproPDU_t *rspro_gen_RemoveMappingRes(e_ResultCode res); RsproPDU_t *rspro_gen_ConfigClientReq(const ClientSlot_t *client, uint32_t ip, uint16_t port); RsproPDU_t *rspro_gen_SetAtrReq(uint16_t client_id, uint16_t slot_nr, const uint8_t *atr, unsigned int atr_len); -- To view, visit https://gerrit.osmocom.org/11353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If86d34a1e723b7202b5fa2c40ea1d0b152381773 Gerrit-Change-Number: 11353 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Oct 14 23:55:18 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 14 Oct 2018 23:55:18 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-remsim_=C2=BB_a1=3Ddef?= =?UTF-8?Q?ault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2?= In-Reply-To: <1529946312.57.1539543282346.JavaMail.jenkins@jenkins.osmocom.org> References: <1529946312.57.1539543282346.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <138148742.58.1539561318860.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [laforge] contrib/jenkins.sh: Harmonize with other projects [laforge] contrib/jenkins.sh: Ensure PKG_CONFIG_PATH is set before build [laforge] contrib/jenkins.sh: Fix project name printed during build ------------------------------------------ [...truncated 251.03 KB...] cd && tar xf html.tar && rm -f html.tar make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' + STOW_DIR= stow --restow libosmo-netif + set +x =============================== osmo-remsim =============================== + autoreconf --install --force aclocal: warning: couldn't open directory 'm4': No such file or directory 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' libtoolize: Consider adding '-I m4' to ACLOCAL_AMFLAGS in Makefile.am. configure.ac:8: installing './compile' configure.ac:8: installing './config.guess' configure.ac:8: installing './config.sub' configure.ac:10: installing './install-sh' configure.ac:10: installing './missing' src/Makefile.am:36: warning: source file 'simtrace2/apdu_dispatch.c' is in a subdirectory, src/Makefile.am:36: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. src/Makefile.am:36: warning: source file 'simtrace2/simtrace2-discovery.c' is in a subdirectory, src/Makefile.am:36: but option 'subdir-objects' is disabled src/Makefile.am:36: warning: source file 'simtrace2/libusb_util.c' is in a subdirectory, src/Makefile.am:36: but option 'subdir-objects' is disabled src/Makefile.am: installing './depcomp' + ./configure --enable-sanitize 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 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 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 for gawk... gawk 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 checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes 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 whether make sets $(MAKE)... yes checking for style of include used by make... GNU checking whether make supports nested variables... yes checking whether UID '1000' is supported by ustar format... yes checking whether GID '1000' is supported by ustar format... yes checking how to create a ustar tar archive... gnutar checking dependency style of gcc... gcc3 checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking whether gcc understands -c and -o together... (cached) yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for OSMOCORE... yes checking for OSMOGSM... yes checking for OSMOABIS... yes checking for OSMOSIM... yes checking for PCSC... yes checking for USB... yes checking for ANSI C header files... (cached) yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Wall" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating Makefile config.status: creating src/Makefile config.status: creating src/rspro/Makefile config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/rspro/Makefile config.status: executing libtool commands config.status: executing depfiles commands + make -j 8 echo 0.0.74-61df > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory ' Making all in src make[2]: Entering directory ' Making all in rspro make[3]: Entering directory ' CC ATR.lo CC BankId.lo CC BankSlot.lo CC BankSlotStatusInd.lo CC ClientId.lo CC ClientSlotStatusInd.lo CC ClientSlot.lo CC ComponentIdentity.lo CC ComponentName.lo CC ComponentType.lo CC ConfigClientReq.lo CC ConfigClientRes.lo CC ConnectBankReq.lo CC ConnectBankRes.lo CC ConnectClientReq.lo CC ConnectClientRes.lo CC CreateMappingReq.lo CC CreateMappingRes.lo CC IpAddress.lo CC IpPort.lo CC Ipv4Address.lo CC Ipv6Address.lo CC OperationTag.lo CC PortNumber.lo CC RemoveMappingReq.lo CC RemoveMappingRes.lo CC ResultCode.lo CC RsproPDU.lo CC RsproPDUchoice.lo CC SetAtrReq.lo CC SetAtrRes.lo CC SlotNumber.lo CC SlotPhysStatus.lo CC TpduCardToModem.lo CC TpduFlags.lo CC TpduModemToCard.lo CC BOOLEAN.lo CC IA5String.lo CC INTEGER.lo CC NativeEnumerated.lo CC NativeInteger.lo CC constr_CHOICE.lo CC constr_SEQUENCE.lo CC OCTET_STRING.lo CC BIT_STRING.lo CC asn_codecs_prim.lo CC ber_tlv_length.lo CC ber_tlv_tag.lo CC ber_decoder.lo CC der_encoder.lo CC constr_TYPE.lo CC constraints.lo CC xer_support.lo CC xer_decoder.lo CC xer_encoder.lo CC per_support.lo CC per_decoder.lo CC per_encoder.lo CC per_opentype.lo CCLD libosmo-asn1-rspro.la ar: `u' modifier ignored since `D' is the default (see `U') make[3]: Leaving directory ' make[3]: Entering directory ' CC rspro_util.lo CC driver_core.o CC bankd_main.o CC driver_pcsc.o CC remsim_client.o CC bankd_pcsc.o CC main.o CC bankd_slotmap.o bankd_pcsc.c:6:17: fatal error: csv.h: No such file or directory #include ^ compilation terminated. Makefile:616: recipe for target 'bankd_pcsc.o' failed make[3]: *** [bankd_pcsc.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory ' Makefile:691: recipe for target 'all-recursive' failed make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory ' Makefile:397: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:344: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Oct 15 00:03:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 00:03:57 +0000 Subject: Change in osmo-remsim[master]: configure.ac: Explicitly check for -lcsv and csv.h Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11354 Change subject: configure.ac: Explicitly check for -lcsv and csv.h ...................................................................... configure.ac: Explicitly check for -lcsv and csv.h unfortuantely libcsv doesn't ship with a pkg-config file, so we have to resort on those manual checks Change-Id: I52260a4e3f7a12039f054a55a211045085f1c5ff --- M configure.ac 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/54/11354/1 diff --git a/configure.ac b/configure.ac index ed3540c..2c30dfb 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,9 @@ fi PKG_PROG_PKG_CONFIG([0.20]) +AC_CHECK_LIB(csv, csv_init, LIBS="$LIBS -lcsv", [AC_MSG_ERROR([*** libcsv library not found!])]) +AC_CHECK_HEADERS([csv.h]) + PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 0.11.0) PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0) PKG_CHECK_MODULES(OSMOABIS, libosmoabis) -- To view, visit https://gerrit.osmocom.org/11354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I52260a4e3f7a12039f054a55a211045085f1c5ff Gerrit-Change-Number: 11354 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Oct 15 00:10:15 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 15 Oct 2018 00:10:15 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master?= =?UTF-8?Q?-openbsc_=C2=BB_--disable-iu,--disab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#2966?= Message-ID: <1379461245.59.1539562215546.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 92.01 KB...] 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-unknown-linux-gnu checking host system type... x86_64-unknown-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 whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-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 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 checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking if gcc supports -fvisibility=hidden... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for ORTP... yes checking dahdi/user.h usability... no checking dahdi/user.h presence... no checking for dahdi/user.h... no configure: WARNING: DAHDI input driver will not be built CFLAGS="-g -O2 -Wall" CPPFLAGS=" -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmoabis.pc config.status: creating libosmotrau.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating tests/Makefile config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j 4 install echo 0.5.1.19-4179 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmo-abis' Making install in include make[2]: Entering directory '/build/deps/libosmo-abis/include' make[3]: Entering directory '/build/deps/libosmo-abis/include' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-abis/include' /bin/mkdir -p '/build/deps/install/stow/libosmo-abis/include/osmocom/abis' /usr/bin/install -c -m 644 osmocom/abis/ipa.h osmocom/abis/trau_frame.h osmocom/abis/ipa_proxy.h osmocom/abis/ipaccess.h osmocom/abis/abis.h osmocom/abis/subchan_demux.h osmocom/abis/e1_input.h osmocom/abis/lapd.h osmocom/abis/lapd_pcap.h osmocom/abis/unixsocket_proto.h '/build/deps/install/stow/libosmo-abis/include/osmocom/abis' /bin/mkdir -p '/build/deps/install/stow/libosmo-abis/include/osmocom/trau' /usr/bin/install -c -m 644 osmocom/trau/osmo_ortp.h '/build/deps/install/stow/libosmo-abis/include/osmocom/trau' make[3]: Leaving directory '/build/deps/libosmo-abis/include' make[2]: Leaving directory '/build/deps/libosmo-abis/include' Making install in src make[2]: Entering directory '/build/deps/libosmo-abis/src' CC ipa_proxy.lo CC e1_input_vty.lo CC init.lo CC e1_input.lo CC subchan_demux.lo CC trau_frame.lo CC input/dahdi.lo CC input/ipa.lo CC input/ipaccess.lo CC input/lapd.lo CC input/lapd_pcap.lo CC input/misdn.lo CC input/rs232.lo CC input/unixsocket.lo CC trau/libosmotrau_la-osmo_ortp.lo trau/osmo_ortp.c:206:9: note: #pragma message: Using internal ortp API: rtp_session_rtcp_rec #pragma message ("Using internal ortp API: rtp_session_rtcp_rec") ^ CCLD libosmoabis.la CCLD libosmotrau.la make[3]: Entering directory '/build/deps/libosmo-abis/src' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-abis/lib' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmoabis.la libosmotrau.la '/build/deps/install/stow/libosmo-abis/lib' libtool: install: /usr/bin/install -c .libs/libosmoabis.so.6.0.1 /build/deps/install/stow/libosmo-abis/lib/libosmoabis.so.6.0.1 libtool: install: (cd /build/deps/install/stow/libosmo-abis/lib && { ln -s -f libosmoabis.so.6.0.1 libosmoabis.so.6 || { rm -f libosmoabis.so.6 && ln -s libosmoabis.so.6.0.1 libosmoabis.so.6; }; }) libtool: install: (cd /build/deps/install/stow/libosmo-abis/lib && { ln -s -f libosmoabis.so.6.0.1 libosmoabis.so || { rm -f libosmoabis.so && ln -s libosmoabis.so.6.0.1 libosmoabis.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmoabis.lai /build/deps/install/stow/libosmo-abis/lib/libosmoabis.la libtool: install: /usr/bin/install -c .libs/libosmotrau.so.2.1.1 /build/deps/install/stow/libosmo-abis/lib/libosmotrau.so.2.1.1 libtool: install: (cd /build/deps/install/stow/libosmo-abis/lib && { ln -s -f libosmotrau.so.2.1.1 libosmotrau.so.2 || { rm -f libosmotrau.so.2 && ln -s libosmotrau.so.2.1.1 libosmotrau.so.2; }; }) libtool: install: (cd /build/deps/install/stow/libosmo-abis/lib && { ln -s -f libosmotrau.so.2.1.1 libosmotrau.so || { rm -f libosmotrau.so && ln -s libosmotrau.so.2.1.1 libosmotrau.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmotrau.lai /build/deps/install/stow/libosmo-abis/lib/libosmotrau.la libtool: install: /usr/bin/install -c .libs/libosmoabis.a /build/deps/install/stow/libosmo-abis/lib/libosmoabis.a libtool: install: chmod 644 /build/deps/install/stow/libosmo-abis/lib/libosmoabis.a libtool: install: ranlib /build/deps/install/stow/libosmo-abis/lib/libosmoabis.a libtool: install: /usr/bin/install -c .libs/libosmotrau.a /build/deps/install/stow/libosmo-abis/lib/libosmotrau.a libtool: install: chmod 644 /build/deps/install/stow/libosmo-abis/lib/libosmotrau.a libtool: install: ranlib /build/deps/install/stow/libosmo-abis/lib/libosmotrau.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmo-abis/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmo-abis/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory '/build/deps/libosmo-abis/src' make[2]: Leaving directory '/build/deps/libosmo-abis/src' Making install in tests make[2]: Entering directory '/build/deps/libosmo-abis/tests' make[3]: Entering directory '/build/deps/libosmo-abis/tests' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory '/build/deps/libosmo-abis/tests' make[2]: Leaving directory '/build/deps/libosmo-abis/tests' make[2]: Entering directory '/build/deps/libosmo-abis' make[3]: Entering directory '/build/deps/libosmo-abis' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-abis/lib/pkgconfig' /usr/bin/install -c -m 644 libosmoabis.pc libosmotrau.pc '/build/deps/install/stow/libosmo-abis/lib/pkgconfig' make[3]: Leaving directory '/build/deps/libosmo-abis' make[2]: Leaving directory '/build/deps/libosmo-abis' make[1]: Leaving directory '/build/deps/libosmo-abis' + STOW_DIR=/build/deps/install/stow stow --restow libosmo-abis Possible precedence issue with control flow operator at /usr/share/perl5/Stow.pm line 1736. + osmo-build-dep.sh libosmo-netif =============================== libosmo-netif =============================== + mkdir -p /build/deps + cd /build/deps + osmo-deps.sh libosmo-netif + project=libosmo-netif + branch=master + git branch -a + grep -c remotes/origin/master$ + [ x1 != x0 ] + branch=origin/master + test -d libosmo-netif + git clone git://git.osmocom.org/libosmo-netif libosmo-netif Cloning into 'libosmo-netif'... + cd libosmo-netif + git fetch --tags origin + git fetch origin + deps= osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD Your branch is up-to-date with 'origin/master'. + git clean -dxf + [ -d ] + [ -d layer1-headers ] + git checkout -f origin/master Note: checking out 'origin/master'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b new_branch_name HEAD is now at 7028d73... jibuf: fix indentation in line inside conditional clause + git rev-parse HEAD 7028d7387efc2e0fbac403de075c4c9c2d310f80 + cd libosmo-netif + mkdir -p /build/deps/install/stow + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `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' Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Oct 15 00:10:16 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 15 Oct 2018 00:10:16 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-openbsc_=C2=BB_--disable-iu,--enab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#2966?= Message-ID: <1396390964.60.1539562216582.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-openbsc" build number 2966 originally caused by: Started by upstream project "master-libosmo-sccp" build number 1625 originally caused by: Started by upstream project "master-libosmo-netif" build number 1177 originally caused by: Started by upstream project "master-libosmo-abis" build number 804 originally caused by: Started by upstream project "master-libosmocore" build number 522 originally caused by: Started by timer Building remotely on admin2-deb9build (obs osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/openbsc # timeout=10 Fetching upstream changes from git://git.osmocom.org/openbsc > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/openbsc +refs/heads/*:refs/remotes/origin/* Checking out Revision 297f7bbe2ba87d167558d8a05de5ec742c0d1f84 (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 297f7bbe2ba87d167558d8a05de5ec742c0d1f84 Commit message: "nat: Log state of pending transaction" > git rev-list --no-walk 297f7bbe2ba87d167558d8a05de5ec742c0d1f84 # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins5627384214019911956.sh + ARTIFACT_STORE=/home/osmocom-build/jenkins_build_artifact_store + mkdir -p /home/osmocom-build/jenkins_build_artifact_store + docker run --rm=true -e HOME=/build -e ARTIFACT_STORE=/artifact_store -e JOB_NAME=master-openbsc/IU=--disable-iu,MGCP=--enable-mgcp-transcoding,SMPP=--enable-smpp,label=osmocom-master-debian9 -e MAKE=make -e PARALLEL_MAKE=-j 4 -e IU=--disable-iu -e SMPP=--enable-smpp -e MGCP=--enable-mgcp-transcoding -e PATH=/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin -e OSMOPY_DEBUG_TCP_SOCKETS=1 -w /build -i -u build -v :/build -v /home/osmocom-build/bin:/build_bin -v /home/osmocom-build/jenkins_build_artifact_store:/artifact_store osmocom:amd64 /build/contrib/jenkins.sh docker: Cannot connect to the Docker daemon at unix:///var/run/docker.sock. Is the docker daemon running?. See 'docker run --help'. Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Oct 15 00:10:16 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 15 Oct 2018 00:10:16 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6170?= Message-ID: <719542424.61.1539562216982.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-osmo-sgsn" build number 6170 originally caused by: Started by upstream project "master-libosmo-sccp" build number 1625 originally caused by: Started by upstream project "master-libosmo-netif" build number 1177 originally caused by: Started by upstream project "master-libosmo-abis" build number 804 originally caused by: Started by upstream project "master-libosmocore" build number 522 originally caused by: Started by timer Building remotely on admin2-deb9build (obs osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-sgsn # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-sgsn > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/osmo-sgsn +refs/heads/*:refs/remotes/origin/* Checking out Revision e90b1977c8e20dbdecef4ebc6fc674604a7bb447 (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f e90b1977c8e20dbdecef4ebc6fc674604a7bb447 Commit message: "fix build: remove unused variable" > git rev-list --no-walk e90b1977c8e20dbdecef4ebc6fc674604a7bb447 # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins1949563368843948144.sh + docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE=-j 4 -e IU=--disable-iu -e PATH=/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin -e OSMOPY_DEBUG_TCP_SOCKETS=1 -w /build -i -u build -v :/build -v /home/osmocom-build/bin:/build_bin osmocom:amd64 /build/contrib/jenkins.sh docker: Cannot connect to the Docker daemon at unix:///var/run/docker.sock. Is the docker daemon running?. See 'docker run --help'. Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Oct 15 00:10:17 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 15 Oct 2018 00:10:17 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6170?= Message-ID: <771709107.62.1539562217771.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-osmo-sgsn" build number 6170 originally caused by: Started by upstream project "master-libosmo-sccp" build number 1625 originally caused by: Started by upstream project "master-libosmo-netif" build number 1177 originally caused by: Started by upstream project "master-libosmo-abis" build number 804 originally caused by: Started by upstream project "master-libosmocore" build number 522 originally caused by: Started by timer Building remotely on admin2-deb9build (obs osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-sgsn # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-sgsn > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/osmo-sgsn +refs/heads/*:refs/remotes/origin/* Checking out Revision e90b1977c8e20dbdecef4ebc6fc674604a7bb447 (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f e90b1977c8e20dbdecef4ebc6fc674604a7bb447 Commit message: "fix build: remove unused variable" > git rev-list --no-walk e90b1977c8e20dbdecef4ebc6fc674604a7bb447 # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins1800394042724092009.sh + docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE=-j 4 -e IU=--enable-iu -e PATH=/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin -e OSMOPY_DEBUG_TCP_SOCKETS=1 -w /build -i -u build -v :/build -v /home/osmocom-build/bin:/build_bin osmocom:amd64 /build/contrib/jenkins.sh docker: Cannot connect to the Docker daemon at unix:///var/run/docker.sock. Is the docker daemon running?. See 'docker run --help'. Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Oct 15 00:10:18 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 15 Oct 2018 00:10:18 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3792?= Message-ID: <2011938585.63.1539562218425.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-osmo-bsc" build number 3792 originally caused by: Started by upstream project "master-libosmo-sccp" build number 1625 originally caused by: Started by upstream project "master-libosmo-netif" build number 1177 originally caused by: Started by upstream project "master-libosmo-abis" build number 804 originally caused by: Started by upstream project "master-libosmocore" build number 522 originally caused by: Started by timer Building remotely on admin2-deb9build (obs osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-bsc # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-bsc > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/osmo-bsc +refs/heads/*:refs/remotes/origin/* Checking out Revision cd46adb91544acb42b0339028b23a152af019b5a (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f cd46adb91544acb42b0339028b23a152af019b5a Commit message: "handover_decision_2.c: drop redundant debug_candidate() args" > git rev-list --no-walk cd46adb91544acb42b0339028b23a152af019b5a # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins3616805531012014209.sh + docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE=-j 4 -e PATH=/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin -e OSMOPY_DEBUG_TCP_SOCKETS=1 -w /build -i -u build -v :/build -v /home/osmocom-build/bin:/build_bin osmocom:amd64 /build/contrib/jenkins.sh docker: Cannot connect to the Docker daemon at unix:///var/run/docker.sock. Is the docker daemon running?. See 'docker run --help'. Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Oct 15 00:11:29 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 15 Oct 2018 00:11:29 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6283?= Message-ID: <778698663.64.1539562289722.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 927.48 KB...] CC RANAP_ProtocolIE-FieldPair.lo CC RANAP_ProtocolIE-ContainerPair.lo CC RANAP_RAB-IE-ContainerList.lo CC RANAP_RAB-IE-ContainerPairList.lo CC RANAP_ProtocolError-IE-ContainerList.lo CC RANAP_IuSigConId-IE-ContainerList.lo CC RANAP_DirectTransfer-IE-ContainerList.lo CC RANAP_DataVolumeReportList.lo CC RANAP_RAB-ReleasedList-IuRelComp.lo CC RANAP_RAB-RelocationReleaseList.lo CC RANAP_RAB-DataForwardingList.lo CC RANAP_RAB-SetupList-RelocReq.lo CC RANAP_RAB-SetupList-RelocReqAck.lo CC RANAP_RAB-FailedList.lo CC RANAP_RAB-ContextList.lo CC RANAP_RABs-ContextFailedtoTransferList.lo CC RANAP_RAB-DataVolumeReportRequestList.lo CC RANAP_RAB-DataVolumeReportRequestItem.lo CC RANAP_RABs-failed-to-reportList.lo CC RANAP_RAB-SetupList-EnhancedRelocCompleteReq.lo CC RANAP_RAB-SetupList-EnhancedRelocCompleteRes.lo CC RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.lo CC RANAP_RAB-SetupOrModifiedList.lo CC RANAP_RAB-ReleasedList.lo CC RANAP_RAB-QueuedList.lo CC RANAP_RAB-ContextList-RANAP-RelocInf.lo CC RANAP_RAB-SetupList-EnhRelocInfoReq.lo CC RANAP_RAB-SetupList-EnhRelocInfoRes.lo CC RANAP_RAB-FailedList-EnhRelocInfoRes.lo CC RANAP_RAB-ModifyList.lo CC RANAP_RAB-DataVolumeReportList.lo CC RANAP_RAB-DataVolumeReportItem.lo CC RANAP_RAB-ReleasedItem-IuRelComp.lo CC RANAP_RAB-RelocationReleaseItem.lo CC RANAP_RAB-DataForwardingItem.lo CC RANAP_RAB-DataForwardingItem-SRNS-CtxReq.lo CC RANAP_RAB-SetupItem-RelocReq.lo In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_DataVolumeList.h:14, from ../../include/osmocom/ranap/RANAP_RAB-DataVolumeReportItem.h:15, from RANAP_RAB-DataVolumeReportItem.c:7: ../../include/osmocom/ranap/RANAP_DataVolumeList.h:27:23: warning: 'struct MemberH' declared inside parameter list A_SEQUENCE_OF(struct MemberH { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_DataVolumeList.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberH { ^ ../../include/osmocom/ranap/RANAP_DataVolumeList.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberH { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_DataVolumeList.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberH { ^ CC RANAP_UserPlaneInformation.lo CC RANAP_CNMBMSLinkingInformation.lo CC RANAP_JoinedMBMSBearerService-IEs.lo CC RANAP_RAB-SetupItem-RelocReqAck.lo CC RANAP_RAB-FailedItem.lo CC RANAP_RAB-ContextItem.lo CC RANAP_RABs-ContextFailedtoTransferItem.lo CC RANAP_RABs-failed-to-reportItem.lo In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h:14, from ../../include/osmocom/ranap/RANAP_CNMBMSLinkingInformation.h:14, from RANAP_CNMBMSLinkingInformation.c:7: ../../include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h:27:23: warning: 'struct MemberF' declared inside parameter list A_SEQUENCE_OF(struct MemberF { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberF { ^ ../../include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberF { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberF { ^ In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h:14, from RANAP_JoinedMBMSBearerService-IEs.c:7: ../../include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h:27:23: warning: 'struct MemberF' declared inside parameter list A_SEQUENCE_OF(struct MemberF { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberF { ^ ../../include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberF { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberF { ^ CC RANAP_ResetResourceList.lo CC RANAP_ResetResourceItem.lo CC RANAP_ResetResourceAckList.lo CC RANAP_ResetResourceAckItem.lo CC RANAP_RAB-ReleaseItem.lo CC RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.lo CC RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.lo CC RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.lo CC RANAP_RAB-SetupOrModifyItemFirst.lo CC RANAP_TransportLayerInformation.lo CC RANAP_RAB-SetupOrModifyItemSecond.lo CC RANAP_RAB-SetupOrModifiedItem.lo CC RANAP_RAB-ReleasedItem.lo CC RANAP_DataVolumeList.lo CC RANAP_RAB-QueuedItem.lo CC RANAP_RAB-ReleaseFailedList.lo In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_DataVolumeList.h:14, from ../../include/osmocom/ranap/RANAP_RAB-SetupOrModifiedItem.h:17, from RANAP_RAB-SetupOrModifiedItem.c:7: ../../include/osmocom/ranap/RANAP_DataVolumeList.h:27:23: warning: 'struct MemberH' declared inside parameter list A_SEQUENCE_OF(struct MemberH { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_DataVolumeList.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberH { ^ ../../include/osmocom/ranap/RANAP_DataVolumeList.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberH { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_DataVolumeList.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberH { ^ In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_DataVolumeList.h:14, from RANAP_DataVolumeList.c:7: ../../include/osmocom/ranap/RANAP_DataVolumeList.h:27:23: warning: 'struct MemberH' declared inside parameter list A_SEQUENCE_OF(struct MemberH { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_DataVolumeList.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberH { ^ ../../include/osmocom/ranap/RANAP_DataVolumeList.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberH { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_DataVolumeList.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberH { ^ In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_DataVolumeList.h:14, from ../../include/osmocom/ranap/RANAP_RAB-ReleasedItem.h:15, from RANAP_RAB-ReleasedItem.c:7: ../../include/osmocom/ranap/RANAP_DataVolumeList.h:27:23: warning: 'struct MemberH' declared inside parameter list A_SEQUENCE_OF(struct MemberH { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_DataVolumeList.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberH { ^ ../../include/osmocom/ranap/RANAP_DataVolumeList.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberH { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_DataVolumeList.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberH { ^ CC RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.lo CC RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.lo CC RANAP_DirectTransferInformationItem-RANAP-RelocInf.lo CC RANAP_RAB-ContextItem-RANAP-RelocInf.lo CC RANAP_TNLInformationEnhRelInfoReq.lo CC RANAP_RAB-SetupItem-EnhRelocInfoReq.lo CC RANAP_RAB-SetupItem-EnhRelocInfoRes.lo CC RANAP_RAB-FailedItem-EnhRelocInfoRes.lo CC RANAP_TNLInformationEnhRelInfoRes.lo CC RANAP_RAB-ModifyItem.lo CC RANAP_MBMSSynchronisationInformation.lo CC RANAP_LeftMBMSBearerService-IEs.lo CC RANAP_UnsuccessfulLinking-IEs.lo In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h:14, from RANAP_LeftMBMSBearerService-IEs.c:7: ../../include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h:26:23: warning: 'struct MemberK' declared inside parameter list A_SEQUENCE_OF(struct MemberK { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h:26:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberK { ^ ../../include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h:26:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberK { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h:26:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberK { ^ In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h:14, from RANAP_UnsuccessfulLinking-IEs.c:7: ../../include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h:27:23: warning: 'struct MemberD' declared inside parameter list A_SEQUENCE_OF(struct MemberD { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberD { ^ ../../include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberD { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberD { ^ CCLD libosmo-asn1-ranap.la Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Oct 15 00:11:30 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 15 Oct 2018 00:11:30 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6284?= In-Reply-To: <778698663.64.1539562289722.JavaMail.jenkins@jenkins.osmocom.org> References: <778698663.64.1539562289722.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1634482833.65.1539562291015.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 762.76 KB...] test_pdu/Makefile.am:60: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:60: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:60: warning: source file '$(TESTPDU_SOURCE_DIR)/deliver_sm_test.c' is in a subdirectory, test_pdu/Makefile.am:60: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:64: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:64: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:64: warning: source file '$(TESTPDU_SOURCE_DIR)/enquire_link_resp_test.c' is in a subdirectory, test_pdu/Makefile.am:64: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:68: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:68: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:68: warning: source file '$(TESTPDU_SOURCE_DIR)/enquire_link_test.c' is in a subdirectory, test_pdu/Makefile.am:68: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_apps/Makefile.am:17: warning: source file '$(TESTAPPS_SOURCE_DIR)/tcp.c' is in a subdirectory, test_apps/Makefile.am:17: but option 'subdir-objects' is disabled binaries/Makefile.am:9: 'test_apps/Makefile.am' included from here test_apps/Makefile.am:17: warning: source file '$(TESTAPPS_SOURCE_DIR)/smpp.c' is in a subdirectory, test_apps/Makefile.am:17: but option 'subdir-objects' is disabled binaries/Makefile.am:9: 'test_apps/Makefile.am' included from here test_apps/Makefile.am:17: warning: source file '$(TESTAPPS_SOURCE_DIR)/esme.c' is in a subdirectory, test_apps/Makefile.am:17: but option 'subdir-objects' is disabled binaries/Makefile.am:9: 'test_apps/Makefile.am' included from here test_pdu/Makefile.am:72: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:72: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:72: warning: source file '$(TESTPDU_SOURCE_DIR)/generic_nack_test.c' is in a subdirectory, test_pdu/Makefile.am:72: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:76: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:76: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:76: warning: source file '$(TESTPDU_SOURCE_DIR)/outbind_test.c' is in a subdirectory, test_pdu/Makefile.am:76: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:80: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:80: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:80: warning: source file '$(TESTPDU_SOURCE_DIR)/query_sm_resp_test.c' is in a subdirectory, test_pdu/Makefile.am:80: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:84: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:84: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:84: warning: source file '$(TESTPDU_SOURCE_DIR)/query_sm_test.c' is in a subdirectory, test_pdu/Makefile.am:84: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:88: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:88: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:88: warning: source file '$(TESTPDU_SOURCE_DIR)/replace_sm_resp_test.c' is in a subdirectory, test_pdu/Makefile.am:88: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:92: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:92: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:92: warning: source file '$(TESTPDU_SOURCE_DIR)/replace_sm_test.c' is in a subdirectory, test_pdu/Makefile.am:92: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_apps/Makefile.am:4: warning: source file '$(TESTAPPS_SOURCE_DIR)/tcp.c' is in a subdirectory, test_apps/Makefile.am:4: but option 'subdir-objects' is disabled binaries/Makefile.am:9: 'test_apps/Makefile.am' included from here test_apps/Makefile.am:4: warning: source file '$(TESTAPPS_SOURCE_DIR)/smpp.c' is in a subdirectory, test_apps/Makefile.am:4: but option 'subdir-objects' is disabled binaries/Makefile.am:9: 'test_apps/Makefile.am' included from here test_apps/Makefile.am:4: warning: source file '$(TESTAPPS_SOURCE_DIR)/sendwp.c' is in a subdirectory, test_apps/Makefile.am:4: but option 'subdir-objects' is disabled binaries/Makefile.am:9: 'test_apps/Makefile.am' included from here test_pdu/Makefile.am:4: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:4: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:4: warning: source file '$(TESTPDU_SOURCE_DIR)/submit_multi_resp_test.c' is in a subdirectory, test_pdu/Makefile.am:4: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:8: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:8: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:8: warning: source file '$(TESTPDU_SOURCE_DIR)/submit_multi_test.c' is in a subdirectory, test_pdu/Makefile.am:8: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:96: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:96: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:96: warning: source file '$(TESTPDU_SOURCE_DIR)/submit_sm_resp_test.c' is in a subdirectory, test_pdu/Makefile.am:96: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:100: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:100: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:100: warning: source file '$(TESTPDU_SOURCE_DIR)/submit_sm_test.c' is in a subdirectory, test_pdu/Makefile.am:100: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:104: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:104: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:104: warning: source file '$(TESTPDU_SOURCE_DIR)/unbind_resp_test.c' is in a subdirectory, test_pdu/Makefile.am:104: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:108: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:108: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:108: warning: source file '$(TESTPDU_SOURCE_DIR)/unbind_test.c' is in a subdirectory, test_pdu/Makefile.am:108: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here binaries/Makefile.am: installing 'aux_config/depcomp' test_apps/Makefile.am:26: warning: variable 'analizer_SOURCES' is defined but no program or test_apps/Makefile.am:26: library has 'analizer' as canonical name (possible typo) test_apps/Makefile.am:17: warning: variable 'esme_SOURCES' is defined but no program or test_apps/Makefile.am:17: library has 'esme' as canonical name (possible typo) test_apps/Makefile.am:4: warning: variable 'sendwp_SOURCES' is defined but no program or test_apps/Makefile.am:4: library has 'sendwp' as canonical name (possible typo) test_apps/Makefile.am:30: warning: variable 'analizer_LDFLAGS' is defined but no program or test_apps/Makefile.am:30: library has 'analizer' as canonical name (possible typo) test_apps/Makefile.am:24: warning: variable 'esme_LDFLAGS' is defined but no program or test_apps/Makefile.am:24: library has 'esme' as canonical name (possible typo) test_apps/Makefile.am:11: warning: variable 'sendwp_LDFLAGS' is defined but no program or test_apps/Makefile.am:11: library has 'sendwp' as canonical name (possible typo) + ./configure --prefix=/build/deps/install/stow/libsmpp34 --with-systemdsystemunitdir=/build/deps/install/stow/libsmpp34/lib/systemd/system configure: WARNING: unrecognized options: --with-systemdsystemunitdir 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 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-unknown-linux-gnu checking host system type... x86_64-unknown-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 whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-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 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 checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking for stdlib.h... (cached) yes checking netinet/in.h usability... yes checking netinet/in.h presence... yes checking for netinet/in.h... yes checking for stdint.h... (cached) yes checking for string.h... (cached) yes checking for LIBXML2... no checking for stdlib.h... (cached) yes checking for GNU libc compatible malloc... yes checking for memset... yes CFLAGS="-g -O2" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating Makefile config.status: creating def_frame/Makefile config.status: creating def_list/Makefile config.status: creating binaries/Makefile config.status: creating test_apps/Makefile config.status: creating libsmpp34.pc config.status: creating aux_config/config.h config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make install echo 1.13.0.1-16ea > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libsmpp34' Making install in binaries make[2]: Entering directory '/build/deps/libsmpp34/binaries' /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_dumpBuf.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_dumpBuf.Tpo -c -o libsmpp34_la-smpp34_dumpBuf.lo `test -f '../src/smpp34_dumpBuf.c' || echo './'`../src/smpp34_dumpBuf.c libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_dumpBuf.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_dumpBuf.Tpo -c ../src/smpp34_dumpBuf.c -fPIC -DPIC -o .libs/libsmpp34_la-smpp34_dumpBuf.o libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_dumpBuf.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_dumpBuf.Tpo -c ../src/smpp34_dumpBuf.c -o libsmpp34_la-smpp34_dumpBuf.o >/dev/null 2>&1 mv -f .deps/libsmpp34_la-smpp34_dumpBuf.Tpo .deps/libsmpp34_la-smpp34_dumpBuf.Plo /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_dumpPdu.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_dumpPdu.Tpo -c -o libsmpp34_la-smpp34_dumpPdu.lo `test -f '../src/smpp34_dumpPdu.c' || echo './'`../src/smpp34_dumpPdu.c libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_dumpPdu.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_dumpPdu.Tpo -c ../src/smpp34_dumpPdu.c -fPIC -DPIC -o .libs/libsmpp34_la-smpp34_dumpPdu.o libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_dumpPdu.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_dumpPdu.Tpo -c ../src/smpp34_dumpPdu.c -o libsmpp34_la-smpp34_dumpPdu.o >/dev/null 2>&1 mv -f .deps/libsmpp34_la-smpp34_dumpPdu.Tpo .deps/libsmpp34_la-smpp34_dumpPdu.Plo /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_pack.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_pack.Tpo -c -o libsmpp34_la-smpp34_pack.lo `test -f '../src/smpp34_pack.c' || echo './'`../src/smpp34_pack.c libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_pack.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_pack.Tpo -c ../src/smpp34_pack.c -fPIC -DPIC -o .libs/libsmpp34_la-smpp34_pack.o libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_pack.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_pack.Tpo -c ../src/smpp34_pack.c -o libsmpp34_la-smpp34_pack.o >/dev/null 2>&1 mv -f .deps/libsmpp34_la-smpp34_pack.Tpo .deps/libsmpp34_la-smpp34_pack.Plo /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_unpack.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_unpack.Tpo -c -o libsmpp34_la-smpp34_unpack.lo `test -f '../src/smpp34_unpack.c' || echo './'`../src/smpp34_unpack.c libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_unpack.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_unpack.Tpo -c ../src/smpp34_unpack.c -fPIC -DPIC -o .libs/libsmpp34_la-smpp34_unpack.o libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_unpack.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_unpack.Tpo -c ../src/smpp34_unpack.c -o libsmpp34_la-smpp34_unpack.o >/dev/null 2>&1 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Oct 15 00:13:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 15 Oct 2018 00:13:02 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-remsim_=C2=BB_a1=3Ddef?= =?UTF-8?Q?ault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3?= In-Reply-To: <138148742.58.1539561318860.JavaMail.jenkins@jenkins.osmocom.org> References: <138148742.58.1539561318860.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <560316713.66.1539562382617.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 226.24 KB...] cd && tar xf html.tar && rm -f html.tar make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' + STOW_DIR= stow --restow libosmo-netif + set +x =============================== osmo-remsim =============================== + autoreconf --install --force aclocal: warning: couldn't open directory 'm4': No such file or directory 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' libtoolize: Consider adding '-I m4' to ACLOCAL_AMFLAGS in Makefile.am. configure.ac:8: installing './compile' configure.ac:8: installing './config.guess' configure.ac:8: installing './config.sub' configure.ac:10: installing './install-sh' configure.ac:10: installing './missing' src/Makefile.am:36: warning: source file 'simtrace2/apdu_dispatch.c' is in a subdirectory, src/Makefile.am:36: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. src/Makefile.am:36: warning: source file 'simtrace2/simtrace2-discovery.c' is in a subdirectory, src/Makefile.am:36: but option 'subdir-objects' is disabled src/Makefile.am:36: warning: source file 'simtrace2/libusb_util.c' is in a subdirectory, src/Makefile.am:36: but option 'subdir-objects' is disabled src/Makefile.am: installing './depcomp' + ./configure --enable-sanitize 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 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 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 for gawk... gawk 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 checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes 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 whether make sets $(MAKE)... yes checking for style of include used by make... GNU checking whether make supports nested variables... yes checking whether UID '1000' is supported by ustar format... yes checking whether GID '1000' is supported by ustar format... yes checking how to create a ustar tar archive... gnutar checking dependency style of gcc... gcc3 checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking whether gcc understands -c and -o together... (cached) yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for OSMOCORE... yes checking for OSMOGSM... yes checking for OSMOABIS... yes checking for OSMOSIM... yes checking for PCSC... yes checking for USB... yes checking for ANSI C header files... (cached) yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Wall" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating Makefile config.status: creating src/Makefile config.status: creating src/rspro/Makefile config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/rspro/Makefile config.status: executing libtool commands config.status: executing depfiles commands + make -j 8 echo 0.0.74-61df > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory ' Making all in src make[2]: Entering directory ' Making all in rspro make[3]: Entering directory ' CC ATR.lo CC BankId.lo CC ClientSlotStatusInd.lo CC ComponentIdentity.lo CC BankSlotStatusInd.lo CC ClientId.lo CC ClientSlot.lo CC BankSlot.lo CC ComponentName.lo CC ComponentType.lo CC ConfigClientReq.lo CC ConfigClientRes.lo CC ConnectBankReq.lo CC ConnectBankRes.lo CC ConnectClientReq.lo CC ConnectClientRes.lo CC CreateMappingReq.lo CC CreateMappingRes.lo CC IpAddress.lo CC IpPort.lo CC Ipv4Address.lo CC Ipv6Address.lo CC OperationTag.lo CC PortNumber.lo CC RemoveMappingReq.lo CC RemoveMappingRes.lo CC ResultCode.lo CC RsproPDU.lo CC RsproPDUchoice.lo CC SetAtrReq.lo CC SetAtrRes.lo CC SlotNumber.lo CC SlotPhysStatus.lo CC TpduCardToModem.lo CC TpduFlags.lo CC BOOLEAN.lo CC TpduModemToCard.lo CC IA5String.lo CC INTEGER.lo CC NativeEnumerated.lo CC NativeInteger.lo CC constr_CHOICE.lo CC constr_SEQUENCE.lo CC OCTET_STRING.lo CC BIT_STRING.lo CC asn_codecs_prim.lo CC ber_tlv_length.lo CC ber_tlv_tag.lo CC ber_decoder.lo CC der_encoder.lo CC constr_TYPE.lo CC constraints.lo CC xer_support.lo CC xer_decoder.lo CC xer_encoder.lo CC per_support.lo CC per_decoder.lo CC per_encoder.lo CC per_opentype.lo CCLD libosmo-asn1-rspro.la ar: `u' modifier ignored since `D' is the default (see `U') make[3]: Leaving directory ' make[3]: Entering directory ' CC rspro_util.lo CC driver_core.o CC driver_pcsc.o CC main.o CC bankd_slotmap.o CC remsim_client.o CC bankd_main.o CC bankd_pcsc.o bankd_pcsc.c:6:17: fatal error: csv.h: No such file or directory #include ^ compilation terminated. Makefile:616: recipe for target 'bankd_pcsc.o' failed make[3]: *** [bankd_pcsc.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory ' Makefile:691: recipe for target 'all-recursive' failed make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory ' Makefile:397: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:344: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Oct 15 00:15:34 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 15 Oct 2018 00:15:34 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-remsim_=C2=BB_a?= =?UTF-8?Q?1=3Ddefault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4?= In-Reply-To: <560316713.66.1539562382617.JavaMail.jenkins@jenkins.osmocom.org> References: <560316713.66.1539562382617.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <879214045.67.1539562534926.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Oct 15 00:18:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 00:18:40 +0000 Subject: Change in osmo-remsim[master]: libusb_util.c: Avoid gcc warning about strncpy() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11345 ) Change subject: libusb_util.c: Avoid gcc warning about strncpy() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iae13f7a4cf89230f308eb0183d993d7c31024907 Gerrit-Change-Number: 11345 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 00:18:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 00:19:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 00:19:06 +0000 Subject: Change in osmo-remsim[master]: add rspro_gen_{Remove, Create}Mapping{Req, Res}() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11353 ) Change subject: add rspro_gen_{Remove,Create}Mapping{Req,Res}() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If86d34a1e723b7202b5fa2c40ea1d0b152381773 Gerrit-Change-Number: 11353 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 00:19:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 00:19:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 00:19:14 +0000 Subject: Change in osmo-remsim[master]: libusb_util.c: Avoid gcc warning about strncpy() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11345 ) Change subject: libusb_util.c: Avoid gcc warning about strncpy() ...................................................................... libusb_util.c: Avoid gcc warning about strncpy() What we're doing is actually legal: We copy the full size of the destination array, and then overwrite the last byte with NUL. However, gcc isn't smart enough to see that: libusb_util.c:162:5: warning: ?strncpy? specified bound 20 equals destination size [-Wstringop-truncation] strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Let's copy one byte less to make it happy. Change-Id: Iae13f7a4cf89230f308eb0183d993d7c31024907 --- M src/simtrace2/libusb_util.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/simtrace2/libusb_util.c b/src/simtrace2/libusb_util.c index cb435e2..45e3f50 100644 --- a/src/simtrace2/libusb_util.c +++ b/src/simtrace2/libusb_util.c @@ -159,7 +159,7 @@ out[out_idx].vendor = dev_desc.idVendor; out[out_idx].product = dev_desc.idProduct; out[out_idx].addr = addr; - strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)); + strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)-1); out[out_idx].path[sizeof(out[out_idx].path)-1] = '\0'; out[out_idx].configuration = conf_desc->bConfigurationValue; out[out_idx].interface = if_desc->bInterfaceNumber; -- To view, visit https://gerrit.osmocom.org/11345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iae13f7a4cf89230f308eb0183d993d7c31024907 Gerrit-Change-Number: 11345 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 00:19:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 00:19:29 +0000 Subject: Change in osmo-remsim[master]: configure.ac: Explicitly check for -lcsv and csv.h In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11354 ) Change subject: configure.ac: Explicitly check for -lcsv and csv.h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I52260a4e3f7a12039f054a55a211045085f1c5ff Gerrit-Change-Number: 11354 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 00:19:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 00:19:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 00:19:31 +0000 Subject: Change in osmo-remsim[master]: configure.ac: Explicitly check for -lcsv and csv.h In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11354 ) Change subject: configure.ac: Explicitly check for -lcsv and csv.h ...................................................................... configure.ac: Explicitly check for -lcsv and csv.h unfortuantely libcsv doesn't ship with a pkg-config file, so we have to resort on those manual checks Change-Id: I52260a4e3f7a12039f054a55a211045085f1c5ff --- M configure.ac 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index ed3540c..2c30dfb 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,9 @@ fi PKG_PROG_PKG_CONFIG([0.20]) +AC_CHECK_LIB(csv, csv_init, LIBS="$LIBS -lcsv", [AC_MSG_ERROR([*** libcsv library not found!])]) +AC_CHECK_HEADERS([csv.h]) + PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 0.11.0) PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0) PKG_CHECK_MODULES(OSMOABIS, libosmoabis) -- To view, visit https://gerrit.osmocom.org/11354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I52260a4e3f7a12039f054a55a211045085f1c5ff Gerrit-Change-Number: 11354 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 00:20:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 00:20:05 +0000 Subject: Change in osmo-ci[master]: Add osmo-remsim to gerrit + master build verification Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11355 Change subject: Add osmo-remsim to gerrit + master build verification ...................................................................... Add osmo-remsim to gerrit + master build verification ... which introduces a requirement for libcsv-dev in ansible. Change-Id: I2ac65947ce9ecc071f774dc4df0f08c99c16c632 --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml M jobs/gerrit-verifications.yml M jobs/master-builds.yml 3 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/55/11355/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index f6c256d..73623e3 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -26,6 +26,7 @@ - git - git-buildpackage - graphviz + - libcsv-dev - libtool - libboost-all-dev - make diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 52a5d1d..f3bde2e 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -182,6 +182,7 @@ - osmocom-bb - osmo-tetra - osmo-sysmon + - osmo-remsim - simtrace2 - gapk diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 209b0c5..1c36d6f 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -327,7 +327,7 @@ - osmocom-bb - osmo-sysmon - + - osmo-remsim - simtrace2: cmd: > # keep first line with less indent to preserve newlines -- To view, visit https://gerrit.osmocom.org/11355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2ac65947ce9ecc071f774dc4df0f08c99c16c632 Gerrit-Change-Number: 11355 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 00:20:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 00:20:27 +0000 Subject: Change in osmo-ci[master]: Add osmo-remsim to gerrit + master build verification In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11355 ) Change subject: Add osmo-remsim to gerrit + master build verification ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2ac65947ce9ecc071f774dc4df0f08c99c16c632 Gerrit-Change-Number: 11355 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Mon, 15 Oct 2018 00:20:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 00:20:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 00:20:29 +0000 Subject: Change in osmo-ci[master]: Add osmo-remsim to gerrit + master build verification In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11355 ) Change subject: Add osmo-remsim to gerrit + master build verification ...................................................................... Add osmo-remsim to gerrit + master build verification ... which introduces a requirement for libcsv-dev in ansible. Change-Id: I2ac65947ce9ecc071f774dc4df0f08c99c16c632 --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml M jobs/gerrit-verifications.yml M jobs/master-builds.yml 3 files changed, 3 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index f6c256d..73623e3 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -26,6 +26,7 @@ - git - git-buildpackage - graphviz + - libcsv-dev - libtool - libboost-all-dev - make diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 52a5d1d..f3bde2e 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -182,6 +182,7 @@ - osmocom-bb - osmo-tetra - osmo-sysmon + - osmo-remsim - simtrace2 - gapk diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 209b0c5..1c36d6f 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -327,7 +327,7 @@ - osmocom-bb - osmo-sysmon - + - osmo-remsim - simtrace2: cmd: > # keep first line with less indent to preserve newlines -- To view, visit https://gerrit.osmocom.org/11355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2ac65947ce9ecc071f774dc4df0f08c99c16c632 Gerrit-Change-Number: 11355 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 00:20:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 00:20:40 +0000 Subject: Change in osmo-remsim[master]: move DMAIN definition to new debug.h In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11346 ) Change subject: move DMAIN definition to new debug.h ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I68ffd64e1f32b90206f98c7f3ea707d7b2e11e61 Gerrit-Change-Number: 11346 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 00:20:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 00:20:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 00:20:42 +0000 Subject: Change in osmo-remsim[master]: move DMAIN definition to new debug.h In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11346 ) Change subject: move DMAIN definition to new debug.h ...................................................................... move DMAIN definition to new debug.h This way both client.h and bankd.h don't conflict with each other Change-Id: I68ffd64e1f32b90206f98c7f3ea707d7b2e11e61 --- M src/Makefile.am M src/bankd.h M src/client.h A src/debug.h 4 files changed, 8 insertions(+), 9 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/Makefile.am b/src/Makefile.am index 12b1e7b..ca799ce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,7 +12,7 @@ rspro/libosmo-asn1-rspro.la libosmo_rspro_la_SOURCES = rspro_util.c -noinst_HEADERS = bankd.h client.h internal.h rspro_util.h \ +noinst_HEADERS = debug.h bankd.h client.h internal.h rspro_util.h \ simtrace2/apdu_dispatch.h \ simtrace2/libusb_util.h \ simtrace2/simtrace2-discovery.h \ diff --git a/src/bankd.h b/src/bankd.h index 86a66b9..86b75cc 100644 --- a/src/bankd.h +++ b/src/bankd.h @@ -13,10 +13,7 @@ #include #include "rspro_util.h" - -enum { - DMAIN, -}; +#include "debug.h" struct bankd; diff --git a/src/client.h b/src/client.h index b772a20..df90404 100644 --- a/src/client.h +++ b/src/client.h @@ -4,10 +4,7 @@ #include #include "rspro_util.h" - -enum { - DMAIN, -}; +#include "debug.h" /* fsm.c */ diff --git a/src/debug.h b/src/debug.h new file mode 100644 index 0000000..187d895 --- /dev/null +++ b/src/debug.h @@ -0,0 +1,5 @@ +#pragma once + +enum { + DMAIN, +}; -- To view, visit https://gerrit.osmocom.org/11346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I68ffd64e1f32b90206f98c7f3ea707d7b2e11e61 Gerrit-Change-Number: 11346 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Oct 15 00:21:01 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 15 Oct 2018 00:21:01 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--dis?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6171?= In-Reply-To: <719542424.61.1539562216982.JavaMail.jenkins@jenkins.osmocom.org> References: <719542424.61.1539562216982.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <502573839.68.1539562861931.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon Oct 15 00:22:14 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 15 Oct 2018 00:22:14 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--en?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6171?= In-Reply-To: <771709107.62.1539562217771.JavaMail.jenkins@jenkins.osmocom.org> References: <771709107.62.1539562217771.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1619887447.69.1539562934091.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon Oct 15 00:23:37 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 15 Oct 2018 00:23:37 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--ena?= =?UTF-8?Q?ble-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6285?= In-Reply-To: <1634482833.65.1539562291015.JavaMail.jenkins@jenkins.osmocom.org> References: <1634482833.65.1539562291015.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <964241668.70.1539563017590.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon Oct 15 00:25:12 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 15 Oct 2018 00:25:12 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-remsim_=C2=BB_a1=3Ddef?= =?UTF-8?Q?ault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5?= Message-ID: <1407666144.71.1539563112694.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [laforge] libusb_util.c: Avoid gcc warning about strncpy() [laforge] configure.ac: Explicitly check for -lcsv and csv.h [laforge] move DMAIN definition to new debug.h ------------------------------------------ [...truncated 253.90 KB...] :83: warning: Member list (variable) of class osmux_out_handle is not documented. :86: warning: Member tx_cb)(struct msgb *msg, void *data) (variable) of class osmux_out_handle is not documented. :87: warning: Member data (variable) of class osmux_out_handle is not documented. :402: warning: Member timer (variable) of class osmux_tx_handle is not documented. :925: warning: Member msg (variable) of class osmux_tx_handle is not documented. :926: warning: Member tx_cb)(struct msgb *msg, void *data) (variable) of class osmux_tx_handle is not documented. :927: warning: Member data (variable) of class osmux_tx_handle is not documented. :47: warning: Member byte0 (variable) of class rtcp_hdr is not documented. :48: warning: Member type (variable) of class rtcp_hdr is not documented. :49: warning: Member length (variable) of class rtcp_hdr is not documented. :23: warning: Member sequence (variable) of class rtp_hdr is not documented. :24: warning: Member timestamp (variable) of class rtp_hdr is not documented. :25: warning: Member ssrc (variable) of class rtp_hdr is not documented. :26: warning: Member data[0] (variable) of class rtp_hdr is not documented. :41: warning: Member by_profile (variable) of class rtp_x_hdr is not documented. :42: warning: Member length (variable) of class rtp_x_hdr is not documented. g source references... Adding xrefitems... Sorting member lists... Computing dependencies between directories... Generating citations page... Counting data structures... Resolving user defined references... Finding anchors and sections in the documentation... Transferring function references... Combining using relations... Adding members to index pages... Generating style sheet... Generating search indices... Generating example documentation... Generating file sources... Generating code for file include/osmocom/netif/amr.h... Generating code for file include/osmocom/netif/datagram.h... Generating code for file include/osmocom/netif/ipa.h... Generating code for file include/osmocom/netif/ipa_unit.h... Generating code for file include/osmocom/netif/jibuf.h... Generating code for file include/osmocom/netif/osmux.h... Generating code for file include/osmocom/netif/rs232.h... Generating code for file include/osmocom/netif/rtp.h... Generating code for file include/osmocom/netif/stream.h... Parsing code for file src/amr.c... Parsing code for file src/datagram.c... Parsing code for file src/ipa.c... Parsing code for file src/ipa_unit.c... Parsing code for file src/jibuf.c... Parsing code for file src/osmux.c... Parsing code for file src/rs232.c... Parsing code for file src/rtp.c... Parsing code for file src/stream.c... Generating file documentation... Generating docs for file include/osmocom/netif/jibuf.h... Generating docs for file include/osmocom/netif/osmux.h... Generating docs for file src/datagram.c... Generating docs for file src/jibuf.c... Generating docs for file src/osmux.c... Generating docs for file src/stream.c... Generating page documentation... Generating group documentation... Generating class documentation... Generating docs for compound amr_hdr... Generating docs for compound baudrate2termbits... Generating docs for compound ipa_head... Generating docs for compound ipa_head_ext... Generating docs for compound osmo_dgram... Generating docs for compound osmo_dgram_rx... Generating docs for compound osmo_dgram_tx... Generating docs for compound osmo_ipa_unit... Generating docs for compound osmo_jibuf... Generating docs for compound osmo_jibuf_msgb_cb... Generating docs for compound osmo_rs232... Generating docs for compound osmo_rtp_handle... Generating docs for compound osmo_stream_cli... Generating docs for compound osmo_stream_srv... Generating docs for compound osmo_stream_srv_link... Generating docs for compound osmux_batch... Generating docs for compound osmux_circuit... Generating docs for compound osmux_hdr... Generating docs for compound osmux_in_handle... Generating docs for compound osmux_input_state... Generating docs for compound osmux_out_handle... Generating docs for compound osmux_tx_handle... Generating docs for compound rtcp_hdr... Generating docs for compound rtp_hdr... Generating docs for compound rtp_x_hdr... Generating namespace index... Generating graph info page... Generating directory documentation... Generating index page... Generating page index... Generating module index... Generating namespace index... Generating namespace member index... Generating annotated compound index... Generating alphabetical compound index... Generating hierarchical class index... Generating member index... Generating file index... Generating file member index... Generating example index... finalizing index lists... writing tag file... lookup cache used 854/65536 hits=5683 misses=868 finished... cd ./doc && tar cf html.tar html make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /usr/bin/install -c -m 644 libosmo-netif.pc ' make install-data-hook make[4]: Entering directory ' cd && tar xf html.tar && rm -f html.tar make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' + STOW_DIR= stow --restow libosmo-netif + set +x =============================== osmo-remsim =============================== + autoreconf --install --force aclocal: warning: couldn't open directory 'm4': No such file or directory 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' libtoolize: Consider adding '-I m4' to ACLOCAL_AMFLAGS in Makefile.am. configure.ac:8: installing './compile' configure.ac:8: installing './config.guess' configure.ac:8: installing './config.sub' configure.ac:10: installing './install-sh' configure.ac:10: installing './missing' src/Makefile.am:36: warning: source file 'simtrace2/apdu_dispatch.c' is in a subdirectory, src/Makefile.am:36: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. src/Makefile.am:36: warning: source file 'simtrace2/simtrace2-discovery.c' is in a subdirectory, src/Makefile.am:36: but option 'subdir-objects' is disabled src/Makefile.am:36: warning: source file 'simtrace2/libusb_util.c' is in a subdirectory, src/Makefile.am:36: but option 'subdir-objects' is disabled src/Makefile.am: installing './depcomp' + ./configure --enable-sanitize 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 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 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 for gawk... gawk 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 checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes 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 whether make sets $(MAKE)... yes checking for style of include used by make... GNU checking whether make supports nested variables... yes checking whether UID '1000' is supported by ustar format... yes checking whether GID '1000' is supported by ustar format... yes checking how to create a ustar tar archive... gnutar checking dependency style of gcc... gcc3 checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking whether gcc understands -c and -o together... (cached) yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for csv_init in -lcsv... no configure: error: *** libcsv library not found! Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Oct 15 00:27:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 00:27:06 +0000 Subject: Change in osmo-remsim[master]: move 'struct rspro_server_conn' to client.h In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11347 ) Change subject: move 'struct rspro_server_conn' to client.h ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iab9183de086e76a214c23b2af340253a0428e445 Gerrit-Change-Number: 11347 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 00:27:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 00:27:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 00:27:09 +0000 Subject: Change in osmo-remsim[master]: move ipa_client_conn_send_rspro() into remsim_client_fsm.c In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11348 ) Change subject: move ipa_client_conn_send_rspro() into remsim_client_fsm.c ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I805e7dee0e3dd5a591d215ad340da356b19d03dd Gerrit-Change-Number: 11348 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 00:27:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 00:27:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 00:27:12 +0000 Subject: Change in osmo-remsim[master]: server_conn_fsm_alloc(): add explicit talloc context argument In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11349 ) Change subject: server_conn_fsm_alloc(): add explicit talloc context argument ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9fd78d558f791d452f2a5279f1af13fd596c1cd6 Gerrit-Change-Number: 11349 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 00:27:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 00:27:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 00:27:15 +0000 Subject: Change in osmo-remsim[master]: rspro_gen_ConnectClientReq(): don't dereference optional 'client' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11350 ) Change subject: rspro_gen_ConnectClientReq(): don't dereference optional 'client' ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5ff7f1524bc34576095d6812935557c7f03b545 Gerrit-Change-Number: 11350 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 00:27:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 00:27:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 00:27:20 +0000 Subject: Change in osmo-remsim[master]: move 'struct rspro_server_conn' to client.h In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11347 ) Change subject: move 'struct rspro_server_conn' to client.h ...................................................................... move 'struct rspro_server_conn' to client.h Change-Id: Iab9183de086e76a214c23b2af340253a0428e445 --- M src/client.h M src/remsim_client_fsm.c 2 files changed, 16 insertions(+), 15 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/client.h b/src/client.h index df90404..7a3c476 100644 --- a/src/client.h +++ b/src/client.h @@ -14,6 +14,8 @@ BDC_E_CLIENT_CONN_RES, }; +extern struct osmo_fsm remsim_client_bankd_fsm; + enum server_conn_fsm_event { SRVC_E_TCP_UP, @@ -21,7 +23,20 @@ SRVC_E_CLIENT_CONN_RES, }; -extern struct osmo_fsm remsim_client_bankd_fsm; +/* representing a client-side connection to a RSPRO server */ +struct rspro_server_conn { + /* state */ + struct ipa_client_conn *conn; + struct osmo_fsm_inst *fi; + + /* our own component ID */ + struct app_comp_id own_comp_id; + + /* configuration */ + char *server_host; + uint16_t server_port; +}; + extern struct osmo_fsm remsim_client_server_fsm; /* main.c */ diff --git a/src/remsim_client_fsm.c b/src/remsim_client_fsm.c index 4fb57f3..0b514e6 100644 --- a/src/remsim_client_fsm.c +++ b/src/remsim_client_fsm.c @@ -240,20 +240,6 @@ { 0, NULL } }; -/* representing a client-side connection to a RSPRO server */ -struct rspro_server_conn { - /* state */ - struct ipa_client_conn *conn; - struct osmo_fsm_inst *fi; - - /* our own component ID */ - struct app_comp_id own_comp_id; - - /* configuration */ - char *server_host; - uint16_t server_port; -}; - static void srvc_updown_cb(struct ipa_client_conn *conn, int up) { struct rspro_server_conn *srvc = conn->data; -- To view, visit https://gerrit.osmocom.org/11347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iab9183de086e76a214c23b2af340253a0428e445 Gerrit-Change-Number: 11347 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 00:27:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 00:27:20 +0000 Subject: Change in osmo-remsim[master]: move ipa_client_conn_send_rspro() into remsim_client_fsm.c In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11348 ) Change subject: move ipa_client_conn_send_rspro() into remsim_client_fsm.c ...................................................................... move ipa_client_conn_send_rspro() into remsim_client_fsm.c Change-Id: I805e7dee0e3dd5a591d215ad340da356b19d03dd --- M src/remsim_client.c M src/remsim_client_fsm.c M src/simtrace2-remsim_client.c 3 files changed, 15 insertions(+), 30 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/remsim_client.c b/src/remsim_client.c index 90e8de2..b60059d 100644 --- a/src/remsim_client.c +++ b/src/remsim_client.c @@ -16,21 +16,6 @@ #include "rspro_util.h" #include "client.h" -static void push_and_send(struct ipa_client_conn *ipa, struct msgb *msg_tx) -{ - ipa_prepend_header_ext(msg_tx, IPAC_PROTO_EXT_RSPRO); - ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO); - ipa_client_conn_send(ipa, msg_tx); - /* msg_tx is now queued and will be freed. */ -} - -void ipa_client_conn_send_rspro(struct ipa_client_conn *ipa, RsproPDU_t *rspro) -{ - struct msgb *msg = rspro_enc_msg(rspro); - OSMO_ASSERT(msg); - push_and_send(ipa, msg); -} - static int bankd_handle_msg(struct bankd_client *bc, struct msgb *msg) { RsproPDU_t *pdu = rspro_dec_msg(msg); diff --git a/src/remsim_client_fsm.c b/src/remsim_client_fsm.c index 0b514e6..84f9f4f 100644 --- a/src/remsim_client_fsm.c +++ b/src/remsim_client_fsm.c @@ -17,6 +17,21 @@ #define S(x) (1 << (x)) +static void push_and_send(struct ipa_client_conn *ipa, struct msgb *msg_tx) +{ + ipa_prepend_header_ext(msg_tx, IPAC_PROTO_EXT_RSPRO); + ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO); + ipa_client_conn_send(ipa, msg_tx); + /* msg_tx is now queued and will be freed. */ +} + +void ipa_client_conn_send_rspro(struct ipa_client_conn *ipa, RsproPDU_t *rspro) +{ + struct msgb *msg = rspro_enc_msg(rspro); + OSMO_ASSERT(msg); + push_and_send(ipa, msg); +} + static void bankd_updown_cb(struct ipa_client_conn *conn, int up) { struct bankd_client *bc = conn->data; diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index 3fc5da0..f54ace3 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -506,21 +506,6 @@ /** remsim_client **/ -static void push_and_send(struct ipa_client_conn *ipa, struct msgb *msg_tx) -{ - ipa_prepend_header_ext(msg_tx, IPAC_PROTO_EXT_RSPRO); - ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO); - ipa_client_conn_send(ipa, msg_tx); - /* msg_tx is now queued and will be freed. */ -} - -void ipa_client_conn_send_rspro(struct ipa_client_conn *ipa, RsproPDU_t *rspro) -{ - struct msgb *msg = rspro_enc_msg(rspro); - OSMO_ASSERT(msg); - push_and_send(ipa, msg); -} - static int bankd_handle_tpduCardToModem(struct bankd_client *bc, RsproPDU_t *pdu) { OSMO_ASSERT(pdu); -- To view, visit https://gerrit.osmocom.org/11348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I805e7dee0e3dd5a591d215ad340da356b19d03dd Gerrit-Change-Number: 11348 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 00:27:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 00:27:21 +0000 Subject: Change in osmo-remsim[master]: server_conn_fsm_alloc(): add explicit talloc context argument In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11349 ) Change subject: server_conn_fsm_alloc(): add explicit talloc context argument ...................................................................... server_conn_fsm_alloc(): add explicit talloc context argument The rspro_server_conn might be a static member of a different struct and hence not suitable as a talloc context. Change-Id: I9fd78d558f791d452f2a5279f1af13fd596c1cd6 --- M src/client.h M src/remsim_client_fsm.c 2 files changed, 4 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/client.h b/src/client.h index 7a3c476..d85e647 100644 --- a/src/client.h +++ b/src/client.h @@ -37,6 +37,7 @@ uint16_t server_port; }; +int server_conn_fsm_alloc(void *ctx, struct rspro_server_conn *srvc); extern struct osmo_fsm remsim_client_server_fsm; /* main.c */ diff --git a/src/remsim_client_fsm.c b/src/remsim_client_fsm.c index 84f9f4f..8711934 100644 --- a/src/remsim_client_fsm.c +++ b/src/remsim_client_fsm.c @@ -302,7 +302,7 @@ struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv; int rc; - srvc->conn = ipa_client_conn_create(srvc, NULL, 0, srvc->server_host, srvc->server_port, + srvc->conn = ipa_client_conn_create(fi, NULL, 0, srvc->server_host, srvc->server_port, srvc_updown_cb, srvc_read_cb, NULL, srvc); if (!srvc->conn) { fprintf(stderr, "Unable to create socket: %s\n", strerror(errno)); @@ -450,11 +450,11 @@ .event_names = server_conn_fsm_event_names, }; -int server_conn_fsm_alloc(struct rspro_server_conn *srvc) +int server_conn_fsm_alloc(void *ctx, struct rspro_server_conn *srvc) { struct osmo_fsm_inst *fi; - fi = osmo_fsm_inst_alloc(&remsim_client_server_fsm, srvc, srvc, LOGL_DEBUG, "server"); + fi = osmo_fsm_inst_alloc(&remsim_client_server_fsm, ctx, srvc, LOGL_DEBUG, "server"); if (!fi) return -1; -- To view, visit https://gerrit.osmocom.org/11349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9fd78d558f791d452f2a5279f1af13fd596c1cd6 Gerrit-Change-Number: 11349 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 00:27:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 00:27:21 +0000 Subject: Change in osmo-remsim[master]: rspro_gen_ConnectClientReq(): don't dereference optional 'client' In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11350 ) Change subject: rspro_gen_ConnectClientReq(): don't dereference optional 'client' ...................................................................... rspro_gen_ConnectClientReq(): don't dereference optional 'client' Change-Id: Id5ff7f1524bc34576095d6812935557c7f03b545 --- M src/rspro_util.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/rspro_util.c b/src/rspro_util.c index 95e8cfc..0452728 100644 --- a/src/rspro_util.c +++ b/src/rspro_util.c @@ -118,7 +118,8 @@ return NULL; pdu->msg.present = RsproPDUchoice_PR_connectClientReq; fill_comp_id(&pdu->msg.choice.connectClientReq.identity, a_cid); - ASN_ALLOC_COPY(pdu->msg.choice.connectClientReq.clientSlot, client); + if (client) + ASN_ALLOC_COPY(pdu->msg.choice.connectClientReq.clientSlot, client); return pdu; } -- To view, visit https://gerrit.osmocom.org/11350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id5ff7f1524bc34576095d6812935557c7f03b545 Gerrit-Change-Number: 11350 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Oct 15 00:30:54 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 15 Oct 2018 00:30:54 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-remsim_=C2=BB_a?= =?UTF-8?Q?1=3Ddefault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6?= In-Reply-To: <1407666144.71.1539563112694.JavaMail.jenkins@jenkins.osmocom.org> References: <1407666144.71.1539563112694.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1852485036.72.1539563454374.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon Oct 15 00:55:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 15 Oct 2018 00:55:22 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bsc_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3793?= In-Reply-To: <2011938585.63.1539562218425.JavaMail.jenkins@jenkins.osmocom.org> References: <2011938585.63.1539562218425.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1230083092.73.1539564922269.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon Oct 15 01:01:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 15 Oct 2018 01:01:06 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:?= =?UTF-8?Q?_master-openbsc_=C2=BB_--disable-iu,--?= =?UTF-8?Q?disable-mgcp-transcoding,--enable?= =?UTF-8?Q?-smpp,osmocom-master-debian9_#2967?= In-Reply-To: <1379461245.59.1539562215546.JavaMail.jenkins@jenkins.osmocom.org> References: <1379461245.59.1539562215546.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <606777315.74.1539565266526.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon Oct 15 01:01:52 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 15 Oct 2018 01:01:52 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:?= =?UTF-8?Q?_master-openbsc_=C2=BB_--disable-iu,--?= =?UTF-8?Q?enable-mgcp-transcoding,--enable-?= =?UTF-8?Q?smpp,osmocom-master-debian9_#2967?= In-Reply-To: <1396390964.60.1539562216582.JavaMail.jenkins@jenkins.osmocom.org> References: <1396390964.60.1539562216582.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <525955875.75.1539565312173.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Oct 15 09:43:28 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 15 Oct 2018 09:43:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fix build of bsc bsc-nat, hlr, and msc tests In-Reply-To: References: Message-ID: Stefan Sperling has abandoned this change. ( https://gerrit.osmocom.org/11333 ) Change subject: fix build of bsc bsc-nat, hlr, and msc tests ...................................................................... Abandoned It seems the failures I was seeing were due to local changes in one of the git repositories under deps/ -- To view, visit https://gerrit.osmocom.org/11333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I72c369ccd9df88970a69c6dfb5d5255d14fe6aa8 Gerrit-Change-Number: 11333 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 11:29:59 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 15 Oct 2018 11:29:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: start implementing the TC_paging() PCU test In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/9374 ) Change subject: start implementing the TC_paging() PCU test ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/9374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id0384e0742ab91983615e4f1c883bb044c1c8b18 Gerrit-Change-Number: 9374 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 15 Oct 2018 11:29:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 11:53:21 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 15 Oct 2018 11:53:21 +0000 Subject: Change in libosmocore[master]: add support for ipaccess messages on the ctrl interface In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11287 ) Change subject: add support for ipaccess messages on the ctrl interface ...................................................................... add support for ipaccess messages on the ctrl interface In ctrl_handle_msg(), check for IPACCESS protocol messages and respond to such messages in the same way as ipa_ccm_rcvmsg_base() does. This will allow the TTCN3 IPA "chopped ping" test to pass on control interfaces. Change-Id: I9d7137c830981ccad03806b30b776e2b1f1b4699 Related: OS#2010 --- M src/ctrl/control_if.c 1 file changed, 32 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index 5962f7e..ed18a2f 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -389,20 +389,44 @@ struct ipaccess_head_ext *iph_ext; int result; + if (msg->len < sizeof(*iph)) { + LOGP(DLCTRL, LOGL_ERROR, "The message is too short.\n"); + return -EINVAL; + } + iph = (struct ipaccess_head *) msg->data; + if (iph->proto == IPAC_PROTO_IPACCESS) { + uint8_t msg_type = *(msg->l2h); + switch (msg_type) { + case IPAC_MSGT_PING: + if (ipa_ccm_send_pong(ccon->write_queue.bfd.fd) < 0) + LOGP(DLINP, LOGL_ERROR, "Cannot send PONG message. Reason: %s\n", strerror(errno)); + break; + case IPAC_MSGT_PONG: + break; + case IPAC_MSGT_ID_ACK: + if (ipa_ccm_send_id_ack(ccon->write_queue.bfd.fd) < 0) + LOGP(DLINP, LOGL_ERROR, "Cannot send ID_ACK message. Reason: %s\n", strerror(errno)); + break; + default: + LOGP(DLCTRL, LOGL_DEBUG, "Received unhandled IPACCESS protocol message of type 0x%x: %s\n", + msg_type, msgb_hexdump(msg)); + break; + } + return 0; + } + if (iph->proto != IPAC_PROTO_OSMO) { + LOGP(DLCTRL, LOGL_ERROR, "Protocol mismatch. Received protocol 0x%x message: %s\n", + iph->proto, msgb_hexdump(msg)); + return -EINVAL; + } if (msg->len < sizeof(*iph) + sizeof(*iph_ext)) { LOGP(DLCTRL, LOGL_ERROR, "The message is too short.\n"); return -EINVAL; } - - iph = (struct ipaccess_head *) msg->data; - if (iph->proto != IPAC_PROTO_OSMO) { - LOGP(DLCTRL, LOGL_ERROR, "Protocol mismatch. We got 0x%x\n", iph->proto); - return -EINVAL; - } - iph_ext = (struct ipaccess_head_ext *) iph->data; if (iph_ext->proto != IPAC_PROTO_EXT_CTRL) { - LOGP(DLCTRL, LOGL_ERROR, "Extended protocol mismatch. We got 0x%x\n", iph_ext->proto); + LOGP(DLCTRL, LOGL_ERROR, "Extended protocol mismatch. Received protocol 0x%x message: %s\n", + iph_ext->proto, msgb_hexdump(msg)); return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/11287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9d7137c830981ccad03806b30b776e2b1f1b4699 Gerrit-Change-Number: 11287 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 11:53:46 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 15 Oct 2018 11:53:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: run TC_chopped_ipa_ping on BSC ctrl interface In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11288 ) Change subject: run TC_chopped_ipa_ping on BSC ctrl interface ...................................................................... run TC_chopped_ipa_ping on BSC ctrl interface With a related patch to libosmocore, this test will pass on osmo-bsc's ctrl interface. Change-Id: I20a4f251dbe3e75a5c53a0ff167998bbd1266f62 Depends: I9d7137c830981ccad03806b30b776e2b1f1b4699 Related: OS#2010 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 5f77021..98224ad 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2951,9 +2951,7 @@ } testcase TC_chopped_ipa_ping() runs on test_CT { - /* The IPA control interface (mp_bsc_ctrl_port) won't work with this test because the control - * interface only implements IPAC_PROTO_OSMO, while the IPA PING request uses IPAC_PROTO_IPACCESS. */ - const Integers bsc_ipa_ports := {mp_bsc_rsl_port, mp_bsc_oml_port}; + const Integers bsc_ipa_ports := {mp_bsc_rsl_port, mp_bsc_oml_port, mp_bsc_ctrl_port}; for (var integer i := 0; i < lengthof(bsc_ipa_ports); i := i + 1) { IPA_Testing.f_run_TC_chopped_ipa_ping(mp_bsc_ip, bsc_ipa_ports[i], CONNECT_TO_SERVER); } -- To view, visit https://gerrit.osmocom.org/11288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I20a4f251dbe3e75a5c53a0ff167998bbd1266f62 Gerrit-Change-Number: 11288 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 12:33:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 15 Oct 2018 12:33:27 +0000 Subject: Change in openbsc[master]: mgcp: osmux_send_dummy: Avoid logging incorrectly and sending if osmu... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11334 ) Change subject: mgcp: osmux_send_dummy: Avoid logging incorrectly and sending if osmux not enabled ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5244cb9304adef3aa612b8126bf95e77562c801c Gerrit-Change-Number: 11334 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 12:33:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 12:33:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 15 Oct 2018 12:33:49 +0000 Subject: Change in openbsc[master]: mgcp: osmux_send_dummy: Avoid logging incorrectly and sending if osmu... In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11334 ) Change subject: mgcp: osmux_send_dummy: Avoid logging incorrectly and sending if osmux not enabled ...................................................................... mgcp: osmux_send_dummy: Avoid logging incorrectly and sending if osmux not enabled Change-Id: I5244cb9304adef3aa612b8126bf95e77562c801c --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index 71e8eae..33f5721 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -530,12 +530,20 @@ LOGP(DMGCP, LOGL_ERROR, "Could not activate osmux in endpoint 0x%x\n", ENDPOINT_NUMBER(endp)); + return 0; } LOGP(DMGCP, LOGL_ERROR, "Osmux CID %u for %s:%u is now enabled\n", endp->osmux.cid, inet_ntoa(endp->net_end.addr), endp->cfg->osmux_port); } + if(endp->osmux.state != OSMUX_STATE_ENABLED) { + LOGP(DMGCP, LOGL_ERROR, + "OSMUX dummy to %s CID %u: Osmux not enabled on endpoint 0x%x state %d\n", + inet_ntoa(endp->net_end.addr), endp->osmux.cid, + ENDPOINT_NUMBER(endp), endp->osmux.state); + return 0; + } LOGP(DMGCP, LOGL_DEBUG, "sending OSMUX dummy load to %s CID %u\n", inet_ntoa(endp->net_end.addr), endp->osmux.cid); -- To view, visit https://gerrit.osmocom.org/11334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5244cb9304adef3aa612b8126bf95e77562c801c Gerrit-Change-Number: 11334 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 12:33:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 15 Oct 2018 12:33:50 +0000 Subject: Change in openbsc[master]: mgcp: osmux: Don't process regular osmux frames if disabled by cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11335 ) Change subject: mgcp: osmux: Don't process regular osmux frames if disabled by cfg ...................................................................... mgcp: osmux: Don't process regular osmux frames if disabled by cfg Prior to this commit, the check was only done on legacy dummy frames. Change-Id: Ief4e62fe68a11a60d90292c72d1263fd1f728356 --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 12 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index 33f5721..7590f18 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -275,6 +275,12 @@ if (!msg) return -1; + if (!cfg->osmux) { + LOGP(DMGCP, LOGL_ERROR, + "bsc-nat wants to use Osmux but bsc did not request it\n"); + goto out; + } + /* not any further processing dummy messages */ if (msg->data[0] == MGCP_DUMMY_LOAD) goto out; @@ -319,12 +325,6 @@ LOGP(DMGCP, LOGL_DEBUG, "Received Osmux dummy load from %s\n", inet_ntoa(addr->sin_addr)); - if (!cfg->osmux) { - LOGP(DMGCP, LOGL_ERROR, - "bsc wants to use Osmux but bsc-nat did not request it\n"); - goto out; - } - /* extract the osmux CID from the dummy message */ memcpy(&osmux_cid, &msg->data[1], sizeof(osmux_cid)); @@ -365,6 +365,12 @@ if (!msg) return -1; + if (!cfg->osmux) { + LOGP(DMGCP, LOGL_ERROR, + "bsc wants to use Osmux but bsc-nat did not request it\n"); + goto out; + } + /* not any further processing dummy messages */ if (msg->data[0] == MGCP_DUMMY_LOAD) return osmux_handle_dummy(cfg, &addr, msg); -- To view, visit https://gerrit.osmocom.org/11335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ief4e62fe68a11a60d90292c72d1263fd1f728356 Gerrit-Change-Number: 11335 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 12:33:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 15 Oct 2018 12:33:50 +0000 Subject: Change in openbsc[master]: mgcp: osmux: Move parse_cid of legacy dummy frames to own function In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11336 ) Change subject: mgcp: osmux: Move parse_cid of legacy dummy frames to own function ...................................................................... mgcp: osmux: Move parse_cid of legacy dummy frames to own function Change-Id: If9249fb0ee2e33c7dd2ab817480776acaa784cc2 --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 15 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index 7590f18..ea0372b 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -261,6 +261,20 @@ return msg; } +static int osmux_legacy_dummy_parse_cid(struct sockaddr_in *addr, struct msgb *msg, + uint8_t *osmux_cid) +{ + if (msg->len < 1 + sizeof(osmux_cid)) { + LOGP(DMGCP, LOGL_ERROR, + "Discarding truncated Osmux dummy load\n"); + return -1; + } + + /* extract the osmux CID from the dummy message */ + memcpy(osmux_cid, &msg->data[1], sizeof(*osmux_cid)); + return 0; +} + #define osmux_chunk_length(msg, rem) (rem - msg->len); int osmux_read_from_bsc_nat_cb(struct osmo_fd *ofd, unsigned int what) @@ -316,17 +330,8 @@ struct mgcp_endpoint *endp; uint8_t osmux_cid; - if (msg->len < 1 + sizeof(osmux_cid)) { - LOGP(DMGCP, LOGL_ERROR, - "Discarding truncated Osmux dummy load\n"); + if (osmux_legacy_dummy_parse_cid(addr, msg, &osmux_cid) < 0) goto out; - } - - LOGP(DMGCP, LOGL_DEBUG, "Received Osmux dummy load from %s\n", - inet_ntoa(addr->sin_addr)); - - /* extract the osmux CID from the dummy message */ - memcpy(&osmux_cid, &msg->data[1], sizeof(osmux_cid)); endp = endpoint_lookup(cfg, osmux_cid, &addr->sin_addr, MGCP_DEST_BTS); if (!endp) { -- To view, visit https://gerrit.osmocom.org/11336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If9249fb0ee2e33c7dd2ab817480776acaa784cc2 Gerrit-Change-Number: 11336 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 12:33:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 15 Oct 2018 12:33:51 +0000 Subject: Change in openbsc[master]: mgcp: osmux: Make func handling dummy frames independent of endp type In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11337 ) Change subject: mgcp: osmux: Make func handling dummy frames independent of endp type ...................................................................... mgcp: osmux: Make func handling dummy frames independent of endp type Change-Id: I285f1cb693b243ecd404337f2bb5b74ddd32b123 --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index ea0372b..b46ea10 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -325,7 +325,7 @@ /* This is called from the bsc-nat */ static int osmux_handle_dummy(struct mgcp_config *cfg, struct sockaddr_in *addr, - struct msgb *msg) + struct msgb *msg, int endp_type) { struct mgcp_endpoint *endp; uint8_t osmux_cid; @@ -333,7 +333,7 @@ if (osmux_legacy_dummy_parse_cid(addr, msg, &osmux_cid) < 0) goto out; - endp = endpoint_lookup(cfg, osmux_cid, &addr->sin_addr, MGCP_DEST_BTS); + endp = endpoint_lookup(cfg, osmux_cid, &addr->sin_addr, endp_type); if (!endp) { LOGP(DMGCP, LOGL_ERROR, "Cannot find endpoint for Osmux CID %d\n", osmux_cid); @@ -378,7 +378,7 @@ /* not any further processing dummy messages */ if (msg->data[0] == MGCP_DUMMY_LOAD) - return osmux_handle_dummy(cfg, &addr, msg); + return osmux_handle_dummy(cfg, &addr, msg, MGCP_DEST_BTS); rem = msg->len; while((osmuxh = osmux_xfrm_output_pull(msg)) != NULL) { -- To view, visit https://gerrit.osmocom.org/11337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I285f1cb693b243ecd404337f2bb5b74ddd32b123 Gerrit-Change-Number: 11337 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 13:19:58 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 15 Oct 2018 13:19:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add chopped IPA ping test to BTS tests Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11356 Change subject: add chopped IPA ping test to BTS tests ...................................................................... add chopped IPA ping test to BTS tests Run the chopped IPA ping test from the IPA_Testing module as part of the BTS test suite. Contrary to the BSC version of this test, this test listens for an IPA connection rather than connecting to an IPA server. Make code in the IPA_Testing module for accepting connections actually work. Change-Id: I4804ccabd342b82d44e69dbc6eaaae220ec7d4e4 Related: OS#2010 --- M bts/BTS_Tests.ttcn M bts/gen_links.sh M library/IPA_Testing.ttcn 3 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/11356/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 82a54f3..2d59627 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -15,6 +15,7 @@ import from RSL_Types all; import from IPA_Types all; import from IPA_Emulation all; +import from IPA_Testing all; import from RSL_Emulation all; import from IPL4asp_Types all; @@ -4146,6 +4147,10 @@ f_tch_sign_l2_fill_frame(true); } +testcase TC_chopped_ipa_ping() runs on test_CT { + IPA_Testing.f_run_TC_chopped_ipa_ping(mp_rsl_ip, mp_rsl_port, LISTEN_FOR_CLIENT); +} + /* test generation of RLL ERR IND based on Um errors (TS 48.058 3.9) */ /* protocol error as per 44.006 */ /* link layer failure (repetition of I-frame N200 times without ACK */ @@ -4278,6 +4283,8 @@ execute( TC_tch_sign_l2_fill_frame() ); execute( TC_tch_sign_l2_fill_frame_dtxd() ); + + execute( TC_chopped_ipa_ping() ); } diff --git a/bts/gen_links.sh b/bts/gen_links.sh index b6c4e12..1ec6153 100755 --- a/bts/gen_links.sh +++ b/bts/gen_links.sh @@ -42,6 +42,7 @@ FILES+="Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="TRXC_Types.ttcn TRXC_CodecPort.ttcn TRXC_CodecPort_CtrlFunct.ttcn TRXC_CodecPort_CtrlFunctDef.cc " FILES+="PCUIF_Types.ttcn PCUIF_CodecPort.ttcn " +FILES+="IPA_Testing.ttcn" gen_links $DIR $FILES ignore_pp_results diff --git a/library/IPA_Testing.ttcn b/library/IPA_Testing.ttcn index 62aa143..a94dd46 100644 --- a/library/IPA_Testing.ttcn +++ b/library/IPA_Testing.ttcn @@ -139,8 +139,10 @@ if (conmode == CONNECT_TO_SERVER) { f_send_chopped_ipa_msg(ipa_ip, ipa_tcp_port, connId, ipa_msg_ping); } else { - IPL4.receive(t_recvfrom(omit)) -> value asp_rx { - f_send_chopped_ipa_msg(asp_rx.remName, asp_rx.remPort, connId, ipa_msg_ping); + var PortEvent port_evt; + IPL4.receive(PortEvent:{connOpened := ?}) -> value port_evt { + var ConnectionOpenedEvent conn := port_evt.connOpened; + f_send_chopped_ipa_msg(conn.remName, conn.remPort, conn.connId, ipa_msg_ping); } } -- To view, visit https://gerrit.osmocom.org/11356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4804ccabd342b82d44e69dbc6eaaae220ec7d4e4 Gerrit-Change-Number: 11356 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 14:42:13 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 15 Oct 2018 14:42:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add an IPA test which sends a chopped payload Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11357 Change subject: add an IPA test which sends a chopped payload ...................................................................... add an IPA test which sends a chopped payload Add another IPA test to the BTS and BSC test suites. This new test sends the header in one burst, followed by the payload which is transmitted byte-per-byte. The test uses an ID REQ message. If acting as a server, the test can expect an ID RESP message. However, if acting as a client, the server will close the connection when it receives the ID REQ. The CTRL interface port on the BSC does not close the connection in this case, so that particular port is skipped by the test for now. Change-Id: If75cb90841bb25619b414f0cabe008a2428a9fdf Related: OS#2010 Depends: I4804ccabd342b82d44e69dbc6eaaae220ec7d4e4 --- M bsc/BSC_Tests.ttcn M bts/BTS_Tests.ttcn M library/IPA_Testing.ttcn 3 files changed, 77 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/57/11357/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 98224ad..fef5fd7 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2957,6 +2957,15 @@ } } +testcase TC_chopped_ipa_payload() runs on test_CT { + const Integers bsc_ipa_ports := {mp_bsc_rsl_port, mp_bsc_oml_port + /* TODO: mp_bsc_ctrl_port does not work yet */}; + for (var integer i := 0; i < lengthof(bsc_ipa_ports); i := i + 1) { + IPA_Testing.f_run_TC_chopped_ipa_payload(mp_bsc_ip, bsc_ipa_ports[i], CONNECT_TO_SERVER); + } +} + + /* Dyn PDCH todo: * activate OSMO as TCH/F * activate OSMO as TCH/H @@ -3068,6 +3077,7 @@ execute( TC_dyn_pdch_osmo_act_nack() ); execute( TC_chopped_ipa_ping() ); + execute( TC_chopped_ipa_payload() ); /* at bottom as they might crash OsmoBSC before OS#3182 is fixed */ execute( TC_early_conn_fail() ); diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 2d59627..e0470ec 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -4151,6 +4151,10 @@ IPA_Testing.f_run_TC_chopped_ipa_ping(mp_rsl_ip, mp_rsl_port, LISTEN_FOR_CLIENT); } +testcase TC_chopped_ipa_payload() runs on test_CT { + IPA_Testing.f_run_TC_chopped_ipa_payload(mp_rsl_ip, mp_rsl_port, LISTEN_FOR_CLIENT); +} + /* test generation of RLL ERR IND based on Um errors (TS 48.058 3.9) */ /* protocol error as per 44.006 */ /* link layer failure (repetition of I-frame N200 times without ACK */ @@ -4285,6 +4289,7 @@ execute( TC_tch_sign_l2_fill_frame_dtxd() ); execute( TC_chopped_ipa_ping() ); + execute( TC_chopped_ipa_payload() ); } diff --git a/library/IPA_Testing.ttcn b/library/IPA_Testing.ttcn index a94dd46..413dd31 100644 --- a/library/IPA_Testing.ttcn +++ b/library/IPA_Testing.ttcn @@ -32,6 +32,8 @@ /* Encoded IPA messages (network byte order) */ const octetstring ipa_msg_ping := '0001FE00'O; const octetstring ipa_msg_pong := '0001FE01'O; +const octetstring ipa_msg_id_req_hdr := '0007FE'O; +const octetstring ipa_msg_id_req_payload := '04010801070102'O; /* A component which represents the system on which the IPA speaker is running. */ type component system_CT { @@ -158,6 +160,60 @@ } } +/* Send a complete IPA "ID REQ" message header in one piece, and then send the payload one byte at a time, + * waiting for TCP buffer to flush between each byte. */ +private function f_TC_chopped_ipa_payload(charstring ipa_ip, integer ipa_tcp_port, + IPA_ConnectionMode conmode) runs on IPA_CT system system_CT { + var ConnectionId connId; + var ASP_RecvFrom asp_rx; + + connId := f_init(ipa_ip, ipa_tcp_port, conmode); + + if (conmode == CONNECT_TO_SERVER) { + var PortEvent port_evt; + f_send_ipa_data(ipa_ip, ipa_tcp_port, connId, ipa_msg_id_req_hdr); + f_send_chopped_ipa_msg(ipa_ip, ipa_tcp_port, connId, ipa_msg_id_req_payload); + /* Server will close the connection upon receiving an ID REQ. */ + alt { + [] IPL4.receive(PortEvent:{connClosed := ?}) -> value port_evt { + if (port_evt.connClosed.connId == connId) { + setverdict(pass); + } else { + repeat; + } + } + [] IPL4.receive { + repeat; + } + } + } else { + var PortEvent port_evt; + IPL4.receive(PortEvent:{connOpened := ?}) -> value port_evt { + var ConnectionOpenedEvent conn := port_evt.connOpened; + f_send_ipa_data(conn.remName, conn.remPort, conn.connId, ipa_msg_id_req_hdr); + f_send_chopped_ipa_msg(conn.remName, conn.remPort, conn.connId, ipa_msg_id_req_payload); + } + + /* Expect an encoded IPA ID RESP message from the client. */ + alt { + [] IPL4.receive(t_recvfrom(?)) -> value asp_rx { + log("received IPA message from ", asp_rx.remName, " port ", asp_rx.remPort, ": ", + asp_rx.msg); + if (lengthof(asp_rx.msg) > 4 + and asp_rx.msg[2] == 'FE'O /* PROTO_IPACCESS */ + and asp_rx.msg[3] == '05'O /* ID RESP */) { + setverdict(pass); + } else { + repeat; + } + } + [] IPL4.receive { + repeat; + } + } + } +} + /* * Public functions. * Test suites may call these functions to create an IPA_CT component and run a test to completion. @@ -169,4 +225,10 @@ vc_IPA_Testing.done; } +function f_run_TC_chopped_ipa_payload(charstring ipa_ip, integer ipa_tcp_port, IPA_ConnectionMode conmode) { + var IPA_Testing.IPA_CT vc_IPA_Testing := IPA_Testing.IPA_CT.create; + vc_IPA_Testing.start(IPA_Testing.f_TC_chopped_ipa_payload(ipa_ip, ipa_tcp_port, conmode)); + vc_IPA_Testing.done; +} + } -- To view, visit https://gerrit.osmocom.org/11357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If75cb90841bb25619b414f0cabe008a2428a9fdf Gerrit-Change-Number: 11357 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Oct 15 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 15 Oct 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#277?= Message-ID: <867941766.83.1539616207318.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Oct 15 15:49:25 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 15 Oct 2018 15:49:25 +0000 Subject: Change in libosmocore[master]: gsm_08_58.h: Introduce struct abis_rsl_chan_nr In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11303 ) Change subject: gsm_08_58.h: Introduce struct abis_rsl_chan_nr ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/11303/2/include/osmocom/gsm/protocol/gsm_08_58.h File include/osmocom/gsm/protocol/gsm_08_58.h: https://gerrit.osmocom.org/#/c/11303/2/include/osmocom/gsm/protocol/gsm_08_58.h at 45 PS2, Line 45: ACCHs 0x01 let's make it aligned? https://gerrit.osmocom.org/#/c/11303/2/include/osmocom/gsm/protocol/gsm_08_58.h at 51 PS2, Line 51: AGCH 0x12 same here -- To view, visit https://gerrit.osmocom.org/11303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icd6822021207270a00106c50f8ca6b93c1250df9 Gerrit-Change-Number: 11303 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 15 Oct 2018 15:49:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 15:50:50 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 15 Oct 2018 15:50:50 +0000 Subject: Change in libosmocore[master]: gsm_08_58.h: Introduce struct abis_rsl_chan_nr In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11303 ) Change subject: gsm_08_58.h: Introduce struct abis_rsl_chan_nr ...................................................................... Patch Set 2: Would be probably good to see some basic test coverage, to make sure that we don't break anything by this change... -- To view, visit https://gerrit.osmocom.org/11303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icd6822021207270a00106c50f8ca6b93c1250df9 Gerrit-Change-Number: 11303 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 15 Oct 2018 15:50:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 16:08:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 15 Oct 2018 16:08:11 +0000 Subject: Change in libosmocore[master]: gsm_08_58.h: Introduce struct abis_rsl_chan_nr In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11303 ) Change subject: gsm_08_58.h: Introduce struct abis_rsl_chan_nr ...................................................................... Patch Set 2: (1 comment) > Would be probably good to see some basic test coverage, > to make sure that we don't break anything by this change... How can we break anything with this change? It's not changing any logic, old code keeps working same way. It's only new ways to get/set information for new code. https://gerrit.osmocom.org/#/c/11303/2/include/osmocom/gsm/protocol/gsm_08_58.h File include/osmocom/gsm/protocol/gsm_08_58.h: https://gerrit.osmocom.org/#/c/11303/2/include/osmocom/gsm/protocol/gsm_08_58.h at 45 PS2, Line 45: ACCHs 0x01 > let's make it aligned? It's strange, it didn't look aligned in my editor, but it did during git show. -- To view, visit https://gerrit.osmocom.org/11303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icd6822021207270a00106c50f8ca6b93c1250df9 Gerrit-Change-Number: 11303 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 15 Oct 2018 16:08:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 16:08:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 15 Oct 2018 16:08:39 +0000 Subject: Change in osmo-gsm-tester[master]: ttcn3: Support running tests without PCU socket avail In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11322 to look at the new patch set (#2). Change subject: ttcn3: Support running tests without PCU socket avail ...................................................................... ttcn3: Support running tests without PCU socket avail Change-Id: I902af460b798ffdba09d77d457bac672db606368 --- M src/osmo_gsm_tester/bts.py A ttcn3/scenarios/sysmo.conf M ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl M ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh M ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py 5 files changed, 23 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/22/11322/2 -- To view, visit https://gerrit.osmocom.org/11322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I902af460b798ffdba09d77d457bac672db606368 Gerrit-Change-Number: 11322 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 16:08:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 15 Oct 2018 16:08:39 +0000 Subject: Change in osmo-gsm-tester[master]: ttcn3: Allow remote hosts (sysmobts) to access RSL srv inside TTCN3 d... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11358 Change subject: ttcn3: Allow remote hosts (sysmobts) to access RSL srv inside TTCN3 docker ...................................................................... ttcn3: Allow remote hosts (sysmobts) to access RSL srv inside TTCN3 docker And extra IP address is required/requested on the docker host because the BSC handling the OML instance is binding to it's address, so we cannot ask docker to use that one because it fails binding to it. Change-Id: I734fba91db535d7b183ddc7f51d324a6cd2eaf6f --- M ttcn3/default-suites.conf M ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh M ttcn3/suites/ttcn3_bts_tests/suite.conf M ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py 4 files changed, 10 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/58/11358/1 diff --git a/ttcn3/default-suites.conf b/ttcn3/default-suites.conf index 80f14e6..cfa46b4 100644 --- a/ttcn3/default-suites.conf +++ b/ttcn3/default-suites.conf @@ -1 +1,2 @@ - ttcn3_bts_tests:trx +- ttcn3_bts_tests:sysmo diff --git a/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh b/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh index df8dcb2..daac3e0 100755 --- a/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh +++ b/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh @@ -3,8 +3,9 @@ RUNDIR="$1" JUNIT_TTCN3_DST_FILE="$2" -L2_SOCKET_PATH="$3" -PCU_SOCKET_PATH="$4" +BSC_RSL_ADDR="$3" +L2_SOCKET_PATH="$4" +PCU_SOCKET_PATH="$5" # Absolute path to this script SCRIPT=$(readlink -f "$0") @@ -27,7 +28,7 @@ network_create() { NET=$1 echo Creating network $NET_NAME - docker network create --internal --subnet $NET $NET_NAME + docker network create --subnet $NET $NET_NAME } network_remove() { @@ -70,6 +71,7 @@ fi docker run --rm \ --network $NET_NAME --ip 172.18.9.10 \ + -p ${BSC_RSL_ADDR}:3003:3003 \ -e "TTCN3_PCAP_PATH=/data" \ --mount type=bind,source=$VOL_BASE_DIR/bts-tester,destination=/data \ --mount type=bind,source="$(dirname "$L2_SOCKET_PATH")",destination=/data/unix_l2 \ diff --git a/ttcn3/suites/ttcn3_bts_tests/suite.conf b/ttcn3/suites/ttcn3_bts_tests/suite.conf index 1eb0a02..2bb0cac 100644 --- a/ttcn3/suites/ttcn3_bts_tests/suite.conf +++ b/ttcn3/suites/ttcn3_bts_tests/suite.conf @@ -1,6 +1,6 @@ resources: ip_address: - - times: 7 # msc, bsc, hlr, stp, mgw, sgsn, ggsn + - times: 8 # msc, bsc, hlr, stp, mgw, sgsn, ggsn bts: - times: 1 osmocon_phone: diff --git a/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py b/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py index f36b023..2684bf7 100755 --- a/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py +++ b/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py @@ -30,7 +30,8 @@ msc_dummy.start() mgw_dummy.start() -bsc.set_rsl_ip('172.18.9.10') +nat_rsl_ip = suite.ip_address().get('addr') +bsc.set_rsl_ip(nat_rsl_ip) bsc.bts_add(bts) sgsn_dummy.bts_add(bts) @@ -52,7 +53,7 @@ else: # PCU unix socket not available locally pcu_available = False pcu_sk = '' -docker_cmd = (script_file, str(script_run_dir), junit_ttcn3_dst_file, osmocon.l2_socket_path(), pcu_sk) +docker_cmd = (script_file, str(script_run_dir), junit_ttcn3_dst_file, nat_rsl_ip, osmocon.l2_socket_path(), pcu_sk) print('Creating template') mytemplate = Template(filename=bts_tmpl_file) -- To view, visit https://gerrit.osmocom.org/11358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I734fba91db535d7b183ddc7f51d324a6cd2eaf6f Gerrit-Change-Number: 11358 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 17:55:26 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Mon, 15 Oct 2018 17:55:26 +0000 Subject: Change in simtrace2[master]: remsim: add already parsed USB path argument info Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/11359 Change subject: remsim: add already parsed USB path argument info ...................................................................... remsim: add already parsed USB path argument info Change-Id: I03de93ebb92b1d1b5004cbe865cdf1fa0b2b23ac --- M host/simtrace2-remsim.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/59/11359/1 diff --git a/host/simtrace2-remsim.c b/host/simtrace2-remsim.c index 9a681b4..5b8204e 100644 --- a/host/simtrace2-remsim.c +++ b/host/simtrace2-remsim.c @@ -501,6 +501,7 @@ "\t-I\t--usb-interface\tINTERFACE_ID\n" "\t-S\t--usb-altsetting ALTSETTING_ID\n" "\t-A\t--usb-address\tADDRESS\n" + "\t-H\t--usb-path\tPATH\n" "\n" ); } -- To view, visit https://gerrit.osmocom.org/11359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I03de93ebb92b1d1b5004cbe865cdf1fa0b2b23ac Gerrit-Change-Number: 11359 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 17:55:26 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Mon, 15 Oct 2018 17:55:26 +0000 Subject: Change in simtrace2[master]: remsim: update copyright Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/11360 Change subject: remsim: update copyright ...................................................................... remsim: update copyright Change-Id: Ibcf093877ee53f8446c97bfa50c8370ceda24c53 --- M host/simtrace2-remsim.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/60/11360/1 diff --git a/host/simtrace2-remsim.c b/host/simtrace2-remsim.c index 5b8204e..d0bbb8c 100644 --- a/host/simtrace2-remsim.c +++ b/host/simtrace2-remsim.c @@ -1,7 +1,8 @@ /* simtrace2-remsim - main program for the host PC to provide a remote SIM * using the SIMtrace 2 firmware in card emulation mode * - * (C) 2016 by Harald Welte + * (C) 2016-2017 by Harald Welte + * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -484,7 +485,8 @@ static void print_welcome(void) { printf("simtrace2-remsim - Remote SIM card forwarding\n" - "(C) 2010-2017 by Harald Welte \n\n"); + "(C) 2010-2017, Harald Welte \n" + "(C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon \n\n"); } static void print_help(void) -- To view, visit https://gerrit.osmocom.org/11360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibcf093877ee53f8446c97bfa50c8370ceda24c53 Gerrit-Change-Number: 11360 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 17:55:27 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Mon, 15 Oct 2018 17:55:27 +0000 Subject: Change in simtrace2[master]: cardem: add more debug information for TPDU state Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/11361 Change subject: cardem: add more debug information for TPDU state ...................................................................... cardem: add more debug information for TPDU state this just adds the name of the TPDU state on top of the state number. Change-Id: Id5104a2c3579dedb092c179748e9ed525673841c --- M firmware/libcommon/source/card_emu.c 1 file changed, 20 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/61/11361/1 diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 75910c1..9966abd 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -86,6 +86,7 @@ PTS_S_WAIT_RESP_PCK = PTS_S_WAIT_REQ_PCK | 0x10, }; +/* PTS field byte index */ #define _PTSS 0 #define _PTS0 1 #define _PTS1 2 @@ -105,6 +106,22 @@ TPDU_S_WAIT_TX, /* waiting for more data to reader */ }; +const struct value_string tpdu_state_names[] = { + OSMO_VALUE_STRING(TPDU_S_WAIT_CLA), + OSMO_VALUE_STRING(TPDU_S_WAIT_INS), + OSMO_VALUE_STRING(TPDU_S_WAIT_P1), + OSMO_VALUE_STRING(TPDU_S_WAIT_P2), + OSMO_VALUE_STRING(TPDU_S_WAIT_P3), + OSMO_VALUE_STRING(TPDU_S_WAIT_PB), + OSMO_VALUE_STRING(TPDU_S_WAIT_RX), + OSMO_VALUE_STRING(TPDU_S_WAIT_TX), + { + .value = 0, + .str = NULL, + }, +}; + +/* TPDU field byte index */ #define _CLA 0 #define _INS 1 #define _P1 2 @@ -651,9 +668,9 @@ if (ch->tpdu.state == new_ts) return; - TRACE_DEBUG("%u: 7816 TPDU state %u -> %u\r\n", ch->num, - ch->tpdu.state, new_ts); - + TRACE_DEBUG("%u: 7816 TPDU state %u (%s) -> %u (%s)\r\n", ch->num, + ch->tpdu.state, get_value_string(tpdu_state_names, ch->tpdu.state), + new_ts, get_value_string(tpdu_state_names, new_ts)); ch->tpdu.state = new_ts; switch (new_ts) { -- To view, visit https://gerrit.osmocom.org/11361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id5104a2c3579dedb092c179748e9ed525673841c Gerrit-Change-Number: 11361 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 17:55:27 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Mon, 15 Oct 2018 17:55:27 +0000 Subject: Change in simtrace2[master]: remsim: fix TPDU response size transmission Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/11362 Change subject: remsim: fix TPDU response size transmission ...................................................................... remsim: fix TPDU response size transmission the TDPU response data size can be up to 256. this length cannot be stored in a uint8_t, which would cause the length to become 0, no data being send, and the reader reset the card because of misbehaviour of the card (i.e. no/malformed response leading to the timeout of the waiting time). Change-Id: Iae7671085aaa3115a02d82530dd7a0e7e2d4155e --- M host/simtrace2-remsim.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/62/11362/1 diff --git a/host/simtrace2-remsim.c b/host/simtrace2-remsim.c index d0bbb8c..73a7272 100644 --- a/host/simtrace2-remsim.c +++ b/host/simtrace2-remsim.c @@ -218,7 +218,7 @@ /*! \brief Request the SIMtrace2 to transmit a Procedure Byte, then Tx */ static int cardem_request_pb_and_tx(struct cardem_inst *ci, uint8_t pb, - const uint8_t *data, uint8_t data_len_in) + const uint8_t *data, uint16_t data_len_in) { struct msgb *msg = st_msgb_alloc(); struct cardemu_usb_msg_tx_data *txd; -- To view, visit https://gerrit.osmocom.org/11362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iae7671085aaa3115a02d82530dd7a0e7e2d4155e Gerrit-Change-Number: 11362 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 18:03:10 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Mon, 15 Oct 2018 18:03:10 +0000 Subject: Change in osmo-remsim[master]: remsim: fix TPDU response size transmission Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/11363 Change subject: remsim: fix TPDU response size transmission ...................................................................... remsim: fix TPDU response size transmission the TDPU response data size can be up to 256. this length cannot be stored in a uint8_t, which would cause the length to become 0, no data being send, and the reader reset the card because of misbehaviour of the card (i.e. no/malformed response leading to the timeout of the waiting time). Change-Id: Id38f9e597ffff242e89ea3dd9fbdf0c9f444cc03 --- M src/simtrace2-remsim_client.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/63/11363/1 diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index f54ace3..365acb4 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -201,7 +201,7 @@ /*! \brief Request the SIMtrace2 to transmit a Procedure Byte, then Tx */ static int cardem_request_pb_and_tx(struct cardem_inst *ci, uint8_t pb, - const uint8_t *data, uint8_t data_len_in) + const uint8_t *data, uint16_t data_len_in) { struct msgb *msg = st_msgb_alloc(); struct cardemu_usb_msg_tx_data *txd; -- To view, visit https://gerrit.osmocom.org/11363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id38f9e597ffff242e89ea3dd9fbdf0c9f444cc03 Gerrit-Change-Number: 11363 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 22:52:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 22:52:44 +0000 Subject: Change in osmo-remsim[master]: remsim: fix TPDU response size transmission In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11363 ) Change subject: remsim: fix TPDU response size transmission ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id38f9e597ffff242e89ea3dd9fbdf0c9f444cc03 Gerrit-Change-Number: 11363 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 22:52:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 22:52:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 22:52:46 +0000 Subject: Change in osmo-remsim[master]: remsim: fix TPDU response size transmission In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11363 ) Change subject: remsim: fix TPDU response size transmission ...................................................................... remsim: fix TPDU response size transmission the TDPU response data size can be up to 256. this length cannot be stored in a uint8_t, which would cause the length to become 0, no data being send, and the reader reset the card because of misbehaviour of the card (i.e. no/malformed response leading to the timeout of the waiting time). Change-Id: Id38f9e597ffff242e89ea3dd9fbdf0c9f444cc03 --- M src/simtrace2-remsim_client.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index f54ace3..365acb4 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -201,7 +201,7 @@ /*! \brief Request the SIMtrace2 to transmit a Procedure Byte, then Tx */ static int cardem_request_pb_and_tx(struct cardem_inst *ci, uint8_t pb, - const uint8_t *data, uint8_t data_len_in) + const uint8_t *data, uint16_t data_len_in) { struct msgb *msg = st_msgb_alloc(); struct cardemu_usb_msg_tx_data *txd; -- To view, visit https://gerrit.osmocom.org/11363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id38f9e597ffff242e89ea3dd9fbdf0c9f444cc03 Gerrit-Change-Number: 11363 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 22:53:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 22:53:11 +0000 Subject: Change in simtrace2[master]: remsim: add already parsed USB path argument info In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11359 ) Change subject: remsim: add already parsed USB path argument info ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I03de93ebb92b1d1b5004cbe865cdf1fa0b2b23ac Gerrit-Change-Number: 11359 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 22:53:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 22:53:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 22:53:26 +0000 Subject: Change in simtrace2[master]: remsim: update copyright In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11360 ) Change subject: remsim: update copyright ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibcf093877ee53f8446c97bfa50c8370ceda24c53 Gerrit-Change-Number: 11360 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 22:53:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 22:57:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 22:57:49 +0000 Subject: Change in simtrace2[master]: cardem: add more debug information for TPDU state In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11361 ) Change subject: cardem: add more debug information for TPDU state ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/11361/1/firmware/libcommon/source/card_emu.c File firmware/libcommon/source/card_emu.c: https://gerrit.osmocom.org/#/c/11361/1/firmware/libcommon/source/card_emu.c at 110 PS1, Line 110: OSMO_VALUE_STRING(TPDU_S_WAIT_CLA), normally I'm not a big fan of OSMO_VALUE_STRING as the auto-generated string names are often way too long. However, in this case, the enum name is rather short and we can keep it. Iwould consider "WAIT_INS" to be shorter but equally informative to the human reader. The context already indicates it is a TPDU state and hence TPDU_S_ prefix doesn't add any non-redundant information https://gerrit.osmocom.org/#/c/11361/1/firmware/libcommon/source/card_emu.c at 671 PS1, Line 671: TRACE_DEBUG("%u: 7816 TPDU state %u (%s) -> %u (%s)\r\n", ch->num, printing both the number and the string makes little sense, IMHO. In other places [of osmocom projects] we normally print only either the number or the string representation, not both. Please note that get_value_string will generate an "unknown 0x1234" string if the value doesn't have a corresponding string. The latter unfortunaly doesn't work if you call get_value_string() twice from function arguments, as the returned buffer is a static buffer. You can leave it as-is, but I'm juts sharing my thoughts. None of them are critical or prevent this from being merged. -- To view, visit https://gerrit.osmocom.org/11361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5104a2c3579dedb092c179748e9ed525673841c Gerrit-Change-Number: 11361 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 22:57:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 22:58:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 22:58:00 +0000 Subject: Change in simtrace2[master]: remsim: fix TPDU response size transmission In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11362 ) Change subject: remsim: fix TPDU response size transmission ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iae7671085aaa3115a02d82530dd7a0e7e2d4155e Gerrit-Change-Number: 11362 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 22:58:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 22:59:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 22:59:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: start implementing the TC_paging() PCU test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9374 ) Change subject: start implementing the TC_paging() PCU test ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/9374/3/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/#/c/9374/3/pcu/PCU_Tests.ttcn at 223 PS3, Line 223: if (dec_PDU_ML3_NW_MS_backtrack(payload, pdu) != 0) { what does this _backtrack do? -- To view, visit https://gerrit.osmocom.org/9374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id0384e0742ab91983615e4f1c883bb044c1c8b18 Gerrit-Change-Number: 9374 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 22:59:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 23:00:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 23:00:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add chopped IPA ping test to BTS tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11356 ) Change subject: add chopped IPA ping test to BTS tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4804ccabd342b82d44e69dbc6eaaae220ec7d4e4 Gerrit-Change-Number: 11356 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 23:00:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 23:00:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 23:00:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add chopped IPA ping test to BTS tests In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11356 ) Change subject: add chopped IPA ping test to BTS tests ...................................................................... add chopped IPA ping test to BTS tests Run the chopped IPA ping test from the IPA_Testing module as part of the BTS test suite. Contrary to the BSC version of this test, this test listens for an IPA connection rather than connecting to an IPA server. Make code in the IPA_Testing module for accepting connections actually work. Change-Id: I4804ccabd342b82d44e69dbc6eaaae220ec7d4e4 Related: OS#2010 --- M bts/BTS_Tests.ttcn M bts/gen_links.sh M library/IPA_Testing.ttcn 3 files changed, 12 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 82a54f3..2d59627 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -15,6 +15,7 @@ import from RSL_Types all; import from IPA_Types all; import from IPA_Emulation all; +import from IPA_Testing all; import from RSL_Emulation all; import from IPL4asp_Types all; @@ -4146,6 +4147,10 @@ f_tch_sign_l2_fill_frame(true); } +testcase TC_chopped_ipa_ping() runs on test_CT { + IPA_Testing.f_run_TC_chopped_ipa_ping(mp_rsl_ip, mp_rsl_port, LISTEN_FOR_CLIENT); +} + /* test generation of RLL ERR IND based on Um errors (TS 48.058 3.9) */ /* protocol error as per 44.006 */ /* link layer failure (repetition of I-frame N200 times without ACK */ @@ -4278,6 +4283,8 @@ execute( TC_tch_sign_l2_fill_frame() ); execute( TC_tch_sign_l2_fill_frame_dtxd() ); + + execute( TC_chopped_ipa_ping() ); } diff --git a/bts/gen_links.sh b/bts/gen_links.sh index b6c4e12..1ec6153 100755 --- a/bts/gen_links.sh +++ b/bts/gen_links.sh @@ -42,6 +42,7 @@ FILES+="Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="TRXC_Types.ttcn TRXC_CodecPort.ttcn TRXC_CodecPort_CtrlFunct.ttcn TRXC_CodecPort_CtrlFunctDef.cc " FILES+="PCUIF_Types.ttcn PCUIF_CodecPort.ttcn " +FILES+="IPA_Testing.ttcn" gen_links $DIR $FILES ignore_pp_results diff --git a/library/IPA_Testing.ttcn b/library/IPA_Testing.ttcn index 62aa143..a94dd46 100644 --- a/library/IPA_Testing.ttcn +++ b/library/IPA_Testing.ttcn @@ -139,8 +139,10 @@ if (conmode == CONNECT_TO_SERVER) { f_send_chopped_ipa_msg(ipa_ip, ipa_tcp_port, connId, ipa_msg_ping); } else { - IPL4.receive(t_recvfrom(omit)) -> value asp_rx { - f_send_chopped_ipa_msg(asp_rx.remName, asp_rx.remPort, connId, ipa_msg_ping); + var PortEvent port_evt; + IPL4.receive(PortEvent:{connOpened := ?}) -> value port_evt { + var ConnectionOpenedEvent conn := port_evt.connOpened; + f_send_chopped_ipa_msg(conn.remName, conn.remPort, conn.connId, ipa_msg_ping); } } -- To view, visit https://gerrit.osmocom.org/11356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4804ccabd342b82d44e69dbc6eaaae220ec7d4e4 Gerrit-Change-Number: 11356 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 23:00:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 23:00:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add an IPA test which sends a chopped payload In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11357 ) Change subject: add an IPA test which sends a chopped payload ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If75cb90841bb25619b414f0cabe008a2428a9fdf Gerrit-Change-Number: 11357 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 23:00:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 23:00:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 23:00:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add an IPA test which sends a chopped payload In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11357 ) Change subject: add an IPA test which sends a chopped payload ...................................................................... add an IPA test which sends a chopped payload Add another IPA test to the BTS and BSC test suites. This new test sends the header in one burst, followed by the payload which is transmitted byte-per-byte. The test uses an ID REQ message. If acting as a server, the test can expect an ID RESP message. However, if acting as a client, the server will close the connection when it receives the ID REQ. The CTRL interface port on the BSC does not close the connection in this case, so that particular port is skipped by the test for now. Change-Id: If75cb90841bb25619b414f0cabe008a2428a9fdf Related: OS#2010 Depends: I4804ccabd342b82d44e69dbc6eaaae220ec7d4e4 --- M bsc/BSC_Tests.ttcn M bts/BTS_Tests.ttcn M library/IPA_Testing.ttcn 3 files changed, 77 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 98224ad..fef5fd7 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2957,6 +2957,15 @@ } } +testcase TC_chopped_ipa_payload() runs on test_CT { + const Integers bsc_ipa_ports := {mp_bsc_rsl_port, mp_bsc_oml_port + /* TODO: mp_bsc_ctrl_port does not work yet */}; + for (var integer i := 0; i < lengthof(bsc_ipa_ports); i := i + 1) { + IPA_Testing.f_run_TC_chopped_ipa_payload(mp_bsc_ip, bsc_ipa_ports[i], CONNECT_TO_SERVER); + } +} + + /* Dyn PDCH todo: * activate OSMO as TCH/F * activate OSMO as TCH/H @@ -3068,6 +3077,7 @@ execute( TC_dyn_pdch_osmo_act_nack() ); execute( TC_chopped_ipa_ping() ); + execute( TC_chopped_ipa_payload() ); /* at bottom as they might crash OsmoBSC before OS#3182 is fixed */ execute( TC_early_conn_fail() ); diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 2d59627..e0470ec 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -4151,6 +4151,10 @@ IPA_Testing.f_run_TC_chopped_ipa_ping(mp_rsl_ip, mp_rsl_port, LISTEN_FOR_CLIENT); } +testcase TC_chopped_ipa_payload() runs on test_CT { + IPA_Testing.f_run_TC_chopped_ipa_payload(mp_rsl_ip, mp_rsl_port, LISTEN_FOR_CLIENT); +} + /* test generation of RLL ERR IND based on Um errors (TS 48.058 3.9) */ /* protocol error as per 44.006 */ /* link layer failure (repetition of I-frame N200 times without ACK */ @@ -4285,6 +4289,7 @@ execute( TC_tch_sign_l2_fill_frame_dtxd() ); execute( TC_chopped_ipa_ping() ); + execute( TC_chopped_ipa_payload() ); } diff --git a/library/IPA_Testing.ttcn b/library/IPA_Testing.ttcn index a94dd46..413dd31 100644 --- a/library/IPA_Testing.ttcn +++ b/library/IPA_Testing.ttcn @@ -32,6 +32,8 @@ /* Encoded IPA messages (network byte order) */ const octetstring ipa_msg_ping := '0001FE00'O; const octetstring ipa_msg_pong := '0001FE01'O; +const octetstring ipa_msg_id_req_hdr := '0007FE'O; +const octetstring ipa_msg_id_req_payload := '04010801070102'O; /* A component which represents the system on which the IPA speaker is running. */ type component system_CT { @@ -158,6 +160,60 @@ } } +/* Send a complete IPA "ID REQ" message header in one piece, and then send the payload one byte at a time, + * waiting for TCP buffer to flush between each byte. */ +private function f_TC_chopped_ipa_payload(charstring ipa_ip, integer ipa_tcp_port, + IPA_ConnectionMode conmode) runs on IPA_CT system system_CT { + var ConnectionId connId; + var ASP_RecvFrom asp_rx; + + connId := f_init(ipa_ip, ipa_tcp_port, conmode); + + if (conmode == CONNECT_TO_SERVER) { + var PortEvent port_evt; + f_send_ipa_data(ipa_ip, ipa_tcp_port, connId, ipa_msg_id_req_hdr); + f_send_chopped_ipa_msg(ipa_ip, ipa_tcp_port, connId, ipa_msg_id_req_payload); + /* Server will close the connection upon receiving an ID REQ. */ + alt { + [] IPL4.receive(PortEvent:{connClosed := ?}) -> value port_evt { + if (port_evt.connClosed.connId == connId) { + setverdict(pass); + } else { + repeat; + } + } + [] IPL4.receive { + repeat; + } + } + } else { + var PortEvent port_evt; + IPL4.receive(PortEvent:{connOpened := ?}) -> value port_evt { + var ConnectionOpenedEvent conn := port_evt.connOpened; + f_send_ipa_data(conn.remName, conn.remPort, conn.connId, ipa_msg_id_req_hdr); + f_send_chopped_ipa_msg(conn.remName, conn.remPort, conn.connId, ipa_msg_id_req_payload); + } + + /* Expect an encoded IPA ID RESP message from the client. */ + alt { + [] IPL4.receive(t_recvfrom(?)) -> value asp_rx { + log("received IPA message from ", asp_rx.remName, " port ", asp_rx.remPort, ": ", + asp_rx.msg); + if (lengthof(asp_rx.msg) > 4 + and asp_rx.msg[2] == 'FE'O /* PROTO_IPACCESS */ + and asp_rx.msg[3] == '05'O /* ID RESP */) { + setverdict(pass); + } else { + repeat; + } + } + [] IPL4.receive { + repeat; + } + } + } +} + /* * Public functions. * Test suites may call these functions to create an IPA_CT component and run a test to completion. @@ -169,4 +225,10 @@ vc_IPA_Testing.done; } +function f_run_TC_chopped_ipa_payload(charstring ipa_ip, integer ipa_tcp_port, IPA_ConnectionMode conmode) { + var IPA_Testing.IPA_CT vc_IPA_Testing := IPA_Testing.IPA_CT.create; + vc_IPA_Testing.start(IPA_Testing.f_TC_chopped_ipa_payload(ipa_ip, ipa_tcp_port, conmode)); + vc_IPA_Testing.done; +} + } -- To view, visit https://gerrit.osmocom.org/11357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If75cb90841bb25619b414f0cabe008a2428a9fdf Gerrit-Change-Number: 11357 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 23:01:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 23:01:34 +0000 Subject: Change in openbsc[master]: mgcp: osmux: allow enabling osmux only on correct activating state In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11338 ) Change subject: mgcp: osmux: allow enabling osmux only on correct activating state ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I21eb30fa8d48f3d592ff197bd74e673fdac51c1d Gerrit-Change-Number: 11338 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 23:01:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 23:02:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 23:02:14 +0000 Subject: Change in openbsc[master]: mgcp: osmux: Improve checks around activating and using enabled osmux In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11339 ) Change subject: mgcp: osmux: Improve checks around activating and using enabled osmux ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3536169c94e65f999aaa9c9e43cc7dab8551d30f Gerrit-Change-Number: 11339 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 23:02:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 23:02:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 23:02:27 +0000 Subject: Change in openbsc[master]: mgcp: osmux: allow enabling osmux only on correct activating state In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11338 ) Change subject: mgcp: osmux: allow enabling osmux only on correct activating state ...................................................................... mgcp: osmux: allow enabling osmux only on correct activating state State ACTIVATING is set once negotiation between the 2 parts went successfuly. Change-Id: I21eb30fa8d48f3d592ff197bd74e673fdac51c1d --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index b46ea10..6be5eb2 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -452,9 +452,9 @@ */ static const uint32_t rtp_ssrc_winlen = UINT32_MAX / (OSMUX_CID_MAX + 1); - if (endp->osmux.state == OSMUX_STATE_DISABLED) { - LOGP(DMGCP, LOGL_ERROR, "Endpoint 0x%x didn't request Osmux\n", - ENDPOINT_NUMBER(endp)); + if (endp->osmux.state != OSMUX_STATE_ACTIVATING) { + LOGP(DMGCP, LOGL_ERROR, "Endpoint 0x%x didn't negotiate Osmux, state %d\n", + ENDPOINT_NUMBER(endp), endp->osmux.state); return -1; } -- To view, visit https://gerrit.osmocom.org/11338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I21eb30fa8d48f3d592ff197bd74e673fdac51c1d Gerrit-Change-Number: 11338 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 23:02:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 23:02:27 +0000 Subject: Change in openbsc[master]: mgcp: osmux: Improve checks around activating and using enabled osmux In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11339 ) Change subject: mgcp: osmux: Improve checks around activating and using enabled osmux ...................................................................... mgcp: osmux: Improve checks around activating and using enabled osmux * Refactor code to have unified checks on all paths activating Osmux. * Improve checkings at activation time and add logging. * Code now enforces endp osmux status to be enabled before processing the frame through endp->osmux.out. Before, a delayed or bad pkt could arrive and be processed by an endp with osmux not enabled, using endp->osmux.out that was not initialized and ended up crashing: libosmo-netif/src/osmux.c:281:3: runtime error: member access within null pointer of type 'struct msgb' This could also happen if a BSC started sending or we received (non legacy dummy) osmux frames before we received the BSC CRCX ACK agreeing on osmux negotiation and switching to ACTIVATING state. Related: SYS#4350 Change-Id: I3536169c94e65f999aaa9c9e43cc7dab8551d30f --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 43 insertions(+), 42 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index 6be5eb2..a0ac295 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -261,6 +261,34 @@ return msg; } +/* Updates endp osmux state and returns 0 if it can process messages, -1 otherwise */ +static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) +{ + switch(endp->osmux.state) { + case OSMUX_STATE_ACTIVATING: + if (osmux_enable_endpoint(endp, &addr->sin_addr, addr->sin_port) < 0 ) { + LOGP(DMGCP, LOGL_ERROR, + "Could not enable osmux in endpoint 0x%x for %s:%u\n", + ENDPOINT_NUMBER(endp), inet_ntoa(addr->sin_addr), + ntohs(addr->sin_port)); + return -1; + } + LOGP(DMGCP, LOGL_INFO, "Enabling osmux in endpoint 0x%x for %s:%u\n", + ENDPOINT_NUMBER(endp), inet_ntoa(addr->sin_addr), + ntohs(addr->sin_port)); + return 0; + case OSMUX_STATE_ENABLED: + return 0; + default: + LOGP(DMGCP, LOGL_ERROR, + "Osmux %s in endpoint 0x%x for %s:%u without full negotiation, state %d\n", + sending ? "sent" : "received", + ENDPOINT_NUMBER(endp), inet_ntoa(addr->sin_addr), + ntohs(addr->sin_port), endp->osmux.state); + return -1; + } +} + static int osmux_legacy_dummy_parse_cid(struct sockaddr_in *addr, struct msgb *msg, uint8_t *osmux_cid) { @@ -312,11 +340,12 @@ osmuxh->circuit_id); goto out; } - endp->osmux.stats.octets += osmux_chunk_length(msg, rem); - endp->osmux.stats.chunks++; + if (endp_osmux_state_check(endp, &addr, false) == 0) { + endp->osmux.stats.octets += osmux_chunk_length(msg, rem); + endp->osmux.stats.chunks++; + osmux_xfrm_output_sched(&endp->osmux.out, osmuxh); + } rem = msg->len; - - osmux_xfrm_output_sched(&endp->osmux.out, osmuxh); } out: msgb_free(msg); @@ -339,20 +368,8 @@ "Cannot find endpoint for Osmux CID %d\n", osmux_cid); goto out; } - - if (endp->osmux.state == OSMUX_STATE_ENABLED) - goto out; - - if (osmux_enable_endpoint(endp, &addr->sin_addr, addr->sin_port) < 0 ) { - LOGP(DMGCP, LOGL_ERROR, - "Could not enable osmux in endpoint 0x%x\n", - ENDPOINT_NUMBER(endp)); - goto out; - } - - LOGP(DMGCP, LOGL_INFO, "Enabling osmux in endpoint 0x%x for %s:%u\n", - ENDPOINT_NUMBER(endp), inet_ntoa(addr->sin_addr), - ntohs(addr->sin_port)); + endp_osmux_state_check(endp, addr, false); + /* Only needed to punch hole in firewall, it can be dropped */ out: msgb_free(msg); return 0; @@ -393,11 +410,12 @@ osmuxh->circuit_id); goto out; } - endp->osmux.stats.octets += osmux_chunk_length(msg, rem); - endp->osmux.stats.chunks++; + if (endp_osmux_state_check(endp, &addr, false) == 0) { + endp->osmux.stats.octets += osmux_chunk_length(msg, rem); + endp->osmux.stats.chunks++; + osmux_xfrm_output_sched(&endp->osmux.out, osmuxh); + } rem = msg->len; - - osmux_xfrm_output_sched(&endp->osmux.out, osmuxh); } out: msgb_free(msg); @@ -535,26 +553,9 @@ if (memcmp(&endp->net_end.addr, &addr_unset, sizeof(addr_unset)) == 0) return 0; - if (endp->osmux.state == OSMUX_STATE_ACTIVATING) { - if (osmux_enable_endpoint(endp, &endp->net_end.addr, - htons(endp->cfg->osmux_port)) < 0) { - LOGP(DMGCP, LOGL_ERROR, - "Could not activate osmux in endpoint 0x%x\n", - ENDPOINT_NUMBER(endp)); - return 0; - } - LOGP(DMGCP, LOGL_ERROR, - "Osmux CID %u for %s:%u is now enabled\n", - endp->osmux.cid, inet_ntoa(endp->net_end.addr), - endp->cfg->osmux_port); - } - if(endp->osmux.state != OSMUX_STATE_ENABLED) { - LOGP(DMGCP, LOGL_ERROR, - "OSMUX dummy to %s CID %u: Osmux not enabled on endpoint 0x%x state %d\n", - inet_ntoa(endp->net_end.addr), endp->osmux.cid, - ENDPOINT_NUMBER(endp), endp->osmux.state); - return 0; - } + if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) + return; + LOGP(DMGCP, LOGL_DEBUG, "sending OSMUX dummy load to %s CID %u\n", inet_ntoa(endp->net_end.addr), endp->osmux.cid); -- To view, visit https://gerrit.osmocom.org/11339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3536169c94e65f999aaa9c9e43cc7dab8551d30f Gerrit-Change-Number: 11339 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 23:02:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 23:02:28 +0000 Subject: Change in openbsc[master]: osmux.h: Document enum osmux_state In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11340 ) Change subject: osmux.h: Document enum osmux_state ...................................................................... osmux.h: Document enum osmux_state Change-Id: If5de6e981e9af7b667dd3365d758f868f38bf6e0 --- M openbsc/include/openbsc/osmux.h 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/include/openbsc/osmux.h b/openbsc/include/openbsc/osmux.h index f3ea72a..6386125 100644 --- a/openbsc/include/openbsc/osmux.h +++ b/openbsc/include/openbsc/osmux.h @@ -26,10 +26,10 @@ int osmux_used_cid(void); enum osmux_state { - OSMUX_STATE_DISABLED = 0, - OSMUX_STATE_NEGOTIATING, - OSMUX_STATE_ACTIVATING, - OSMUX_STATE_ENABLED, + OSMUX_STATE_DISABLED = 0, /* Osmux not being currently used by endp */ + OSMUX_STATE_NEGOTIATING, /* Osmux was locally requested in MGCP CRCX */ + OSMUX_STATE_ACTIVATING, /* Osmux was accepted in MGCP CRCX ACK. It can now be enabled by \ref osmux_enable_endpoint. */ + OSMUX_STATE_ENABLED, /* Osmux was initialized by \ref osmux_enable_endpoint and can process frames */ }; enum osmux_usage { -- To view, visit https://gerrit.osmocom.org/11340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If5de6e981e9af7b667dd3365d758f868f38bf6e0 Gerrit-Change-Number: 11340 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 23:03:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 23:03:02 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: notify conn of released lchan upon RF Release In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11313 ) Change subject: lchan_fsm: notify conn of released lchan upon RF Release ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7621616c24588c2db15ad1ae7ca68cfa0fb76f66 Gerrit-Change-Number: 11313 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 23:03:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 23:03:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 23:03:40 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: adjust inter-BSC HO failure handling to spec In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11314 ) Change subject: handover_fsm: adjust inter-BSC HO failure handling to spec ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11314 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0980cacb9713e41a1eef3a0a7f6cc892e8a20da5 Gerrit-Change-Number: 11314 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 15 Oct 2018 23:03:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 23:03:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 23:03:41 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: notify conn of released lchan upon RF Release In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11313 ) Change subject: lchan_fsm: notify conn of released lchan upon RF Release ...................................................................... lchan_fsm: notify conn of released lchan upon RF Release Related: osmo-ttcn3-hacks If772dbbc5f9790d3f911465e1303dd0a99811154 Change-Id: I7621616c24588c2db15ad1ae7ca68cfa0fb76f66 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 9f2d6c3..39edaff 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -993,6 +993,13 @@ { int rc; struct gsm_lchan *lchan = lchan_fi_lchan(fi); + + /* For planned releases, a conn has already forgotten about the lchan. And later on, in + * lchan_reset(), we make sure it does. But in case of releases from error handling, the + * conn might as well notice now already that its lchan is becoming unusable. */ + if (lchan->conn) + gscon_forget_lchan(lchan->conn, lchan); + rc = rsl_tx_rf_chan_release(lchan); if (rc) LOG_LCHAN(lchan, LOGL_ERROR, "Failed to Tx RSL RF Channel Release: rc=%d %s\n", -- To view, visit https://gerrit.osmocom.org/11313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7621616c24588c2db15ad1ae7ca68cfa0fb76f66 Gerrit-Change-Number: 11313 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 15 23:03:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 15 Oct 2018 23:03:42 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: adjust inter-BSC HO failure handling to spec In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11314 ) Change subject: handover_fsm: adjust inter-BSC HO failure handling to spec ...................................................................... handover_fsm: adjust inter-BSC HO failure handling to spec Inter-BSC outgoing lacked the required BSSMAP HO Failure dispatch. Not all cases should send BSSMAP HO Failure, name the relevant spec paragraphs in comments and adjust handling. Related: osmo-ttcn3-hacks If772dbbc5f9790d3f911465e1303dd0a99811154 Change-Id: I0980cacb9713e41a1eef3a0a7f6cc892e8a20da5 --- M src/osmo-bsc/handover_fsm.c 1 file changed, 33 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 90d5f6c..4286084 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -40,6 +40,7 @@ #include #include #include +#include #define LOG_FMT_BTS "bts %u lac-ci %u-%u arfcn-bsic %d-%d" #define LOG_ARGS_BTS(bts) \ @@ -697,9 +698,39 @@ result = HO_RESULT_ERROR; } else result = bsc_tx_bssmap_ho_complete(conn, ho->new_lchan); - } else { + } + /* Not 'else': above checks may still result in HO_RESULT_ERROR. */ + if (result == HO_RESULT_ERROR) { + /* Return a BSSMAP Handover Failure, as described in 3GPP TS 48.008 3.1.5.2.2 + * "Handover Resource Allocation Failure" */ bsc_tx_bssmap_ho_failure(conn); - /* TODO: Also send BSSMAP Clear Request? */ + } + } else if (ho->scope & HO_INTER_BSC_OUT) { + switch (result) { + case HO_RESULT_OK: + break; + case HO_RESULT_FAIL_RR_HO_FAIL: + /* Return a BSSMAP Handover Failure, as described in 3GPP TS 48.008 3.1.5.3.2 + * "Handover Failure" */ + bsc_tx_bssmap_ho_failure(conn); + break; + default: + case HO_RESULT_FAIL_TIMEOUT: + switch (ho->fi->state) { + case HO_OUT_ST_WAIT_HO_COMMAND: + /* MSC never replied with a Handover Command. Fail and ignore the + * handover, continue to use the lchan. */ + break; + default: + case HO_OUT_ST_WAIT_CLEAR: + /* 3GPP TS 48.008 3.1.5.3.3 "Abnormal Conditions": if neither MS reports + * HO Failure nor the MSC sends a Clear Command, we should release the + * dedicated radio resources and send a Clear Request to the MSC. */ + lchan_release(conn->lchan, false, true, GSM48_RR_CAUSE_ABNORMAL_TIMER); + /* Once the channel release is through, the BSSMAP Clear will follow. */ + break; + } + break; } } -- To view, visit https://gerrit.osmocom.org/11314 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0980cacb9713e41a1eef3a0a7f6cc892e8a20da5 Gerrit-Change-Number: 11314 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Oct 16 00:19:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 16 Oct 2018 00:19:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6192?= Message-ID: <957836406.84.1539649160324.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 266.65 KB...] 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-unknown-linux-gnu checking host system type... x86_64-unknown-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 whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-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 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 checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMOGB... yes checking for LIBOSMONETIF... yes checking for LIBGTP... yes checking for LIBCARES... yes checking for ANSI C header files... (cached) yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Wall -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating osmo-sgsn.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/sgsn/Makefile config.status: creating src/Makefile config.status: creating src/gprs/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gprs/Makefile config.status: creating tests/gbproxy/Makefile config.status: creating tests/sgsn/Makefile config.status: creating tests/gtphub/Makefile config.status: creating tests/xid/Makefile config.status: creating tests/sndcp_xid/Makefile config.status: creating tests/slhc/Makefile config.status: creating tests/v42bis/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands make[1]: Entering directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build' make all-recursive make[2]: Entering directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build' Making all in doc make[3]: Entering directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/doc' Making all in examples make[4]: Entering directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/doc/examples' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/doc/examples' make[4]: Entering directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/doc' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/doc' make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/doc' Making all in include make[3]: Entering directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/include' Making all in osmocom make[4]: Entering directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/include/osmocom' Making all in sgsn make[5]: Entering directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/include/osmocom/sgsn' make[5]: Nothing to be done for 'all'. make[5]: Leaving directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/include/osmocom/sgsn' make[5]: Entering directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/include/osmocom' make[5]: Nothing to be done for 'all-am'. make[5]: Leaving directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/include/osmocom' make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/include/osmocom' make[4]: Entering directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/include' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/include' make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/include' Making all in src make[3]: Entering directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/src' Making all in gprs make[4]: Entering directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/src/gprs' CC gb_proxy.o CC gb_proxy_main.o CC gb_proxy_vty.o CC gb_proxy_ctrl.o CC gb_proxy_patch.o CC gb_proxy_tlli.o CC gb_proxy_peer.o CC gprs_gb_parse.o CC gprs_llc_parse.o CC crc24.o CC gprs_utils.o CCLD osmo-gbproxy CC gprs_gmm_attach.o CC gprs_gmm.o ../../../src/gprs/gprs_gmm.c: In function 'gsm0408_gprs_rcvmsg_iu': ../../../src/gprs/gprs_gmm.c:2880:9: note: #pragma message: set drop_cipherable arg for gsm0408_rcv_gmm() from IuPS? #pragma message "set drop_cipherable arg for gsm0408_rcv_gmm() from IuPS?" ^ CC gprs_sgsn.o CC gprs_sndcp.o CC gprs_sndcp_comp.o CC gprs_sndcp_dcomp.o CC gprs_sndcp_pcomp.o CC gprs_sndcp_vty.o CC gprs_sndcp_xid.o CC sgsn_main.o CC sgsn_vty.o CC sgsn_libgtp.o CC gprs_llc.o CC gprs_llc_vty.o CC sgsn_ctrl.o CC sgsn_auth.o CC gprs_subscriber.o CC sgsn_cdr.o CC sgsn_ares.o CC slhc.o CC gprs_llc_xid.o CC v42bis.o CC gsup_client.o CCLD osmo-sgsn CC gtphub_main.o CC gtphub.o CC gtphub_sock.o CC gtphub_ares.o CC gtphub_vty.o CCLD osmo-gtphub make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/src/gprs' make[4]: Entering directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/src' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/src' make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/src' Making all in contrib make[3]: Entering directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/contrib' Making all in systemd make[4]: Entering directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/contrib/systemd' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/contrib/systemd' make[4]: Entering directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/contrib' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/contrib' make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/contrib' Making all in tests make[3]: Entering directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/tests' Making all in gprs make[4]: Entering directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/tests/gprs' CC gprs_test.o CC gprs_utils.o CCLD gprs_test make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/tests/gprs' Making all in gbproxy make[4]: Entering directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/tests/gbproxy' CC gbproxy_test.o CCLD gbproxy_test make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/tests/gbproxy' Making all in gtphub make[4]: Entering directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/tests/gtphub' CC gtphub_test.o CCLD gtphub_test /bin/bash: line 1: 29613 Segmentation fault (core dumped) /bin/bash ../../libtool --silent --tag=CC --mode=link gcc -Wall -ggdb3 -I/build/deps/install/stow/libosmocore/include/ -I/build/deps/install/stow/libosmo-abis/include/ -I/build/deps/install/stow/libosmocore/include/ -I/build/deps/install/stow/osmo-ggsn/include/ -g -O2 -Wall -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess -Wl,--wrap=gtphub_resolve_ggsn_addr -Wl,--wrap=gtphub_ares_init -Wl,--wrap=gtphub_write -o gtphub_test gtphub_test.o ../../src/gprs/gtphub.o ../../src/gprs/gprs_utils.o -L/build/deps/install/stow/libosmocore/lib -ltalloc -losmocore -L/build/deps/install/stow/libosmocore/lib -ltalloc -losmogsm -losmocore -L/build/deps/install/stow/osmo-ggsn/lib -lgtp -lrt make[4]: *** [gtphub_test] Error 139 Makefile:404: recipe for target 'gtphub_test' failed make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/tests/gtphub' Makefile:401: recipe for target 'all-recursive' failed make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build/tests' make[3]: *** [all-recursive] Error 1 make[2]: *** [all-recursive] Error 1 Makefile:494: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build' make[1]: *** [all] Error 2 Makefile:402: recipe for target 'all' failed make[1]: Leaving directory '/build/osmo-sgsn-1.3.0.59-e90b1/_build' make: *** [distcheck] Error 1 Makefile:702: recipe for target 'distcheck' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Oct 16 00:51:57 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 16 Oct 2018 00:51:57 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--dis?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6193?= In-Reply-To: <957836406.84.1539649160324.JavaMail.jenkins@jenkins.osmocom.org> References: <957836406.84.1539649160324.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <996350477.85.1539651117963.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Oct 16 09:46:37 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Oct 2018 09:46:37 +0000 Subject: Change in docker-playground[master]: osmo-*-latest: s/nightly/latest/g in Dockerfile Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11364 Change subject: osmo-*-latest: s/nightly/latest/g in Dockerfile ...................................................................... osmo-*-latest: s/nightly/latest/g in Dockerfile Follow up to I6a564206dd81743deb1eb27eca7081bc333d7434 where the "*-latest" Dockerfiles were introduced. msc, sgsn, sip, stp had references to "nightly" instead of "latest" in their Dockerfiles. Related: OS#3268 Change-Id: I1eab031038927043faf6ed8ed30bdf4d4d1624d5 --- M osmo-msc-latest/Dockerfile M osmo-sgsn-latest/Dockerfile M osmo-sip-latest/Dockerfile M osmo-stp-latest/Dockerfile 4 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/64/11364/1 diff --git a/osmo-msc-latest/Dockerfile b/osmo-msc-latest/Dockerfile index 02298e7..a8cc3ba 100644 --- a/osmo-msc-latest/Dockerfile +++ b/osmo-msc-latest/Dockerfile @@ -2,7 +2,7 @@ MAINTAINER Harald Welte -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/" COPY Release.key /tmp/Release.key @@ -12,7 +12,7 @@ RUN apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ - echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ diff --git a/osmo-sgsn-latest/Dockerfile b/osmo-sgsn-latest/Dockerfile index 56b5fda..87dbca2 100644 --- a/osmo-sgsn-latest/Dockerfile +++ b/osmo-sgsn-latest/Dockerfile @@ -2,7 +2,7 @@ MAINTAINER Harald Welte -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/" COPY Release.key /tmp/Release.key @@ -12,7 +12,7 @@ RUN apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ - echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ diff --git a/osmo-sip-latest/Dockerfile b/osmo-sip-latest/Dockerfile index 9f978d8..a468c9f 100644 --- a/osmo-sip-latest/Dockerfile +++ b/osmo-sip-latest/Dockerfile @@ -2,7 +2,7 @@ MAINTAINER Harald Welte -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/" COPY Release.key /tmp/Release.key diff --git a/osmo-stp-latest/Dockerfile b/osmo-stp-latest/Dockerfile index f5920a5..053e2ab 100644 --- a/osmo-stp-latest/Dockerfile +++ b/osmo-stp-latest/Dockerfile @@ -2,7 +2,7 @@ MAINTAINER Harald Welte -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/" COPY Release.key /tmp/Release.key @@ -12,7 +12,7 @@ RUN apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ - echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ -- To view, visit https://gerrit.osmocom.org/11364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1eab031038927043faf6ed8ed30bdf4d4d1624d5 Gerrit-Change-Number: 11364 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 09:46:38 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Oct 2018 09:46:38 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add docker_images_require() Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11365 Change subject: jenkins-common.sh: add docker_images_require() ...................................................................... jenkins-common.sh: add docker_images_require() This new function can be used on top of each *-test/jenkins.sh to specify which Docker images are required before the test can be executed. Unless the NO_DOCKER_IMAGE_BUILD environment variable is specified, it will build all of these images. With the existing logic, this will only rebuild images if they are outdated and otherwise use the cached version (in that case it goes through almost instantly). It also aborts if an image is missing, so we don't need to find that out by reading through the log after running an entire build job. The top-level Makefile should also be able to build all Docker images on which a job depends. But it is not maintained anymore. And in that Makefile the list of dependencies can not be specified dynamically, as it will be necessary for OS#3268: ttcn3-mgw-test may depend on osmo-mgw-latest or on osmo-mgw-master. Related: OS#3268 Change-Id: I0afdf3400282634fca9b31d57eaeedd6b5c28aa1 --- M jenkins-common.sh 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/65/11365/1 diff --git a/jenkins-common.sh b/jenkins-common.sh index 515479f..f3d6c61 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -1,3 +1,22 @@ +docker_image_exists() { + test -n "$(docker images -q "$REPO_USER/$1")" +} + +docker_images_require() { + for i in $@; do + # Trigger image build (cache will be used when up-to-date) + if [ -z "$NO_DOCKER_IMAGE_BUILD" ]; then + echo "Building image: $i (export NO_DOCKER_IMAGE_BUILD=1 to prevent this)" + make -C "../$i" + fi + + # Detect missing images (build skipped/failure) + if ! docker_image_exists "$i"; then + echo "ERROR: missing image: $i" + exit 1 + fi + done +} network_create() { NET=$1 -- To view, visit https://gerrit.osmocom.org/11365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0afdf3400282634fca9b31d57eaeedd6b5c28aa1 Gerrit-Change-Number: 11365 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 09:46:38 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Oct 2018 09:46:38 +0000 Subject: Change in docker-playground[master]: jenkins.sh: new IMAGE_SUFFIX environment variable Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11366 Change subject: jenkins.sh: new IMAGE_SUFFIX environment variable ...................................................................... jenkins.sh: new IMAGE_SUFFIX environment variable Default value "master" can be changed to "latest" to test the latest stable builds instead of the nightly ones. Use docker_images_require() to make sure that the required images are existing and up-to-date before running the tests. Related: OS#3268 Change-Id: Idbb708ab16cb71bab5069127945b63388222369e --- M m3ua-test/jenkins.sh M sua-test/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh 11 files changed, 97 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/66/11366/1 diff --git a/m3ua-test/jenkins.sh b/m3ua-test/jenkins.sh index 61f7c05..a6625eb 100755 --- a/m3ua-test/jenkins.sh +++ b/m3ua-test/jenkins.sh @@ -1,6 +1,12 @@ #!/bin/sh . ../jenkins-common.sh +[ -z "$IMAGE_SUFFIX" ] && IMAGE_SUFFIX="master" +docker_images_require \ + "debian-jessie-build" \ + "osmo-stp-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "m3ua-test" mkdir $VOL_BASE_DIR/m3ua-tester cp m3ua-param-testtool.scm all-sgp-tests.txt $VOL_BASE_DIR/m3ua-tester/ @@ -16,7 +22,7 @@ --network $NET_NAME --ip 172.18.7.200 \ -v $VOL_BASE_DIR/stp:/data \ --name ${BUILD_TAG}-stp \ - -d $REPO_USER/osmo-stp-master + -d $REPO_USER/osmo-stp-$IMAGE_SUFFIX # start docker container with tests docker run --rm \ diff --git a/sua-test/jenkins.sh b/sua-test/jenkins.sh index 0f87b4e..c6ceac5 100755 --- a/sua-test/jenkins.sh +++ b/sua-test/jenkins.sh @@ -1,6 +1,13 @@ #!/bin/sh . ../jenkins-common.sh +[ -z "$IMAGE_SUFFIX" ] && IMAGE_SUFFIX="master" +docker_images_require \ + "debian-jessie-build" \ + "osmo-stp-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "sigtran-tests" \ + "sua-test" mkdir $VOL_BASE_DIR/sua-tester cp sua-param-testtool-sgp.scm some-sua-sgp-tests.txt $VOL_BASE_DIR/sua-tester/ @@ -16,7 +23,7 @@ --network $NET_NAME --ip 172.18.6.200 \ -v $VOL_BASE_DIR/stp:/data \ --name ${BUILD_TAG}-stp \ - -d $REPO_USER/osmo-stp-master + -d $REPO_USER/osmo-stp-$IMAGE_SUFFIX # start docker container with tests docker run --rm \ diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index bceb0ec..e90c689 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -1,6 +1,13 @@ #!/bin/sh . ../jenkins-common.sh +[ -z "$IMAGE_SUFFIX" ] && IMAGE_SUFFIX="master" +docker_images_require \ + "debian-jessie-build" \ + "osmo-bsc-$IMAGE_SUFFIX" \ + "osmo-bts-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "ttcn3-bsc-test" #Make sure NET_NAME doesn't clash with the AoIP BSC test NET_NAME=ttcn3-bsc_sccplite-test @@ -18,14 +25,17 @@ --network $NET_NAME --ip 172.18.12.20 \ -v $VOL_BASE_DIR/bsc:/data \ --name ${BUILD_TAG}-bsc -d \ - $REPO_USER/osmo-bsc-master + $REPO_USER/osmo-bsc-$IMAGE_SUFFIX for i in `seq 0 2`; do echo Starting container with OML for BTS$i docker run --rm \ --network $NET_NAME --ip 172.18.12.10$i \ --name ${BUILD_TAG}-bts$i -d \ - $REPO_USER/osmo-bts-master /usr/local/bin/respawn.sh osmo-bts-omldummy 172.18.12.20 $((i + 1234)) 1 + $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ + /usr/local/bin/respawn.sh \ + osmo-bts-omldummy \ + 172.18.12.20 $((i + 1234)) 1 done echo Starting container with BSC testsuite diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 7536396..ed7fef2 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -1,6 +1,14 @@ #!/bin/sh . ../jenkins-common.sh +[ -z "$IMAGE_SUFFIX" ] && IMAGE_SUFFIX="master" +docker_images_require \ + "debian-jessie-build" \ + "osmo-stp-$IMAGE_SUFFIX" \ + "osmo-bsc-$IMAGE_SUFFIX" \ + "osmo-bts-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "ttcn3-bsc-test" mkdir $VOL_BASE_DIR/bsc-tester cp BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ @@ -18,21 +26,23 @@ --network $NET_NAME --ip 172.18.2.200 \ -v $VOL_BASE_DIR/stp:/data \ --name ${BUILD_TAG}-stp -d \ - $REPO_USER/osmo-stp-master + $REPO_USER/osmo-stp-$IMAGE_SUFFIX echo Starting container with BSC docker run --rm \ --network $NET_NAME --ip 172.18.2.20 \ -v $VOL_BASE_DIR/bsc:/data \ --name ${BUILD_TAG}-bsc -d \ - $REPO_USER/osmo-bsc-master + $REPO_USER/osmo-bsc-$IMAGE_SUFFIX for i in `seq 0 2`; do echo Starting container with OML for BTS$i docker run --rm \ --network $NET_NAME --ip 172.18.2.10$i \ --name ${BUILD_TAG}-bts$i -d \ - $REPO_USER/osmo-bts-master /usr/local/bin/respawn.sh osmo-bts-omldummy 172.18.2.20 $((i + 1234)) 1 + $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ + /usr/local/bin/respawn.sh \ + osmo-bts-omldummy 172.18.2.20 $((i + 1234)) 1 done echo Starting container with BSC testsuite diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 1cd06e7..7f9a07f 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -1,6 +1,15 @@ #!/bin/sh . ../jenkins-common.sh +[ -z "$IMAGE_SUFFIX" ] && IMAGE_SUFFIX="master" +# NOTE: there is no osmocom-bb-host-latest, hence always use master! +docker_images_require \ + "debian-jessie-build" \ + "osmo-bsc-$IMAGE_SUFFIX" \ + "osmo-bts-$IMAGE_SUFFIX" \ + "osmocom-bb-host-master" \ + "debian-stretch-titan" \ + "ttcn3-bts-test" network_create 172.18.9.0/24 @@ -22,7 +31,7 @@ --network $NET_NAME --ip 172.18.9.11 \ -v $VOL_BASE_DIR/bsc:/data \ --name ${BUILD_TAG}-bsc -d \ - $REPO_USER/osmo-bsc-master \ + $REPO_USER/osmo-bsc-$IMAGE_SUFFIX \ /usr/local/bin/osmo-bsc -c /data/osmo-bsc.cfg echo Starting container with BTS @@ -31,14 +40,14 @@ -v $VOL_BASE_DIR/bts:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-bts -d \ - $REPO_USER/osmo-bts-master \ + $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ /usr/local/bin/respawn.sh /usr/local/bin/osmo-bts-trx -c /data/osmo-bts.cfg -i 172.18.9.10 echo Starting container with fake_trx docker run --rm \ --network $NET_NAME --ip 172.18.9.21 \ --name ${BUILD_TAG}-fake_trx -d \ - $REPO_USER/osmocom-bb-host-master \ + $REPO_USER/osmocom-bb-host-$IMAGE_SUFFIX \ /tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py -R 172.18.9.20 -r 172.18.9.22 echo Starting container with trxcon @@ -46,7 +55,7 @@ --network $NET_NAME --ip 172.18.9.22 \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-trxcon -d \ - $REPO_USER/osmocom-bb-host-master \ + $REPO_USER/osmocom-bb-host-$IMAGE_SUFFIX \ /usr/local/bin/trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2 diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 2da6aed..0e6a26f 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -1,6 +1,12 @@ #!/bin/sh . ../jenkins-common.sh +[ -z "$IMAGE_SUFFIX" ] && IMAGE_SUFFIX="master" +docker_images_require \ + "debian-jessie-build" \ + "osmo-ggsn-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "ttcn3-ggsn-test" mkdir $VOL_BASE_DIR/ggsn-tester cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ @@ -18,7 +24,7 @@ --network $NET_NAME --ip 172.18.3.201 \ -v $VOL_BASE_DIR/ggsn:/data \ --name ${BUILD_TAG}-ggsn -d \ - $REPO_USER/osmo-ggsn-master + $REPO_USER/osmo-ggsn-$IMAGE_SUFFIX # start docker container with testsuite in foreground docker run --rm \ diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index 5d208df..04c1ef3 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -1,6 +1,12 @@ #!/bin/sh . ../jenkins-common.sh +[ -z "$IMAGE_SUFFIX" ] && IMAGE_SUFFIX="master" +docker_images_require \ + "debian-jessie-build" \ + "osmo-hlr-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "ttcn3-hlr-test" network_create 172.18.10.0/24 @@ -15,7 +21,7 @@ --network $NET_NAME --ip 172.18.10.20 \ -v $VOL_BASE_DIR/hlr:/data \ --name ${BUILD_TAG}-hlr -d \ - $REPO_USER/osmo-hlr-master \ + $REPO_USER/osmo-hlr-$IMAGE_SUFFIX \ /usr/local/bin/osmo-hlr echo Starting container with HLR testsuite diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index ee624b9..9e8e9ef 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -1,6 +1,12 @@ #!/bin/sh . ../jenkins-common.sh +[ -z "$IMAGE_SUFFIX" ] && IMAGE_SUFFIX="master" +docker_images_require \ + "debian-jessie-build" \ + "osmo-mgw-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "ttcn3-mgw-test" mkdir $VOL_BASE_DIR/mgw-tester cp MGCP_Test.cfg $VOL_BASE_DIR/mgw-tester/ @@ -15,7 +21,7 @@ --network $NET_NAME --ip 172.18.4.180 \ -v $VOL_BASE_DIR/mgw:/data \ --name ${BUILD_TAG}-mgw -d \ - $REPO_USER/osmo-mgw-master + $REPO_USER/osmo-mgw-$IMAGE_SUFFIX # start docker container with testsuite in foreground docker run --rm \ diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index 560eea7..b8eb35c 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -1,6 +1,13 @@ #!/bin/sh . ../jenkins-common.sh +[ -z "$IMAGE_SUFFIX" ] && IMAGE_SUFFIX="master" +docker_images_require \ + "debian-jessie-build" \ + "osmo-stp-$IMAGE_SUFFIX" \ + "osmo-msc-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "ttcn3-msc-test" network_create 172.18.1.0/24 @@ -22,7 +29,7 @@ --network $NET_NAME --ip 172.18.1.200 \ -v $VOL_BASE_DIR/stp:/data \ --name ${BUILD_TAG}-stp -d \ - $REPO_USER/osmo-stp-master + $REPO_USER/osmo-stp-$IMAGE_SUFFIX echo Starting container with MSC docker run --rm \ @@ -30,7 +37,7 @@ -v $VOL_BASE_DIR/msc:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-msc -d \ - $REPO_USER/osmo-msc-master \ + $REPO_USER/osmo-msc-$IMAGE_SUFFIX \ /usr/local/bin/osmo-msc -M /data/unix/mncc echo Starting container with MSC testsuite diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index f1481b1..19c0248 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -1,6 +1,12 @@ #!/bin/sh . ../jenkins-common.sh +[ -z "$IMAGE_SUFFIX" ] && IMAGE_SUFFIX="master" +docker_images_require \ + "debian-jessie-build" \ + "osmo-sgsn-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "ttcn3-sgsn-test" network_create 172.18.8.0/24 @@ -17,7 +23,7 @@ --network $NET_NAME --ip 172.18.8.10 \ -v $VOL_BASE_DIR/sgsn:/data \ --name ${BUILD_TAG}-sgsn -d \ - $REPO_USER/osmo-sgsn-master \ + $REPO_USER/osmo-sgsn-$IMAGE_SUFFIX \ /usr/local/bin/osmo-sgsn echo Starting container with SGSN testsuite diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index 37a8e95..c02233f 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -1,6 +1,12 @@ #!/bin/sh . ../jenkins-common.sh +[ -z "$IMAGE_SUFFIX" ] && IMAGE_SUFFIX="master" +docker_images_require \ + "debian-jessie-build" \ + "osmo-sip-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "ttcn3-sip-test" network_create 172.18.11.0/24 @@ -20,7 +26,7 @@ -v $VOL_BASE_DIR/sip:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-sip-connector -d \ - $REPO_USER/osmo-sip-master \ + $REPO_USER/osmo-sip-$IMAGE_SUFFIX \ /usr/local/bin/osmo-sip-connector -M /data/unix/mncc echo Starting container with SIP testsuite -- To view, visit https://gerrit.osmocom.org/11366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e Gerrit-Change-Number: 11366 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 09:46:38 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Oct 2018 09:46:38 +0000 Subject: Change in docker-playground[master]: symlinks: ttcn3-bsc-test-sccplite Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11367 Change subject: symlinks: ttcn3-bsc-test-sccplite ...................................................................... symlinks: ttcn3-bsc-test-sccplite Create the ttcn3-bsc-test-sccplite folder, with symlinks to ttcn3-bsc-test/jenkins-sccplite.sh and ttcn3-bsc-test/sccplite. This allows writing the jenkins job builder config files in a generic way. Related: OS#3268 Change-Id: I1d1d277475090cd615a0e2d07a42b2032cdefb9c --- A ttcn3-bsc-test-sccplite/jenkins.sh A ttcn3-bsc-test-sccplite/sccplite 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/67/11367/1 diff --git a/ttcn3-bsc-test-sccplite/jenkins.sh b/ttcn3-bsc-test-sccplite/jenkins.sh new file mode 120000 index 0000000..9a6da0f --- /dev/null +++ b/ttcn3-bsc-test-sccplite/jenkins.sh @@ -0,0 +1 @@ +../ttcn3-bsc-test/jenkins-sccplite.sh \ No newline at end of file diff --git a/ttcn3-bsc-test-sccplite/sccplite b/ttcn3-bsc-test-sccplite/sccplite new file mode 120000 index 0000000..9a5b492 --- /dev/null +++ b/ttcn3-bsc-test-sccplite/sccplite @@ -0,0 +1 @@ +../ttcn3-bsc-test/sccplite \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/11367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1d1d277475090cd615a0e2d07a42b2032cdefb9c Gerrit-Change-Number: 11367 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 09:46:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Oct 2018 09:46:39 +0000 Subject: Change in docker-playground[master]: symlinks: nplab-m3ua-test, nplab-sua-test Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11368 Change subject: symlinks: nplab-m3ua-test, nplab-sua-test ...................................................................... symlinks: nplab-m3ua-test, nplab-sua-test Allows writing a generic Jenkins Job Builder config. Related: OS#3268 Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de --- A nplab-m3ua-test A nplab-sua-test 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/68/11368/1 diff --git a/nplab-m3ua-test b/nplab-m3ua-test new file mode 120000 index 0000000..4f3a365 --- /dev/null +++ b/nplab-m3ua-test @@ -0,0 +1 @@ +m3ua-test \ No newline at end of file diff --git a/nplab-sua-test b/nplab-sua-test new file mode 120000 index 0000000..2103b43 --- /dev/null +++ b/nplab-sua-test @@ -0,0 +1 @@ +sua-test \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/11368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de Gerrit-Change-Number: 11368 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 09:46:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Oct 2018 09:46:39 +0000 Subject: Change in docker-playground[master]: Remove top-level Makefile Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11369 Change subject: Remove top-level Makefile ...................................................................... Remove top-level Makefile Obsoleted by docker_images_require(). The top-level Makefile had the following drawbacks: * it was not maintained: many targets were missing, and some of the existing ones did not build anymore * make targets have the same names as the folders, so if they are not listed in the Makefile, it will assume that the target has been built already (prone to making mistakes) Related: OS#3268 Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff --- D Makefile 1 file changed, 0 insertions(+), 82 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/69/11369/1 diff --git a/Makefile b/Makefile deleted file mode 100644 index e224274..0000000 --- a/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -.PHONY: build -build: debian-jessie-build osmo-ggsn-master osmo-stp-master sctp-test sigtran-tests m3ua-test sua-test debian-stretch-titan ttcn3-ggsn-test - -.PHONY: debian-jessie-build -debian-jessie-build: - $(MAKE) -C debian-jessie-build - -.PHONY: debian-stretch-titan -debian-stretch-titan: - $(MAKE) -C debian-stretch-titan - -.PHONY: osmo-bsc-master -osmo-bsc-master: debian-jessie-build - $(MAKE) -C osmo-bsc-master - -.PHONY: osmo-bts-master -osmo-bts-master: debian-jessie-build - $(MAKE) -C osmo-bts-master - -.PHONY: osmo-msc-master -osmo-msc-master: debian-jessie-build - $(MAKE) -C osmo-msc-master - -.PHONY: osmo-stp-master -osmo-stp-master: debian-jessie-build - $(MAKE) -C osmo-stp-master - -.PHONY: osmocom-bb-host-master -osmocom-bb-host-master: debian-jessie-build - $(MAKE) -C osmocom-bb-host-master - -.PHONY: osmo-ggsn-master -osmo-ggsn-master: debian-jessie-build - $(MAKE) -C osmo-ggsn-master - -.PHONY: osmo-hlr-master -osmo-hlr-master: debian-jessie-build - $(MAKE) -C osmo-hlr-master - -.PHONY: ttcn3-bsc-test -ttcn3-bsc-test: debian-stretch-titan osmo-stp-master osmo-bsc-master osmo-bts-master ttcn3-bsc-test - $(MAKE) -C ttcn3-bsc-test - -.PHONY: ttcn3-bts-test -ttcn3-bts-test: debian-stretch-titan osmo-bsc-master osmo-bts-master osmocom-bb-host-master ttcn3-bts-test - $(MAKE) -C ttcn3-bts-test - -.PHONY: ttcn3-msc-test -ttcn3-msc-test: debian-stretch-titan osmo-stp-master osmo-msc-master ttcn3-msc-test - $(MAKE) -C ttcn3-msc-test - -.PHONY: ttcn3-ggsn-test -ttcn3-ggsn-test: osmo-ggsn-test - $(MAKE) -C ggsn-test - -.PHONY: ttcn3-mgw-test -ttcn3-mgw-test: debian-stretch-titan osmo-mgw-master - $(MAKE) -C ttcn3-mgw-test - -.PHONY: ttcn3-hlr-test -ttcn3-hlr-test: debian-stretch-titan osmo-hlr-master - $(MAKE) -C ttcn3-hlr-test - -.PHONY: sctp-test -sctp-test: debian-jessie-build - $(MAKE) -C sctp-test - -.PHONY: sigtran-tests -sigtran-tests: debian-jessie-build - $(MAKE) -C sigtran-tests - -.PHONY: sua-test -sua-test: osmo-stp-master - $(MAKE) -C sua-test - -.PHONY: m3ua-test -m3ua-test: osmo-stp-master sigtran-tests - $(MAKE) -C m3ua-test - -.PHONY: gr-gsm-master -gr-gsm-master: - $(MAKE) -C gr-gsm-master -- To view, visit https://gerrit.osmocom.org/11369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff Gerrit-Change-Number: 11369 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 09:47:38 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Oct 2018 09:47:38 +0000 Subject: Change in osmo-ci[master]: jobs: testsuite.yml for all ttcn3/nplab jobs Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11370 Change subject: jobs: testsuite.yml for all ttcn3/nplab jobs ...................................................................... jobs: testsuite.yml for all ttcn3/nplab jobs New JJB config, that is able to generate all jobs in the TTCN3 tab at Jenkins: The new *-latest jobs test against the latest stable releases. Existing jobs are not overwritten (this is commented out). ttcn3-bsc-test-sccplite-latest is disabled for now, because it hangs forever. Related: OS#3268 Change-Id: Ie433925ee81a61c5788b4a6f2bc5b89c2689d251 --- A jobs/testsuite.yml 1 file changed, 75 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/70/11370/1 diff --git a/jobs/testsuite.yml b/jobs/testsuite.yml new file mode 100644 index 0000000..b8b62d4 --- /dev/null +++ b/jobs/testsuite.yml @@ -0,0 +1,75 @@ +--- +- project: + name: 'testsuite' + concurrent: false + disabled: false + jobs: + - "{testsuite-name}{job-suffix}" + # Folders from docker-playground.git + testsuite-name: + - nplab-m3ua-test + - nplab-sua-test + - ttcn3-bsc-test + - ttcn3-bsc-test-sccplite: + disabled: true + - ttcn3-bts-test + - ttcn3-ggsn-test + - ttcn3-hlr-test + - ttcn3-mgw-test + - ttcn3-msc-test + - ttcn3-sgsn-test + - ttcn3-sip-test + job-suffix: + # latest stable + - "-latest": + image-suffix: "latest" + # nightly (overwrites the existing, manually created jobs!) + # - "" + # image-suffix: "master" +- job-template: + name: '{testsuite-name}{job-suffix}' + project-type: freestyle + disabled: '{obj:disabled}' + defaults: global + description: | + Run the {testsuite-name} testsuite from + docker-playground.git.
+ If this job ends in -latest, the job runs the latest stable versions of the Osmocom stack. + Otherwise the nightly builds.
+ Generated with the jenkins-job-builder config introduced in + OS#3268.
+ See + TTCN3 Testsuite for more information. + node: ttcn3 + parameters: + - string: + name: BRANCH + description: | + Branch of docker-playground.git. + Only modify if you are hacking on the docker-playground scripts. + default: '*/master' + + builders: + - shell: |- + cd {testsuite-name} + IMAGE_SUFFIX="{image-suffix}" ./jenkins.sh + scm: + - git: + branches: + - '$BRANCH' + url: git://git.osmocom.org/docker-playground + git-config-name: 'Jenkins Builder' + git-config-email: 'jenkins at osmocom.org' + triggers: + - timed: "@midnight" + publishers: + - junit: + results: '**/junit-xml-*.log' + allow-empty-results: false + properties: + - build-blocker: + use-build-blocker: true + blocking-jobs: + - "^{testsuite-name}.*" + +# vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/11370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie433925ee81a61c5788b4a6f2bc5b89c2689d251 Gerrit-Change-Number: 11370 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 11:08:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 16 Oct 2018 11:08:03 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: implement HO to remote BSS In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11321 to look at the new patch set (#5). Change subject: handover_decision_2.c: implement HO to remote BSS ...................................................................... handover_decision_2.c: implement HO to remote BSS Implement basic support for inter-BSC HO from handover_decision_2: do inter-BSC handover only when rxlev / rxqual / ta drop below the minimum requirements. I considered adding a vty config flag to disable/enable remote-BSS handover, but to avoid inter-BSC HO the user can simply refrain from configuring neighbors for a particular cell. In collect_assignment_candidate(), it is important to clear out any new candidate entry. Hence adopt the same pattern as below: first compose a new (cleared) candidate, then write the entry into the list. Related: OS#3638 Change-Id: Id78ac1b2016998a2931a23d62ec7a3f37bb764c6 --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 185 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/21/11321/5 -- To view, visit https://gerrit.osmocom.org/11321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id78ac1b2016998a2931a23d62ec7a3f37bb764c6 Gerrit-Change-Number: 11321 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 11:11:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 16 Oct 2018 11:11:37 +0000 Subject: Change in docker-playground[master]: Remove top-level Makefile In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11369 ) Change subject: Remove top-level Makefile ...................................................................... Patch Set 1: Hey! My Makefile! -- To view, visit https://gerrit.osmocom.org/11369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff Gerrit-Change-Number: 11369 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 16 Oct 2018 11:11:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 11:19:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 16 Oct 2018 11:19:43 +0000 Subject: Change in docker-playground[master]: Remove top-level Makefile In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11369 ) Change subject: Remove top-level Makefile ...................................................................... Patch Set 1: ok, fine, but what I'm missing here is: if I come along and want to 'make ttcn3-bsc-test' to get the latest bsc images, what do I invoke instead on my shell? I added the top-level makefile mostly for such human convenience. Would it make sense to still have a Makefile that redirects to the shell script implementation? Or maybe a thin shell script to include jenkins-common.sh and invoke docker_images_require() is easier? -- To view, visit https://gerrit.osmocom.org/11369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff Gerrit-Change-Number: 11369 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 16 Oct 2018 11:19:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 11:20:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 16 Oct 2018 11:20:56 +0000 Subject: Change in docker-playground[master]: osmo-*-latest: s/nightly/latest/g in Dockerfile In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11364 ) Change subject: osmo-*-latest: s/nightly/latest/g in Dockerfile ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1eab031038927043faf6ed8ed30bdf4d4d1624d5 Gerrit-Change-Number: 11364 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 16 Oct 2018 11:20:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 11:23:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 16 Oct 2018 11:23:15 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add docker_images_require() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11365 ) Change subject: jenkins-common.sh: add docker_images_require() ...................................................................... Patch Set 1: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/11365/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11365/1//COMMIT_MSG at 13 PS1, Line 13: Unless the NO_DOCKER_IMAGE_BUILD environment variable is specified, This documentation should go in the source tree, to not be lost to future readers in the commit history. The commit log is more about why the change is needed and how that was achieved, why/how a choice was made. The info on how things should be used definitely belong in READMEs or file comments or online doc, instead. https://gerrit.osmocom.org/#/c/11365/1//COMMIT_MSG at 22 PS1, Line 22: on which a job depends. But it is not maintained anymore. And in that I added it and use it, it never was maintained by anyone besides me I guess, but "not maintained" is a bit harsh :P https://gerrit.osmocom.org/#/c/11365/1/jenkins-common.sh File jenkins-common.sh: https://gerrit.osmocom.org/#/c/11365/1/jenkins-common.sh at 5 PS1, Line 5: docker_images_require() { I don't see any callers of this function .. is it dead code? -- To view, visit https://gerrit.osmocom.org/11365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0afdf3400282634fca9b31d57eaeedd6b5c28aa1 Gerrit-Change-Number: 11365 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 16 Oct 2018 11:23:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 11:36:35 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 16 Oct 2018 11:36:35 +0000 Subject: Change in docker-playground[master]: jenkins.sh: new IMAGE_SUFFIX environment variable In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11366 ) Change subject: jenkins.sh: new IMAGE_SUFFIX environment variable ...................................................................... Patch Set 1: (4 comments) I see this is moving from make-style dependency tracking to naming each required image explicitly. It is also adding image rebuilding to the jenkins.sh directly. As you will notice in the comments, it's not so easy for me to let go of my current use pattern of 'make ttcn3-bsc-test' once, then invoke jenkins.sh as many times I like, but yeah. I think I can deal with it if any alternative would mean a lot of effort for the 'latest' tests ... ? https://gerrit.osmocom.org/#/c/11366/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11366/1//COMMIT_MSG at 7 PS1, Line 7: jenkins.sh: new IMAGE_SUFFIX environment variable actually, the most profound change here is that you add calls to docker_images_require(). https://gerrit.osmocom.org/#/c/11366/1/m3ua-test/jenkins.sh File m3ua-test/jenkins.sh: https://gerrit.osmocom.org/#/c/11366/1/m3ua-test/jenkins.sh at 4 PS1, Line 4: [ -z "$IMAGE_SUFFIX" ] && IMAGE_SUFFIX="master" I still prefer if [ -z xyz ]; then abc; fi we are C hackers after all. Or if you want to be scripty, rather go for the if-unset shell pattern: FOO="${FOO:-bar}" https://gerrit.osmocom.org/#/c/11366/1/m3ua-test/jenkins.sh at 6 PS1, Line 6: "debian-jessie-build" \ so it is not enough to issue the osmo-stp-foo image below, to also rebuild the images that it depends on? That was the idea of the top-level makefile: build that image *after* all of its dependencies, implicitly. https://gerrit.osmocom.org/#/c/11366/1/m3ua-test/jenkins.sh at 7 PS1, Line 7: "osmo-stp-$IMAGE_SUFFIX" \ with IMAGE_SUFFIX, I think of ".img". How about FEED_NAME -- To view, visit https://gerrit.osmocom.org/11366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e Gerrit-Change-Number: 11366 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 16 Oct 2018 11:36:35 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 13:03:10 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Oct 2018 13:03:10 +0000 Subject: Change in docker-playground[master]: jenkins.sh: IMAGE_SUFFIX, docker_images_require() In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11366 ) Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require() ...................................................................... jenkins.sh: IMAGE_SUFFIX, docker_images_require() Default value "master" of the IMAGE_SUFFIX environment variable can be changed to "latest" to test the latest stable builds instead of the nightly ones. Use docker_images_require() to make sure that the required images are existing and up-to-date before running the tests. Related: OS#3268 Change-Id: Idbb708ab16cb71bab5069127945b63388222369e --- M m3ua-test/jenkins.sh M sua-test/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh 11 files changed, 97 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/66/11366/2 -- To view, visit https://gerrit.osmocom.org/11366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e Gerrit-Change-Number: 11366 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 13:06:13 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Oct 2018 13:06:13 +0000 Subject: Change in docker-playground[master]: jenkins.sh: IMAGE_SUFFIX, docker_images_require() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11366 ) Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require() ...................................................................... Patch Set 2: (3 comments) > As you will notice in the comments, it's not so easy for me to let go of my current use pattern of 'make ttcn3-bsc-test' once, then invoke jenkins.sh as many times I like We discusses this in the chat after you wrote this, and you said it's okay for you to use one of the following instead of your current make-then-call-jenkins.sh-workflow. $ ./jenkins.sh $ NO_DOCKER_IMAGE_BUILD=1 ./jenkins.sh https://gerrit.osmocom.org/#/c/11366/1/m3ua-test/jenkins.sh File m3ua-test/jenkins.sh: https://gerrit.osmocom.org/#/c/11366/1/m3ua-test/jenkins.sh at 4 PS1, Line 4: IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" > I still prefer [?] Done https://gerrit.osmocom.org/#/c/11366/1/m3ua-test/jenkins.sh at 6 PS1, Line 6: "debian-jessie-build" \ > so it is not enough to issue the osmo-stp-foo image below, to also rebuild the images that it depend [?] I thought about resolving these dependencies in jenkins-common.sh, but that would add a lot more code than the two additional lines (debian-jessie-build, debian-stretch-titan) in these jenkins.sh files. So having it here is probably the nicer solution, although it is a bit redundant. https://gerrit.osmocom.org/#/c/11366/1/m3ua-test/jenkins.sh at 7 PS1, Line 7: "osmo-stp-$IMAGE_SUFFIX" \ > with IMAGE_SUFFIX, I think of ".img". [?] There's already a FEED variable in docker-playground.git/debian-repo-install-test/jenkins.sh, which takes different values ("nightly" and "latest"). Here "master" and "latest" is accepted, so it might get confusing. However, if you still prefer FEED_NAME (or have another suggestion), I can change it of course. -- To view, visit https://gerrit.osmocom.org/11366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e Gerrit-Change-Number: 11366 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 16 Oct 2018 13:06:13 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 13:12:36 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Oct 2018 13:12:36 +0000 Subject: Change in docker-playground[master]: Remove top-level Makefile In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11369 ) Change subject: Remove top-level Makefile ...................................................................... Patch Set 2: > ok, fine, but what I'm missing here is: if I come along and want to 'make ttcn3-bsc-test' to get the latest bsc images, what do I invoke instead on my shell? I added the top-level makefile mostly for such human convenience. We discusses this in the chat after you wrote this, and you said it's okay for you to use one of the following instead of your current make-then-call-jenkins.sh-workflow. $ ./jenkins.sh $ NO_DOCKER_IMAGE_BUILD=1 ./jenkins.sh -- To view, visit https://gerrit.osmocom.org/11369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff Gerrit-Change-Number: 11369 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 16 Oct 2018 13:12:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 13:13:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 16 Oct 2018 13:13:46 +0000 Subject: Change in osmo-bsc[master]: remote-BSS neighbors: allow only one cell ID Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11371 Change subject: remote-BSS neighbors: allow only one cell ID ...................................................................... remote-BSS neighbors: allow only one cell ID I believe I have initially misinterpreted the idea behind sending a Cell Identifier List in BSSMAP Handover Required messages. Instead of associating N Cell Identifiers with one ARFCN+BSIC, the idea is to add up N separate ARFCN+BSIC's Cell Identifiers into a list. To keep the door open for future code simplification, make sure to allow only one Cell Identifier per remote ARFCN+BSIC on the VTY UI. Related: OS#3656 Change-Id: Ifb9212fede2333ad68db94188b5cda4fcabe02f8 --- M src/osmo-bsc/neighbor_ident_vty.c M tests/neighbor_ident.vty 2 files changed, 112 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/71/11371/1 diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c index 409153b..203b150 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -258,6 +258,7 @@ { int rc; struct gsm_bts *local_neigh; + const struct gsm0808_cell_id_list2 *exists; struct gsm0808_cell_id_list2 cil; struct gsm_bts *bts = vty->index; @@ -289,6 +290,15 @@ return add_local_bts(vty, local_neigh); } + /* Allow only one cell ID per remote-BSS neighbor, see OS#3656 */ + exists = neighbor_ident_get(g_neighbor_cells, key); + if (exists) { + vty_out(vty, "%% Error: only one Cell Identifier entry is allowed per remote neighbor." + " Already have: %s -> %s%s", neighbor_ident_key_name(key), + gsm0808_cell_id_list_name(exists), VTY_NEWLINE); + return CMD_WARNING; + } + /* The cell_id is not known in this BSS, so it must be a remote cell. */ gsm0808_cell_id_to_list(&cil, cell_id); rc = neighbor_ident_add(g_neighbor_cells, key, &cil); diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index 4f86383..2ce2231 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -211,29 +211,29 @@ OsmoBSC(config-net-bts)# neighbor lac-ci 21 31 % BTS 0 already had local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11 OsmoBSC(config-net-bts)# neighbor cgi 23 42 423 5 arfcn 23 bsic 42 -% BTS 0 to ARFCN 23 BSIC 42 now has 1 remote BSS Cell Identifier List entry +% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 23 BSIC 42 -> CGI[1]:{023-42-423-5} OsmoBSC(config-net-bts)# neighbor cgi 23 42 423 5 arfcn 23 bsic 42 -% BTS 0 to ARFCN 23 BSIC 42 now has 1 remote BSS Cell Identifier List entry +% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 23 BSIC 42 -> CGI[1]:{023-42-423-5} OsmoBSC(config-net-bts)# neighbor cgi 23 42 423 5 arfcn 23 bsic 42 -% BTS 0 to ARFCN 23 BSIC 42 now has 1 remote BSS Cell Identifier List entry +% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 23 BSIC 42 -> CGI[1]:{023-42-423-5} OsmoBSC(config-net-bts)# neighbor cgi 23 042 423 6 arfcn 23 bsic 42 -% BTS 0 to ARFCN 23 BSIC 42 now has 2 remote BSS Cell Identifier List entries +% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 23 BSIC 42 -> CGI[1]:{023-42-423-5} OsmoBSC(config-net-bts)# neighbor lac 456 arfcn 123 bsic 45 % BTS 0 to ARFCN 123 BSIC 45 now has 1 remote BSS Cell Identifier List entry OsmoBSC(config-net-bts)# neighbor cgi 23 042 234 56 arfcn 23 bsic 42 -% BTS 0 to ARFCN 23 BSIC 42 now has 3 remote BSS Cell Identifier List entries +% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 23 BSIC 42 -> CGI[1]:{023-42-423-5} OsmoBSC(config-net-bts)# neighbor lac-ci 789 10 arfcn 423 bsic any % BTS 0 to ARFCN 423 (any BSIC) now has 1 remote BSS Cell Identifier List entry OsmoBSC(config-net-bts)# neighbor lac-ci 789 10 arfcn 423 bsic 63 -% BTS 0 to ARFCN 423 BSIC 63 now has 1 remote BSS Cell Identifier List entry +% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 423 BSIC 63 -> LAC-CI[1]:{789-10} OsmoBSC(config-net-bts)# neighbor lac-ci 789 10 arfcn 423 bsic 1 -% BTS 0 to ARFCN 423 BSIC 1 now has 1 remote BSS Cell Identifier List entry +% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 423 BSIC 1 -> LAC-CI[1]:{789-10} OsmoBSC(config-net-bts)# show running-config ... @@ -244,12 +244,8 @@ neighbor bts 1 neighbor bts 2 neighbor cgi 023 42 423 5 arfcn 23 bsic 42 - neighbor cgi 023 042 423 6 arfcn 23 bsic 42 - neighbor cgi 023 042 234 56 arfcn 23 bsic 42 neighbor lac 456 arfcn 123 bsic 45 neighbor lac-ci 789 10 arfcn 423 bsic any - neighbor lac-ci 789 10 arfcn 423 bsic 63 - neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor OsmoBSC(config-net-bts)# do show bts 0 neighbor arfcn 99 bsic any @@ -271,13 +267,103 @@ % Removed remote BSS neighbor BTS 0 to ARFCN 23 BSIC 42 OsmoBSC(config-net-bts)# show running-config -... !neighbor + +Current configuration: +! +! +log stderr + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging print file 1 + logging level rll notice + logging level mm notice + logging level rr notice + logging level rsl notice + logging level nm info + logging level pag notice + logging level meas notice + logging level msc notice + logging level ho notice + logging level hodec notice + logging level ref notice + logging level nat notice + logging level ctrl notice + logging level filter debug + logging level pcu debug + logging level lcls notice + logging level chan notice + logging level ts notice + logging level as notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice + logging level ljibuf notice +! +stats interval 5 +! +line vty + no login +! +e1_input + e1_line 0 driver ipa + e1_line 0 port 0 + no e1_line 0 keepalive +cs7 instance 0 + point-code 0.23.3 + asp asp-clnt-msc-0 2905 0 m3ua + as as-clnt-msc-0 m3ua + asp asp-clnt-msc-0 + routing-key 0 0.23.3 +network + network country code 901 + mobile network code 70 + encryption a5 1 3 + neci 0 + paging any use tch 0 + bts 0 + type sysmobts + band DCS1800 + cell_identity 30 + location_area_code 20 + base_station_id_code 10 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-descrption attach 1 + channel-descrption bs-pa-mfrms 5 + channel-descrption bs-ag-blks-res 1 + no access-control-class-ramping + access-control-class-ramping-step-interval dynamic + access-control-class-ramping-step-size 1 + early-classmark-sending forbidden + early-classmark-sending-3g allowed + ip.access unit_id 1800 0 + oml ip.access stream_id 255 line 0 + neighbor-list mode automatic neighbor bts 1 neighbor bts 2 neighbor lac 456 arfcn 123 bsic 45 neighbor lac-ci 789 10 arfcn 423 bsic any - neighbor lac-ci 789 10 arfcn 423 bsic 63 - neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor OsmoBSC(config-net-bts)# no neighbor arfcn 123 bsic 45 @@ -288,8 +374,6 @@ neighbor bts 1 neighbor bts 2 neighbor lac-ci 789 10 arfcn 423 bsic any - neighbor lac-ci 789 10 arfcn 423 bsic 63 - neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic any @@ -299,22 +383,19 @@ ... !neighbor neighbor bts 1 neighbor bts 2 - neighbor lac-ci 789 10 arfcn 423 bsic 63 - neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic 63 -% Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 63 +% Cannot remove, no such neighbor: BTS 0 to ARFCN 423 BSIC 63 OsmoBSC(config-net-bts)# show running-config ... !neighbor neighbor bts 1 neighbor bts 2 - neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic 1 -% Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 1 +% Cannot remove, no such neighbor: BTS 0 to ARFCN 423 BSIC 1 OsmoBSC(config-net-bts)# show running-config ... !neighbor -- To view, visit https://gerrit.osmocom.org/11371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb9212fede2333ad68db94188b5cda4fcabe02f8 Gerrit-Change-Number: 11371 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 13:42:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 13:42:14 +0000 Subject: Change in osmo-bsc[master]: remote-BSS neighbors: allow only one cell ID In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11371 ) Change subject: remote-BSS neighbors: allow only one cell ID ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifb9212fede2333ad68db94188b5cda4fcabe02f8 Gerrit-Change-Number: 11371 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 16 Oct 2018 13:42:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 13:42:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 13:42:16 +0000 Subject: Change in osmo-bsc[master]: remote-BSS neighbors: allow only one cell ID In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11371 ) Change subject: remote-BSS neighbors: allow only one cell ID ...................................................................... remote-BSS neighbors: allow only one cell ID I believe I have initially misinterpreted the idea behind sending a Cell Identifier List in BSSMAP Handover Required messages. Instead of associating N Cell Identifiers with one ARFCN+BSIC, the idea is to add up N separate ARFCN+BSIC's Cell Identifiers into a list. To keep the door open for future code simplification, make sure to allow only one Cell Identifier per remote ARFCN+BSIC on the VTY UI. Related: OS#3656 Change-Id: Ifb9212fede2333ad68db94188b5cda4fcabe02f8 --- M src/osmo-bsc/neighbor_ident_vty.c M tests/neighbor_ident.vty 2 files changed, 112 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c index 409153b..203b150 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -258,6 +258,7 @@ { int rc; struct gsm_bts *local_neigh; + const struct gsm0808_cell_id_list2 *exists; struct gsm0808_cell_id_list2 cil; struct gsm_bts *bts = vty->index; @@ -289,6 +290,15 @@ return add_local_bts(vty, local_neigh); } + /* Allow only one cell ID per remote-BSS neighbor, see OS#3656 */ + exists = neighbor_ident_get(g_neighbor_cells, key); + if (exists) { + vty_out(vty, "%% Error: only one Cell Identifier entry is allowed per remote neighbor." + " Already have: %s -> %s%s", neighbor_ident_key_name(key), + gsm0808_cell_id_list_name(exists), VTY_NEWLINE); + return CMD_WARNING; + } + /* The cell_id is not known in this BSS, so it must be a remote cell. */ gsm0808_cell_id_to_list(&cil, cell_id); rc = neighbor_ident_add(g_neighbor_cells, key, &cil); diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index 4f86383..2ce2231 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -211,29 +211,29 @@ OsmoBSC(config-net-bts)# neighbor lac-ci 21 31 % BTS 0 already had local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11 OsmoBSC(config-net-bts)# neighbor cgi 23 42 423 5 arfcn 23 bsic 42 -% BTS 0 to ARFCN 23 BSIC 42 now has 1 remote BSS Cell Identifier List entry +% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 23 BSIC 42 -> CGI[1]:{023-42-423-5} OsmoBSC(config-net-bts)# neighbor cgi 23 42 423 5 arfcn 23 bsic 42 -% BTS 0 to ARFCN 23 BSIC 42 now has 1 remote BSS Cell Identifier List entry +% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 23 BSIC 42 -> CGI[1]:{023-42-423-5} OsmoBSC(config-net-bts)# neighbor cgi 23 42 423 5 arfcn 23 bsic 42 -% BTS 0 to ARFCN 23 BSIC 42 now has 1 remote BSS Cell Identifier List entry +% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 23 BSIC 42 -> CGI[1]:{023-42-423-5} OsmoBSC(config-net-bts)# neighbor cgi 23 042 423 6 arfcn 23 bsic 42 -% BTS 0 to ARFCN 23 BSIC 42 now has 2 remote BSS Cell Identifier List entries +% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 23 BSIC 42 -> CGI[1]:{023-42-423-5} OsmoBSC(config-net-bts)# neighbor lac 456 arfcn 123 bsic 45 % BTS 0 to ARFCN 123 BSIC 45 now has 1 remote BSS Cell Identifier List entry OsmoBSC(config-net-bts)# neighbor cgi 23 042 234 56 arfcn 23 bsic 42 -% BTS 0 to ARFCN 23 BSIC 42 now has 3 remote BSS Cell Identifier List entries +% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 23 BSIC 42 -> CGI[1]:{023-42-423-5} OsmoBSC(config-net-bts)# neighbor lac-ci 789 10 arfcn 423 bsic any % BTS 0 to ARFCN 423 (any BSIC) now has 1 remote BSS Cell Identifier List entry OsmoBSC(config-net-bts)# neighbor lac-ci 789 10 arfcn 423 bsic 63 -% BTS 0 to ARFCN 423 BSIC 63 now has 1 remote BSS Cell Identifier List entry +% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 423 BSIC 63 -> LAC-CI[1]:{789-10} OsmoBSC(config-net-bts)# neighbor lac-ci 789 10 arfcn 423 bsic 1 -% BTS 0 to ARFCN 423 BSIC 1 now has 1 remote BSS Cell Identifier List entry +% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 423 BSIC 1 -> LAC-CI[1]:{789-10} OsmoBSC(config-net-bts)# show running-config ... @@ -244,12 +244,8 @@ neighbor bts 1 neighbor bts 2 neighbor cgi 023 42 423 5 arfcn 23 bsic 42 - neighbor cgi 023 042 423 6 arfcn 23 bsic 42 - neighbor cgi 023 042 234 56 arfcn 23 bsic 42 neighbor lac 456 arfcn 123 bsic 45 neighbor lac-ci 789 10 arfcn 423 bsic any - neighbor lac-ci 789 10 arfcn 423 bsic 63 - neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor OsmoBSC(config-net-bts)# do show bts 0 neighbor arfcn 99 bsic any @@ -271,13 +267,103 @@ % Removed remote BSS neighbor BTS 0 to ARFCN 23 BSIC 42 OsmoBSC(config-net-bts)# show running-config -... !neighbor + +Current configuration: +! +! +log stderr + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging print file 1 + logging level rll notice + logging level mm notice + logging level rr notice + logging level rsl notice + logging level nm info + logging level pag notice + logging level meas notice + logging level msc notice + logging level ho notice + logging level hodec notice + logging level ref notice + logging level nat notice + logging level ctrl notice + logging level filter debug + logging level pcu debug + logging level lcls notice + logging level chan notice + logging level ts notice + logging level as notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice + logging level ljibuf notice +! +stats interval 5 +! +line vty + no login +! +e1_input + e1_line 0 driver ipa + e1_line 0 port 0 + no e1_line 0 keepalive +cs7 instance 0 + point-code 0.23.3 + asp asp-clnt-msc-0 2905 0 m3ua + as as-clnt-msc-0 m3ua + asp asp-clnt-msc-0 + routing-key 0 0.23.3 +network + network country code 901 + mobile network code 70 + encryption a5 1 3 + neci 0 + paging any use tch 0 + bts 0 + type sysmobts + band DCS1800 + cell_identity 30 + location_area_code 20 + base_station_id_code 10 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-descrption attach 1 + channel-descrption bs-pa-mfrms 5 + channel-descrption bs-ag-blks-res 1 + no access-control-class-ramping + access-control-class-ramping-step-interval dynamic + access-control-class-ramping-step-size 1 + early-classmark-sending forbidden + early-classmark-sending-3g allowed + ip.access unit_id 1800 0 + oml ip.access stream_id 255 line 0 + neighbor-list mode automatic neighbor bts 1 neighbor bts 2 neighbor lac 456 arfcn 123 bsic 45 neighbor lac-ci 789 10 arfcn 423 bsic any - neighbor lac-ci 789 10 arfcn 423 bsic 63 - neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor OsmoBSC(config-net-bts)# no neighbor arfcn 123 bsic 45 @@ -288,8 +374,6 @@ neighbor bts 1 neighbor bts 2 neighbor lac-ci 789 10 arfcn 423 bsic any - neighbor lac-ci 789 10 arfcn 423 bsic 63 - neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic any @@ -299,22 +383,19 @@ ... !neighbor neighbor bts 1 neighbor bts 2 - neighbor lac-ci 789 10 arfcn 423 bsic 63 - neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic 63 -% Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 63 +% Cannot remove, no such neighbor: BTS 0 to ARFCN 423 BSIC 63 OsmoBSC(config-net-bts)# show running-config ... !neighbor neighbor bts 1 neighbor bts 2 - neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic 1 -% Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 1 +% Cannot remove, no such neighbor: BTS 0 to ARFCN 423 BSIC 1 OsmoBSC(config-net-bts)# show running-config ... !neighbor -- To view, visit https://gerrit.osmocom.org/11371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifb9212fede2333ad68db94188b5cda4fcabe02f8 Gerrit-Change-Number: 11371 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 13:44:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 13:44:09 +0000 Subject: Change in docker-playground[master]: symlinks: ttcn3-bsc-test-sccplite In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11367 ) Change subject: symlinks: ttcn3-bsc-test-sccplite ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1d1d277475090cd615a0e2d07a42b2032cdefb9c Gerrit-Change-Number: 11367 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Tue, 16 Oct 2018 13:44:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 13:45:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 13:45:28 +0000 Subject: Change in docker-playground[master]: osmo-*-latest: s/nightly/latest/g in Dockerfile In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11364 ) Change subject: osmo-*-latest: s/nightly/latest/g in Dockerfile ...................................................................... Patch Set 1: Code-Review+2 that may actually have been intentional, i.e. to test the nightly libraries with the "master" of the given application under tests? But yes, that should probably be separate from testing "latest" of both the libraries and the application under test. -- To view, visit https://gerrit.osmocom.org/11364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1eab031038927043faf6ed8ed30bdf4d4d1624d5 Gerrit-Change-Number: 11364 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 16 Oct 2018 13:45:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 13:48:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Oct 2018 13:48:39 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add docker_images_require() In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11365 to look at the new patch set (#2). Change subject: jenkins-common.sh: add docker_images_require() ...................................................................... jenkins-common.sh: add docker_images_require() This new function can be used on top of each *-test/jenkins.sh to automatically build the required Docker images before starting a testsuite. The top-level Makefile should also be able to build all Docker images on which a job depends. But in that Makefile the list of dependencies can not be specified dynamically, as it will be necessary for OS#3268: ttcn3-mgw-test may depend on osmo-mgw-latest or on osmo-mgw-master. Related: OS#3268 Change-Id: I0afdf3400282634fca9b31d57eaeedd6b5c28aa1 --- M jenkins-common.sh 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/65/11365/2 -- To view, visit https://gerrit.osmocom.org/11365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0afdf3400282634fca9b31d57eaeedd6b5c28aa1 Gerrit-Change-Number: 11365 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 13:48:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Oct 2018 13:48:39 +0000 Subject: Change in docker-playground[master]: jenkins.sh: IMAGE_SUFFIX, docker_images_require() In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/11366 ) Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require() ...................................................................... jenkins.sh: IMAGE_SUFFIX, docker_images_require() Default value "master" of the IMAGE_SUFFIX environment variable can be changed to "latest" to test the latest stable builds instead of the nightly ones. Use docker_images_require() to make sure that the required images are existing and up-to-date before running the tests. Related: OS#3268 Change-Id: Idbb708ab16cb71bab5069127945b63388222369e --- M m3ua-test/jenkins.sh M sua-test/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh 11 files changed, 97 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/66/11366/3 -- To view, visit https://gerrit.osmocom.org/11366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e Gerrit-Change-Number: 11366 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 13:48:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Oct 2018 13:48:39 +0000 Subject: Change in docker-playground[master]: symlinks: ttcn3-bsc-test-sccplite In-Reply-To: References: Message-ID: Hello Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11367 to look at the new patch set (#3). Change subject: symlinks: ttcn3-bsc-test-sccplite ...................................................................... symlinks: ttcn3-bsc-test-sccplite Create the ttcn3-bsc-test-sccplite folder, with symlinks to ttcn3-bsc-test/jenkins-sccplite.sh and ttcn3-bsc-test/sccplite. This allows writing the jenkins job builder config files in a generic way. Related: OS#3268 Change-Id: I1d1d277475090cd615a0e2d07a42b2032cdefb9c --- A ttcn3-bsc-test-sccplite/jenkins.sh A ttcn3-bsc-test-sccplite/sccplite 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/67/11367/3 -- To view, visit https://gerrit.osmocom.org/11367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1d1d277475090cd615a0e2d07a42b2032cdefb9c Gerrit-Change-Number: 11367 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 13:48:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Oct 2018 13:48:39 +0000 Subject: Change in docker-playground[master]: symlinks: nplab-m3ua-test, nplab-sua-test In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/11368 ) Change subject: symlinks: nplab-m3ua-test, nplab-sua-test ...................................................................... symlinks: nplab-m3ua-test, nplab-sua-test Allows writing a generic Jenkins Job Builder config. Related: OS#3268 Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de --- A nplab-m3ua-test A nplab-sua-test 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/68/11368/3 -- To view, visit https://gerrit.osmocom.org/11368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de Gerrit-Change-Number: 11368 Gerrit-PatchSet: 3 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 13:48:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Oct 2018 13:48:39 +0000 Subject: Change in docker-playground[master]: Remove top-level Makefile In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/11369 ) Change subject: Remove top-level Makefile ...................................................................... Remove top-level Makefile Obsoleted by docker_images_require(). The top-level Makefile had the following drawbacks: * it was not maintained: many targets were missing, and some of the existing ones did not build anymore * make targets have the same names as the folders, so if they are not listed in the Makefile, it will assume that the target has been built already (prone to making mistakes) Related: OS#3268 Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff --- D Makefile 1 file changed, 0 insertions(+), 82 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/69/11369/3 -- To view, visit https://gerrit.osmocom.org/11369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff Gerrit-Change-Number: 11369 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 13:49:02 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Oct 2018 13:49:02 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add docker_images_require() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11365 ) Change subject: jenkins-common.sh: add docker_images_require() ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/#/c/11365/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11365/1//COMMIT_MSG at 13 PS1, Line 13: Unless the NO_DOCKER_IMAGE_BUILD environment variable is specified, > This documentation should go in the source tree, to not be lost to future readers in the commit hist [?] Done https://gerrit.osmocom.org/#/c/11365/1//COMMIT_MSG at 22 PS1, Line 22: on which a job depends. But it is not maintained anymore. And in that > I added it and use it, it never was maintained by anyone besides me I guess, but "not maintained" is [?] How about: "nobody updates it when adding new docker images and some targets *don't build out of the box* with it" instead? :p (Left it out in the next patch) https://gerrit.osmocom.org/#/c/11365/1/jenkins-common.sh File jenkins-common.sh: https://gerrit.osmocom.org/#/c/11365/1/jenkins-common.sh at 5 PS1, Line 5: docker_images_require() { > I don't see any callers of this function .. [?] In this commit, yes. But the next commit it will be used from all jenkins.sh files. Would it have been better to do both changes in one commit instead of two? -- To view, visit https://gerrit.osmocom.org/11365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0afdf3400282634fca9b31d57eaeedd6b5c28aa1 Gerrit-Change-Number: 11365 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 16 Oct 2018 13:49:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 13:55:10 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Oct 2018 13:55:10 +0000 Subject: Change in osmo-bsc[master]: vty 'show bts'/'show trx': display IPs and ports In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11290 ) Change subject: vty 'show bts'/'show trx': display IPs and ports ...................................................................... vty 'show bts'/'show trx': display IPs and ports This quickly allows knowing which IP a BTS is using in order to SSH into it. Example output: OsmoBSC> show trx ... Baseband Transceiver NM State: Oper 'Enabled', Admin 'Unlocked', Avail 'OK' ip.access stream ID: 0x00 (r=192.168.1.178:34090<->l=192.168.1.37:3003) ... OsmoBSC> show bts ... Paging: 0 pending requests, 50 free slots OML Link: (r=192.168.1.178:57692<->l=192.168.1.37:3002) OML Link state: connected 0 days 0 hours 0 min. 17 sec. ... Related: OS#3145 Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f --- M src/osmo-bsc/bsc_vty.c 1 file changed, 18 insertions(+), 2 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 8e6ff3e..f156cc8 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -289,6 +290,19 @@ e1l->tei, e1l->sapi, VTY_NEWLINE); } +/*! Dump the IP addresses and ports of the input signal link's timeslot. + * This only makes sense for links connected with ipaccess. + * Example output: "(r=10.1.42.1:55416<->l=10.1.42.123:3003)" */ +static void e1isl_dump_vty_tcp(struct vty *vty, const struct e1inp_sign_link *e1l) +{ + if (e1l) { + char *name = osmo_sock_get_name(NULL, e1l->ts->driver.ipaccess.fd.fd); + vty_out(vty, "%s", name); + talloc_free(name); + } + vty_out(vty, "%s", VTY_NEWLINE); +} + static void vty_out_neigh_list(struct vty *vty, struct bitvec *bv) { int count = 0; @@ -445,6 +459,8 @@ paging_pending_requests_nr(bts), bts->paging.available_slots, VTY_NEWLINE); if (is_ipaccess_bts(bts)) { + vty_out(vty, " OML Link: "); + e1isl_dump_vty_tcp(vty, bts->oml_link); vty_out(vty, " OML Link state: %s", get_model_oml_status(bts)); sec = bts_uptime(bts); if (sec) @@ -1046,8 +1062,8 @@ vty_out(vty, " Baseband Transceiver NM State: "); net_dump_nmstate(vty, &trx->bb_transc.mo.nm_state); if (is_ipaccess_bts(trx->bts)) { - vty_out(vty, " ip.access stream ID: 0x%02x%s", - trx->rsl_tei, VTY_NEWLINE); + vty_out(vty, " ip.access stream ID: 0x%02x ", trx->rsl_tei); + e1isl_dump_vty_tcp(vty, trx->rsl_link); } else { vty_out(vty, " E1 Signalling Link:%s", VTY_NEWLINE); e1isl_dump_vty(vty, trx->rsl_link); -- To view, visit https://gerrit.osmocom.org/11290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I37f020fcdb68cafcdbdb621808483d1dd996354f Gerrit-Change-Number: 11290 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 14:17:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 16 Oct 2018 14:17:44 +0000 Subject: Change in openbsc[master]: mgcp: osmux_send_dummy: Fix return without value Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11372 Change subject: mgcp: osmux_send_dummy: Fix return without value ...................................................................... mgcp: osmux_send_dummy: Fix return without value Fixes commit: 4a2cc9eb0a0f9424c16b26fcb757483a39d67482 Change-Id: I438349bffaa46a10ad8983090a4b17aed7e00d82 --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/72/11372/1 diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index a0ac295..ce344ca 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -554,7 +554,7 @@ return 0; if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) - return; + return 0; LOGP(DMGCP, LOGL_DEBUG, "sending OSMUX dummy load to %s CID %u\n", -- To view, visit https://gerrit.osmocom.org/11372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I438349bffaa46a10ad8983090a4b17aed7e00d82 Gerrit-Change-Number: 11372 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 14:18:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 16 Oct 2018 14:18:49 +0000 Subject: Change in openbsc[master]: mgcp: osmux_send_dummy: Fix return without value In-Reply-To: References: Message-ID: Pau Espin Pedrol has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11372 ) Change subject: mgcp: osmux_send_dummy: Fix return without value ...................................................................... mgcp: osmux_send_dummy: Fix return without value Not really critical since only user of this function doesn't check the return value. Fixes commit: 4a2cc9eb0a0f9424c16b26fcb757483a39d67482 Change-Id: I438349bffaa46a10ad8983090a4b17aed7e00d82 --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/72/11372/2 -- To view, visit https://gerrit.osmocom.org/11372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I438349bffaa46a10ad8983090a4b17aed7e00d82 Gerrit-Change-Number: 11372 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 14:44:55 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 16 Oct 2018 14:44:55 +0000 Subject: Change in libosmocore[master]: gsm0808: allow decoding of zero length speech codec lists. Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11373 Change subject: gsm0808: allow decoding of zero length speech codec lists. ...................................................................... gsm0808: allow decoding of zero length speech codec lists. 3GPP_TS_48.008, 3.2.2.103 Speech Codec List states the following: "The length indicator (octet 2) is a binary number indicating the absolute length of the contents after the length indicator. The length depends on the number and type of Speech Codec Elements to be included. The minimum length of one Speech Codec Element is 1 octet and the maximum length is 3 octets. The maximum number of Speech Codec Elements within the Speech Codec List is not defined." This clearly refers only to the length of a single speech codec element but not on the overall list. So speech codec lists with length 0 are indeed permitted by the spec. - Remove the assertion that checks on zero length speech codec lists. Change-Id: I1eb1f4466b98bdd26d765b0e4cc690b5e89e9dd6 Related: OS#3657 --- M src/gsm/gsm0808_utils.c M tests/gsm0808/gsm0808_test.c 2 files changed, 23 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/73/11373/1 diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 886f546..2348105 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -349,9 +349,6 @@ OSMO_ASSERT(msg); OSMO_ASSERT(scl); - /* Empty list */ - OSMO_ASSERT(scl->len >= 1); - msgb_put_u8(msg, GSM0808_IE_SPEECH_CODEC_LIST); tlv_len = msgb_put(msg, 1); old_tail = msg->tail; @@ -384,8 +381,6 @@ OSMO_ASSERT(scl); if (!elem) return -EINVAL; - if (len == 0) - return -EINVAL; memset(scl, 0, sizeof(*scl)); @@ -404,11 +399,6 @@ scl->len = decoded; - /* Empty list */ - if (decoded < 1) { - return -EINVAL; - } - return (int)(elem - old_elem); } diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 8cf1cf4..0b2794f 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -695,6 +695,28 @@ msgb_free(msg); } +static void test_gsm0808_enc_dec_empty_speech_codec_list() +{ + struct gsm0808_speech_codec_list enc_scl = { + .len = 0, + }; + struct gsm0808_speech_codec_list dec_scl = {}; + struct msgb *msg; + uint8_t rc_enc; + int rc_dec; + + msg = msgb_alloc(1024, "output buffer"); + rc_enc = gsm0808_enc_speech_codec_list(msg, &enc_scl); + OSMO_ASSERT(rc_enc == 2); + + rc_dec = gsm0808_dec_speech_codec_list(&dec_scl, msg->data + 2, msg->len - 2); + OSMO_ASSERT(rc_dec == 0); + + OSMO_ASSERT(memcmp(&enc_scl, &dec_scl, sizeof(enc_scl)) == 0); + + msgb_free(msg); +} + static void test_gsm0808_enc_dec_channel_type() { struct gsm0808_channel_type enc_ct = { @@ -1725,6 +1747,7 @@ test_gsm0808_enc_dec_speech_codec_ext_with_cfg(); test_gsm0808_enc_dec_speech_codec_with_cfg(); test_gsm0808_enc_dec_speech_codec_list(); + test_gsm0808_enc_dec_empty_speech_codec_list(); test_gsm0808_enc_dec_channel_type(); test_gsm0808_enc_dec_encrypt_info(); -- To view, visit https://gerrit.osmocom.org/11373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1eb1f4466b98bdd26d765b0e4cc690b5e89e9dd6 Gerrit-Change-Number: 11373 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 14:48:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 16 Oct 2018 14:48:24 +0000 Subject: Change in osmo-mgw[master]: osmux: Avoid initing output without enabling osmux Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11374 Change subject: osmux: Avoid initing output without enabling osmux ...................................................................... osmux: Avoid initing output without enabling osmux Otherwise we end up in a weird state where we have timers set up but osmux is still flagged as not enabled. Cherry-picked from openbsc cad739d2386640a68c24e3d470ddacdcaf377561. Change-Id: I0a334842463d311bc80a980e60fb702a0a9ad610 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/74/11374/1 diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index f842232..9ae82cd 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -284,7 +284,7 @@ }; rate_ctr_inc(&conn_net->rate_ctr_group->ctr[RTP_PACKETS_TX_CTR]); - rate_ctr_add(&conn_net->rate_ctr_group->ctr[RTP_OCTETS_TX_CTR], msg->len); + rate_ctr_add(&conn_net->rate_ctr_group->ctr[RTP_OCTETS_TX_CTR], msg->len); /* Send RTP data to BTS */ /* FIXME: Get rid of conn_bts and conn_net! */ @@ -530,10 +530,6 @@ return -1; } - osmux_xfrm_output_init(&conn->osmux.out, - (conn->osmux.cid * rtp_ssrc_winlen) + - (random() % rtp_ssrc_winlen)); - conn->osmux.in = osmux_handle_lookup(endp->cfg, addr, port); if (!conn->osmux.in) { LOGP(DLMGCP, LOGL_ERROR, "Cannot allocate input osmux handle for conn:%s\n", @@ -546,6 +542,10 @@ return -1; } + osmux_xfrm_output_init(&conn->osmux.out, + (conn->osmux.cid * rtp_ssrc_winlen) + + (random() % rtp_ssrc_winlen)); + switch (endp->cfg->role) { case MGCP_BSC_NAT: conn->type = MGCP_OSMUX_BSC_NAT; -- To view, visit https://gerrit.osmocom.org/11374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0a334842463d311bc80a980e60fb702a0a9ad610 Gerrit-Change-Number: 11374 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 14:48:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 16 Oct 2018 14:48:25 +0000 Subject: Change in osmo-mgw[master]: mgcp: Log endpoint nr consistently as hex Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11375 Change subject: mgcp: Log endpoint nr consistently as hex ...................................................................... mgcp: Log endpoint nr consistently as hex Port from openbsc 078905a0603c91b227854abfa01c9e24143e39a1. Change-Id: Idcb40e6fd561b24e111afe7463f44c43c530fac5 --- M src/libosmo-mgcp/mgcp_osmux.c M src/libosmo-mgcp/mgcp_protocol.c M tests/mgcp/mgcp_test.c 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/75/11375/1 diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 9ae82cd..bc9eca2 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -407,12 +407,12 @@ if (osmux_enable_conn(endp, conn_net, &addr->sin_addr, addr->sin_port) < 0 ) { LOGP(DLMGCP, LOGL_ERROR, - "Could not enable osmux in endpoint %d\n", + "Could not enable osmux in endpoint 0x%x\n", ENDPOINT_NUMBER(endp)); goto out; } - LOGP(DLMGCP, LOGL_INFO, "Enabling osmux in endpoint %d for %s:%u\n", + LOGP(DLMGCP, LOGL_INFO, "Enabling osmux in endpoint 0x%x for %s:%u\n", ENDPOINT_NUMBER(endp), inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); out: diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index bc191b5..e17bdae 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -691,7 +691,7 @@ if (!strcmp(token, "C")) endp->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID; else - LOGP(DLMGCP, LOGL_ERROR, "endpoint %x: received unknown X-Osmo-IGN item '%s'\n", + LOGP(DLMGCP, LOGL_ERROR, "endpoint 0x%x: received unknown X-Osmo-IGN item '%s'\n", ENDPOINT_NUMBER(endp), token); } diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 4cb16dd..a540056 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -550,7 +550,7 @@ static int mgcp_test_policy_cb(struct mgcp_trunk_config *cfg, int endpoint, int state, const char *transactio_id) { - fprintf(stderr, "Policy CB got state %d on endpoint %d\n", + fprintf(stderr, "Policy CB got state %d on endpoint 0x%x\n", state, endpoint); last_endpoint = endpoint; return MGCP_POLICY_CONT; @@ -813,7 +813,7 @@ OSMO_ASSERT(last_endpoint != -1); endp = &cfg->trunk.endpoints[last_endpoint]; - fprintf(stderr, "endpoint %d: " + fprintf(stderr, "endpoint 0x%x: " "payload type %d (expected %d)\n", last_endpoint, conn->end.codec->payload_type, t->ptype); -- To view, visit https://gerrit.osmocom.org/11375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idcb40e6fd561b24e111afe7463f44c43c530fac5 Gerrit-Change-Number: 11375 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 14:48:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 16 Oct 2018 14:48:25 +0000 Subject: Change in osmo-mgw[master]: osmux_send_dummy: Avoid logging incorrectly and sending if osmux not ... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11376 Change subject: osmux_send_dummy: Avoid logging incorrectly and sending if osmux not enabled ...................................................................... osmux_send_dummy: Avoid logging incorrectly and sending if osmux not enabled Port from openbsc 37a0307b6193c9b108cfd1aa2a88517a8b5cb907. Change-Id: Iabc84cb482a425d4a6c2bb08c20b2e02a5a86b36 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/76/11376/1 diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index bc9eca2..2e58c55 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -641,12 +641,20 @@ LOGP(DLMGCP, LOGL_ERROR, "Could not activate osmux for conn:%s\n", mgcp_conn_dump(conn->conn)); + return 0; } LOGP(DLMGCP, LOGL_ERROR, "Osmux CID %u for %s:%u is now enabled\n", conn->osmux.cid, inet_ntoa(conn->end.addr), endp->cfg->osmux_port); } + if(conn->osmux.state != OSMUX_STATE_ENABLED) { + LOGP(DLMGCP, LOGL_ERROR, + "OSMUX dummy to %s CID %u: Osmux not enabled on endpoint 0x%x state %d\n", + inet_ntoa(conn->end.addr), conn->osmux.cid, + ENDPOINT_NUMBER(endp), conn->osmux.state); + return 0; + } LOGP(DLMGCP, LOGL_DEBUG, "sending OSMUX dummy load to %s CID %u\n", inet_ntoa(conn->end.addr), conn->osmux.cid); -- To view, visit https://gerrit.osmocom.org/11376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iabc84cb482a425d4a6c2bb08c20b2e02a5a86b36 Gerrit-Change-Number: 11376 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 14:48:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 16 Oct 2018 14:48:26 +0000 Subject: Change in osmo-mgw[master]: osmux: Don't process regular osmux frames if disabled by cfg Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11377 Change subject: osmux: Don't process regular osmux frames if disabled by cfg ...................................................................... osmux: Don't process regular osmux frames if disabled by cfg Prior to this commit, the check was only done on legacy dummy frames. Port from openbsc a42d4584fd01c9cd1021fab609bdaaafe859c13a. Change-Id: I5b6606d72a9f5ae593a8e3ab5fbbe7e1e5a0ae11 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/77/11377/1 diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 2e58c55..2e6307e 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -331,6 +331,12 @@ if (!msg) return -1; + if (!cfg->osmux) { + LOGP(DLMGCP, LOGL_ERROR, + "bsc-nat wants to use Osmux but bsc did not request it\n"); + goto out; + } + /* not any further processing dummy messages */ if (msg->data[0] == MGCP_DUMMY_LOAD) goto out; @@ -382,12 +388,6 @@ LOGP(DLMGCP, LOGL_DEBUG, "Received Osmux dummy load from %s\n", inet_ntoa(addr->sin_addr)); - if (!cfg->osmux) { - LOGP(DLMGCP, LOGL_ERROR, - "bsc wants to use Osmux but bsc-nat did not request it\n"); - goto out; - } - /* extract the osmux CID from the dummy message */ memcpy(&osmux_cid, &msg->data[1], sizeof(osmux_cid)); @@ -433,6 +433,12 @@ if (!msg) return -1; + if (!cfg->osmux) { + LOGP(DLMGCP, LOGL_ERROR, + "bsc wants to use Osmux but bsc-nat did not request it\n"); + goto out; + } + /* not any further processing dummy messages */ if (msg->data[0] == MGCP_DUMMY_LOAD) return osmux_handle_dummy(cfg, &addr, msg); -- To view, visit https://gerrit.osmocom.org/11377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5b6606d72a9f5ae593a8e3ab5fbbe7e1e5a0ae11 Gerrit-Change-Number: 11377 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 14:48:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 16 Oct 2018 14:48:26 +0000 Subject: Change in osmo-mgw[master]: osmux: Move parse_cid of legacy dummy frames to own function Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11378 Change subject: osmux: Move parse_cid of legacy dummy frames to own function ...................................................................... osmux: Move parse_cid of legacy dummy frames to own function Backport from openbsc b010f869c915016b7fa97a26621582cd89de96b0. Change-Id: I5766165985fbfcecc63d45b9e229322bc8cedf52 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 15 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/78/11378/1 diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 2e6307e..9081873 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -316,6 +316,20 @@ return msg; } +static int osmux_legacy_dummy_parse_cid(struct sockaddr_in *addr, struct msgb *msg, + uint8_t *osmux_cid) +{ + if (msg->len < 1 + sizeof(osmux_cid)) { + LOGP(DLMGCP, LOGL_ERROR, + "Discarding truncated Osmux dummy load\n"); + return -1; + } + + /* extract the osmux CID from the dummy message */ + memcpy(osmux_cid, &msg->data[1], sizeof(*osmux_cid)); + return 0; +} + #define osmux_chunk_length(msg, rem) (rem - msg->len); int osmux_read_from_bsc_nat_cb(struct osmo_fd *ofd, unsigned int what) @@ -379,17 +393,8 @@ uint8_t osmux_cid; struct mgcp_conn_rtp *conn_net = NULL; - if (msg->len < 1 + sizeof(osmux_cid)) { - LOGP(DLMGCP, LOGL_ERROR, - "Discarding truncated Osmux dummy load\n"); + if (osmux_legacy_dummy_parse_cid(addr, msg, &osmux_cid) < 0) goto out; - } - - LOGP(DLMGCP, LOGL_DEBUG, "Received Osmux dummy load from %s\n", - inet_ntoa(addr->sin_addr)); - - /* extract the osmux CID from the dummy message */ - memcpy(&osmux_cid, &msg->data[1], sizeof(osmux_cid)); endp = endpoint_lookup(cfg, osmux_cid, &addr->sin_addr, MGCP_DEST_BTS); if (!endp) { -- To view, visit https://gerrit.osmocom.org/11378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5766165985fbfcecc63d45b9e229322bc8cedf52 Gerrit-Change-Number: 11378 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 14:48:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 16 Oct 2018 14:48:26 +0000 Subject: Change in osmo-mgw[master]: osmux: Make func handling dummy frames independent of endp type Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11379 Change subject: osmux: Make func handling dummy frames independent of endp type ...................................................................... osmux: Make func handling dummy frames independent of endp type Port from openbsc 8f321179747f64819d940d72d0212192f69284ca. Change-Id: I3e16217737fd5ffb95c166c5f7344492cb6a6263 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/79/11379/1 diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 9081873..38cd3bd 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -387,30 +387,31 @@ /* This is called from the bsc-nat */ static int osmux_handle_dummy(struct mgcp_config *cfg, struct sockaddr_in *addr, - struct msgb *msg) + struct msgb *msg, int endp_type) { struct mgcp_endpoint *endp; uint8_t osmux_cid; - struct mgcp_conn_rtp *conn_net = NULL; + struct mgcp_conn_rtp *conn = NULL; if (osmux_legacy_dummy_parse_cid(addr, msg, &osmux_cid) < 0) goto out; - endp = endpoint_lookup(cfg, osmux_cid, &addr->sin_addr, MGCP_DEST_BTS); + endp = endpoint_lookup(cfg, osmux_cid, &addr->sin_addr, endp_type); if (!endp) { LOGP(DLMGCP, LOGL_ERROR, "Cannot find endpoint for Osmux CID %d\n", osmux_cid); goto out; } - conn_net = mgcp_conn_get_rtp(endp, CONN_ID_NET); - if (!conn_net) + /* FIXME: Get rid of CONN_ID_XXX! */ + conn = mgcp_conn_get_rtp(endp, endp_type == MGCP_DEST_BTS ? CONN_ID_NET : CONN_ID_BTS); + if (!conn) goto out; - if (conn_net->osmux.state == OSMUX_STATE_ENABLED) + if (conn->osmux.state == OSMUX_STATE_ENABLED) goto out; - if (osmux_enable_conn(endp, conn_net, &addr->sin_addr, addr->sin_port) < 0 ) { + if (osmux_enable_conn(endp, conn, &addr->sin_addr, addr->sin_port) < 0 ) { LOGP(DLMGCP, LOGL_ERROR, "Could not enable osmux in endpoint 0x%x\n", ENDPOINT_NUMBER(endp)); @@ -446,7 +447,7 @@ /* not any further processing dummy messages */ if (msg->data[0] == MGCP_DUMMY_LOAD) - return osmux_handle_dummy(cfg, &addr, msg); + return osmux_handle_dummy(cfg, &addr, msg, MGCP_DEST_BTS); rem = msg->len; while((osmuxh = osmux_xfrm_output_pull(msg)) != NULL) { -- To view, visit https://gerrit.osmocom.org/11379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3e16217737fd5ffb95c166c5f7344492cb6a6263 Gerrit-Change-Number: 11379 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 14:48:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 16 Oct 2018 14:48:26 +0000 Subject: Change in osmo-mgw[master]: osmux: allow enabling osmux only on correct activating state Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11380 Change subject: osmux: allow enabling osmux only on correct activating state ...................................................................... osmux: allow enabling osmux only on correct activating state State ACTIVATING is set once negotiation between the 2 parts went successfuly. Port from openbsc 96bd7b075a59eb051079152241b127ca944b0781. Change-Id: Ic56eda1251be41369d869e687a1cf955df2c6d61 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/80/11380/1 diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 38cd3bd..2828d83 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -536,9 +536,9 @@ uint16_t osmux_dummy = endp->cfg->osmux_dummy; /* Check if osmux is enabled for the specified connection */ - if (conn->osmux.state == OSMUX_STATE_DISABLED) { - LOGP(DLMGCP, LOGL_ERROR, "OSMUX not enabled for conn:%s\n", - mgcp_conn_dump(conn->conn)); + if (conn->osmux.state != OSMUX_STATE_ACTIVATING) { + LOGP(DLMGCP, LOGL_ERROR, "conn:%s didn't negotiate Osmux, state %d\n", + mgcp_conn_dump(conn->conn), conn->osmux.state); return -1; } -- To view, visit https://gerrit.osmocom.org/11380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic56eda1251be41369d869e687a1cf955df2c6d61 Gerrit-Change-Number: 11380 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 14:48:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 16 Oct 2018 14:48:27 +0000 Subject: Change in osmo-mgw[master]: osmux: Improve checks around activating and using enabled osmux Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11381 Change subject: osmux: Improve checks around activating and using enabled osmux ...................................................................... osmux: Improve checks around activating and using enabled osmux * Refactor code to have unified checks on all paths activating Osmux. * Improve checkings at activation time and add logging. * Code now enforces endp osmux status to be enabled before processing the frame through endp->osmux.out. Before, a delayed or bad pkt could arrive and be processed by an endp with osmux not enabled, using endp->osmux.out that was not initialized and ended up crashing: libosmo-netif/src/osmux.c:281:3: runtime error: member access within null pointer of type 'struct msgb' This could also happen if a BSC started sending or we received (non legacy dummy) osmux frames before we received the BSC CRCX ACK agreeing on osmux negotiation and switching to ACTIVATING state. Related: SYS#4350 Port from openbsc 4a2cc9eb0a0f9424c16b26fcb757483a39d67482. Includes fixup from openbsc I438349bffaa46a10ad8983090a4b17aed7e00d82. Change-Id: Iac11e447ec0d76e4e74ec982a6e3f63b35548978 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 43 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/81/11381/1 diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 2828d83..ca446ff 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -316,6 +316,34 @@ return msg; } +/* Updates endp osmux state and returns 0 if it can process messages, -1 otherwise */ +static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn, + bool sending) +{ + switch(conn->osmux.state) { + case OSMUX_STATE_ACTIVATING: + if (osmux_enable_conn(endp, conn, &conn->end.addr, htons(endp->cfg->osmux_port)) < 0) { + LOGP(DLMGCP, LOGL_ERROR, + "Could not enable osmux for conn:%s\n", + mgcp_conn_dump(conn->conn)); + return -1; + } + LOGP(DLMGCP, LOGL_ERROR, + "Osmux CID %u for %s:%u is now enabled\n", + conn->osmux.cid, inet_ntoa(conn->end.addr), + endp->cfg->osmux_port); + return 0; + case OSMUX_STATE_ENABLED: + return 0; + default: + LOGP(DLMGCP, LOGL_ERROR, + "Osmux %s in conn %s without full negotiation, state %d\n", + sending ? "sent" : "received", + mgcp_conn_dump(conn->conn), conn->osmux.state); + return -1; + } +} + static int osmux_legacy_dummy_parse_cid(struct sockaddr_in *addr, struct msgb *msg, uint8_t *osmux_cid) { @@ -374,11 +402,12 @@ osmuxh->circuit_id); goto out; } - conn_bts->osmux.stats.octets += osmux_chunk_length(msg, rem); - conn_bts->osmux.stats.chunks++; + if (endp_osmux_state_check(endp, conn_bts, false) == 0) { + conn_bts->osmux.stats.octets += osmux_chunk_length(msg, rem); + conn_bts->osmux.stats.chunks++; + osmux_xfrm_output_sched(&conn_bts->osmux.out, osmuxh); + } rem = msg->len; - - osmux_xfrm_output_sched(&conn_bts->osmux.out, osmuxh); } out: msgb_free(msg); @@ -408,19 +437,8 @@ if (!conn) goto out; - if (conn->osmux.state == OSMUX_STATE_ENABLED) - goto out; - - if (osmux_enable_conn(endp, conn, &addr->sin_addr, addr->sin_port) < 0 ) { - LOGP(DLMGCP, LOGL_ERROR, - "Could not enable osmux in endpoint 0x%x\n", - ENDPOINT_NUMBER(endp)); - goto out; - } - - LOGP(DLMGCP, LOGL_INFO, "Enabling osmux in endpoint 0x%x for %s:%u\n", - ENDPOINT_NUMBER(endp), inet_ntoa(addr->sin_addr), - ntohs(addr->sin_port)); + endp_osmux_state_check(endp, conn, false); + /* Only needed to punch hole in firewall, it can be dropped */ out: msgb_free(msg); return 0; @@ -468,11 +486,12 @@ osmuxh->circuit_id); goto out; } - conn_net->osmux.stats.octets += osmux_chunk_length(msg, rem); - conn_net->osmux.stats.chunks++; + if (endp_osmux_state_check(endp, conn_net, false) == 0) { + conn_net->osmux.stats.octets += osmux_chunk_length(msg, rem); + conn_net->osmux.stats.chunks++; + osmux_xfrm_output_sched(&conn_net->osmux.out, osmuxh); + } rem = msg->len; - - osmux_xfrm_output_sched(&conn_net->osmux.out, osmuxh); } out: msgb_free(msg); @@ -647,26 +666,9 @@ if (memcmp(&conn->end.addr, &addr_unset, sizeof(addr_unset)) == 0) return 0; - if (conn->osmux.state == OSMUX_STATE_ACTIVATING) { - if (osmux_enable_conn(endp, conn, &conn->end.addr, - htons(endp->cfg->osmux_port)) < 0) { - LOGP(DLMGCP, LOGL_ERROR, - "Could not activate osmux for conn:%s\n", - mgcp_conn_dump(conn->conn)); - return 0; - } - LOGP(DLMGCP, LOGL_ERROR, - "Osmux CID %u for %s:%u is now enabled\n", - conn->osmux.cid, inet_ntoa(conn->end.addr), - endp->cfg->osmux_port); - } - if(conn->osmux.state != OSMUX_STATE_ENABLED) { - LOGP(DLMGCP, LOGL_ERROR, - "OSMUX dummy to %s CID %u: Osmux not enabled on endpoint 0x%x state %d\n", - inet_ntoa(conn->end.addr), conn->osmux.cid, - ENDPOINT_NUMBER(endp), conn->osmux.state); - return 0; - } + if (endp_osmux_state_check(endp, conn, true) < 0) + return 0; + LOGP(DLMGCP, LOGL_DEBUG, "sending OSMUX dummy load to %s CID %u\n", inet_ntoa(conn->end.addr), conn->osmux.cid); -- To view, visit https://gerrit.osmocom.org/11381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iac11e447ec0d76e4e74ec982a6e3f63b35548978 Gerrit-Change-Number: 11381 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 14:48:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 16 Oct 2018 14:48:27 +0000 Subject: Change in osmo-mgw[master]: osmux.h: Document enum osmux_state Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11382 Change subject: osmux.h: Document enum osmux_state ...................................................................... osmux.h: Document enum osmux_state Port for openbsc 9ae32d0d0607f270f20239b8104e09ec20352301. Change-Id: I28978fa505d259f144457f29af4ba615aeaac74c --- M include/osmocom/mgcp/osmux.h 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/82/11382/1 diff --git a/include/osmocom/mgcp/osmux.h b/include/osmocom/mgcp/osmux.h index ea849c8..685be9c 100644 --- a/include/osmocom/mgcp/osmux.h +++ b/include/osmocom/mgcp/osmux.h @@ -24,10 +24,10 @@ int osmux_used_cid(void); enum osmux_state { - OSMUX_STATE_DISABLED = 0, - OSMUX_STATE_NEGOTIATING, - OSMUX_STATE_ACTIVATING, - OSMUX_STATE_ENABLED, + OSMUX_STATE_DISABLED = 0, /* Osmux not being currently used by endp */ + OSMUX_STATE_NEGOTIATING, /* Osmux was locally requested in MGCP CRCX */ + OSMUX_STATE_ACTIVATING, /* Osmux was accepted in MGCP CRCX ACK. It can now be enabled by \ref osmux_enable_endpoint. */ + OSMUX_STATE_ENABLED, /* Osmux was initialized by \ref osmux_enable_endpoint and can process frames */ }; enum osmux_usage { @@ -35,4 +35,3 @@ OSMUX_USAGE_ON = 1, OSMUX_USAGE_ONLY = 2, }; - -- To view, visit https://gerrit.osmocom.org/11382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I28978fa505d259f144457f29af4ba615aeaac74c Gerrit-Change-Number: 11382 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 14:48:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 16 Oct 2018 14:48:27 +0000 Subject: Change in osmo-mgw[master]: osmux: Avoid processing further frames if conn not found Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11383 Change subject: osmux: Avoid processing further frames if conn not found ...................................................................... osmux: Avoid processing further frames if conn not found Other frames can come from known connections, so let's keep processing each of them. Change-Id: I09190140ba917dfada4b0952230b68e0f5f6d43d --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/83/11383/1 diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index ca446ff..a2c138d 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -394,7 +394,7 @@ /* FIXME: Get rid of CONN_ID_XXX! */ conn_bts = mgcp_conn_get_rtp(endp, CONN_ID_BTS); if (!conn_bts) - goto out; + continue; if (!endp) { LOGP(DLMGCP, LOGL_ERROR, @@ -478,7 +478,7 @@ /* FIXME: Get rid of CONN_ID_XXX! */ conn_net = mgcp_conn_get_rtp(endp, CONN_ID_NET); if (!conn_net) - goto out; + continue; if (!endp) { LOGP(DLMGCP, LOGL_ERROR, -- To view, visit https://gerrit.osmocom.org/11383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I09190140ba917dfada4b0952230b68e0f5f6d43d Gerrit-Change-Number: 11383 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 14:54:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 16 Oct 2018 14:54:07 +0000 Subject: Change in libosmocore[master]: gsm0808: allow decoding of zero length speech codec lists. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11373 ) Change subject: gsm0808: allow decoding of zero length speech codec lists. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1eb1f4466b98bdd26d765b0e4cc690b5e89e9dd6 Gerrit-Change-Number: 11373 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 16 Oct 2018 14:54:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 15:03:25 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Oct 2018 15:03:25 +0000 Subject: Change in osmo-sip-connector[master]: Add --version cmdline option Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11384 Change subject: Add --version cmdline option ...................................................................... Add --version cmdline option Related: OS#3577 Change-Id: Ibdda54acddde0ac03e202286736d56b6fa51a365 --- M src/main.c 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/84/11384/1 diff --git a/src/main.c b/src/main.c index 560995e..0661498 100644 --- a/src/main.c +++ b/src/main.c @@ -81,6 +81,7 @@ printf("OsmoSIPcon: MNCC to SIP bridge\n"); printf(" -h --help\tthis text\n"); printf(" -c --config-file NAME\tThe config file to use [%s]\n", config_file); + printf(" -V --version\tPrint the version number\n"); } static void handle_options(int argc, char **argv) @@ -90,10 +91,11 @@ static struct option long_options[] = { {"help", 0, 0, 'h'}, {"config-file", 1, 0, 'c'}, + {"version", 0, 0, 'V' }, {NULL, 0, 0, 0} }; - c = getopt_long(argc, argv, "hc:", + c = getopt_long(argc, argv, "hc:V", long_options, &option_index); if (c == -1) break; @@ -105,6 +107,10 @@ case 'c': config_file = optarg; break; + case 'V': + print_version(1); + exit(EXIT_SUCCESS); + break; } } } -- To view, visit https://gerrit.osmocom.org/11384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibdda54acddde0ac03e202286736d56b6fa51a365 Gerrit-Change-Number: 11384 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Oct 16 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 16 Oct 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#278?= In-Reply-To: <867941766.83.1539616207318.JavaMail.jenkins@jenkins.osmocom.org> References: <867941766.83.1539616207318.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <608548050.92.1539702607257.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Oct 16 15:10:12 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Oct 2018 15:10:12 +0000 Subject: Change in osmo-sgsn[master]: Add --version cmdline option Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11385 Change subject: Add --version cmdline option ...................................................................... Add --version cmdline option Related: OS#3576 Change-Id: Icdb2bd9ec90511b51428800d17f8ce81f6804670 --- M src/gprs/gtphub_main.c 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/85/11385/1 diff --git a/src/gprs/gtphub_main.c b/src/gprs/gtphub_main.c index a1a2c1d..f824016 100644 --- a/src/gprs/gtphub_main.c +++ b/src/gprs/gtphub_main.c @@ -238,6 +238,7 @@ printf(" -e,--log-level Set a global log level.\n"); printf(" -r,--restart-file File for counting restarts [%s].\n", ccfg->restart_counter_file); + printf(" -V,--version Print the version number.\n"); } static void list_categories(void) @@ -265,10 +266,11 @@ {"timestamp", 0, 0, 'T'}, {"log-level", 1, 0, 'e'}, {"restart-file", 1, 0, 'r'}, + { "version", 0, 0, 'V' }, {NULL, 0, 0, 0} }; - c = getopt_long(argc, argv, "hd:Dc:sTe:r:", + c = getopt_long(argc, argv, "hd:Dc:sTe:r:V", long_options, &option_index); if (c == -1) { if (optind < argc) { @@ -310,6 +312,10 @@ case 'r': ccfg->restart_counter_file = optarg; break; + case 'V': + print_version(1); + exit(EXIT_SUCCESS); + break; default: LOGP(DGTPHUB, LOGL_FATAL, "Invalid command line argument, abort.\n"); exit(1); -- To view, visit https://gerrit.osmocom.org/11385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icdb2bd9ec90511b51428800d17f8ce81f6804670 Gerrit-Change-Number: 11385 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 15:17:17 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 16 Oct 2018 15:17:17 +0000 Subject: Change in osmo-bsc[master]: bssap: check for zero length speech codec lists. Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11386 Change subject: bssap: check for zero length speech codec lists. ...................................................................... bssap: check for zero length speech codec lists. The specification implicitly allows speech codec lists with 0 elements. When a speech codec list is included in the message, we should check if it actually contains speech codec elements. - Reject speech codec lists that do contain 0 elements Change-Id: I2aca205dfdf5c7de7cb48ea2b57eb54e678e12fc Related: OS#3657 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/86/11386/1 diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 537b851..282f1c5 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -696,6 +696,13 @@ cause = GSM0808_CAUSE_INCORRECT_VALUE; goto reject; } + + if (conn->codec_list.len <= 0) { + LOGP(DMSC, LOGL_ERROR, "Speech codec list does not contain any codecs\n"); + cause = GSM0808_CAUSE_INCORRECT_VALUE; + goto reject; + } + } if (aoip && !conn->codec_list.len) { -- To view, visit https://gerrit.osmocom.org/11386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2aca205dfdf5c7de7cb48ea2b57eb54e678e12fc Gerrit-Change-Number: 11386 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 15:17:17 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 16 Oct 2018 15:17:17 +0000 Subject: Change in osmo-bsc[master]: gsm_08_08: allow zero length speech codec lists in compl l3 info. Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11387 Change subject: gsm_08_08: allow zero length speech codec lists in compl l3 info. ...................................................................... gsm_08_08: allow zero length speech codec lists in compl l3 info. The COMPLETE LAYER 3 INFORMATION message contains a an Codec List (BSS Supported). When generating the compl l3 info msg, we check if the speech codec list that we have generated before has at least one element. If it has 0 elements we abort immediately. However, speech codec lists with 0 elements are permitted by the spec, so we should remove the checks as there are corner cases where voice support is intentionally unavailable. - Remove check for zero length speech codec lists. Change-Id: Id7332e5273ff0efb85043dd1e1bb804cfe2db944 Depends: libosmocore I1eb1f4466b98bdd26d765b0e4cc690b5e89e9dd6 Related: OS#3657 --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 1 insertion(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/87/11387/1 diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 6e1e502..807eb8c 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -495,12 +495,7 @@ if (gscon_is_aoip(conn)) { gen_bss_supported_codec_list(&scl, msc, conn_get_bts(conn)); - if (scl.len > 0) - resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), &scl); - else { - LOGP(DMSC, LOGL_ERROR, "Failed to create layer3 message due to empty speech codec list.\n"); - return false; - } + resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), &scl); } else resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), NULL); -- To view, visit https://gerrit.osmocom.org/11387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id7332e5273ff0efb85043dd1e1bb804cfe2db944 Gerrit-Change-Number: 11387 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 15:17:17 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 16 Oct 2018 15:17:17 +0000 Subject: Change in osmo-bsc[master]: gsm_08_08: do not include zero length speech codec list. Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11388 Change subject: gsm_08_08: do not include zero length speech codec list. ...................................................................... gsm_08_08: do not include zero length speech codec list. When COMPLETE LAYER 3 INFORMATION is generated, it may include a speech codec list that contains 0 elements (which is legal). The specification requires the speech to be include if the network supports an IP based user plane interface. It could be argumented that if no codecs are available, the ip based user plane interface is not supported and therefore the spec does not require the speech codec list IE to be included for those cases. Lets check if the speech codec list has 0 elements and if its zero length, lets omit it completely. - check for zero length speech codec list. - omit speech codec list if it has zero elements Change-Id: I07339322a71376e986a2d75b7bc1f552eafd02b5 Related: OS#3657 --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/88/11388/1 diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 807eb8c..19c2598 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -495,7 +495,17 @@ if (gscon_is_aoip(conn)) { gen_bss_supported_codec_list(&scl, msc, conn_get_bts(conn)); - resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), &scl); + if (scl.len > 0) + resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), &scl); + else { + /* Note: 3GPP TS 48.008 3.2.1.32, COMPLETE LAYER 3 INFORMATION clearly states that + * Codec List (BSS Supported) shall be included, if the radio access network + * supports an IP based user plane interface. It may be intentional that the + * current configuration does not support any voice codecs, in those cases the + * network does not support an IP based user plane interface, and therefore the + * Codec List (BSS Supported) IE can be left out in those situations. */ + resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), NULL); + } } else resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), NULL); -- To view, visit https://gerrit.osmocom.org/11388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I07339322a71376e986a2d75b7bc1f552eafd02b5 Gerrit-Change-Number: 11388 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 15:30:04 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Oct 2018 15:30:04 +0000 Subject: Change in osmo-dev[master]: 3G+2G.deps: add osmo-trx Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11389 Change subject: 3G+2G.deps: add osmo-trx ...................................................................... 3G+2G.deps: add osmo-trx Change-Id: Ia4ebf2732694cee0600b602b82c660cf6278958d --- M 3G+2G.deps 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/89/11389/1 diff --git a/3G+2G.deps b/3G+2G.deps index 5a17146..0eea175 100644 --- a/3G+2G.deps +++ b/3G+2G.deps @@ -13,3 +13,4 @@ osmo-bsc libosmo-sccp osmo-mgw osmo-sgsn osmo-iuh osmo-ggsn osmo-sip-connector libosmocore +osmo-trx libosmocore -- To view, visit https://gerrit.osmocom.org/11389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia4ebf2732694cee0600b602b82c660cf6278958d Gerrit-Change-Number: 11389 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 15:46:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 16 Oct 2018 15:46:05 +0000 Subject: Change in osmo-bsc[master]: bssap: check for zero length speech codec lists. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11386 ) Change subject: bssap: check for zero length speech codec lists. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11386/1/src/osmo-bsc/osmo_bsc_bssap.c File src/osmo-bsc/osmo_bsc_bssap.c: https://gerrit.osmocom.org/#/c/11386/1/src/osmo-bsc/osmo_bsc_bssap.c at 700 PS1, Line 700: if (conn->codec_list.len <= 0) { This check is already done in line 708, and IMHO cause is better set there. I think we can drop this addition here. -- To view, visit https://gerrit.osmocom.org/11386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2aca205dfdf5c7de7cb48ea2b57eb54e678e12fc Gerrit-Change-Number: 11386 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 16 Oct 2018 15:46:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 15:46:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 16 Oct 2018 15:46:45 +0000 Subject: Change in osmo-bsc[master]: gsm_08_08: allow zero length speech codec lists in compl l3 info. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11387 ) Change subject: gsm_08_08: allow zero length speech codec lists in compl l3 info. ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id7332e5273ff0efb85043dd1e1bb804cfe2db944 Gerrit-Change-Number: 11387 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 16 Oct 2018 15:46:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 15:48:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 16 Oct 2018 15:48:29 +0000 Subject: Change in osmo-bsc[master]: gsm_08_08: do not include zero length speech codec list. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11388 ) Change subject: gsm_08_08: do not include zero length speech codec list. ...................................................................... Patch Set 1: I am not sure we want to merge this patch. Why do you think having no speech codec elements in list means "user plane interface is not supported"? It can still support it but be misconfigured or on purpose configured to have no codecs available? -- To view, visit https://gerrit.osmocom.org/11388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I07339322a71376e986a2d75b7bc1f552eafd02b5 Gerrit-Change-Number: 11388 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 16 Oct 2018 15:48:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 19:55:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 19:55:49 +0000 Subject: Change in docker-playground[master]: jenkins.sh: IMAGE_SUFFIX, docker_images_require() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11366 ) Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require() ...................................................................... Patch Set 3: Code-Review+2 nice! -- To view, visit https://gerrit.osmocom.org/11366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e Gerrit-Change-Number: 11366 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 16 Oct 2018 19:55:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 19:57:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 19:57:14 +0000 Subject: Change in docker-playground[master]: symlinks: nplab-m3ua-test, nplab-sua-test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11368 ) Change subject: symlinks: nplab-m3ua-test, nplab-sua-test ...................................................................... Patch Set 3: you can simply rename/move them. -- To view, visit https://gerrit.osmocom.org/11368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de Gerrit-Change-Number: 11368 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 16 Oct 2018 19:57:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 19:57:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 19:57:50 +0000 Subject: Change in docker-playground[master]: Remove top-level Makefile In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11369 ) Change subject: Remove top-level Makefile ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff Gerrit-Change-Number: 11369 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 16 Oct 2018 19:57:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:02:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:02:11 +0000 Subject: Change in osmo-bsc[master]: bssap: check for zero length speech codec lists. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11386 ) Change subject: bssap: check for zero length speech codec lists. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11386/1/src/osmo-bsc/osmo_bsc_bssap.c File src/osmo-bsc/osmo_bsc_bssap.c: https://gerrit.osmocom.org/#/c/11386/1/src/osmo-bsc/osmo_bsc_bssap.c at 700 PS1, Line 700: if (conn->codec_list.len <= 0) { > This check is already done in line 708, and IMHO cause is better set there. [?] the difference is that the check here only applies *if* a SCL IE is actually present. So we fail/reject if an IE is present, but it is of zero length. where the "line 708" catches even situations where the IE wouldn't be preseng, but only if aoip is enabled? But then, how can we check for the length of an IE if it had never occurred? This looks a bit fishy? -- To view, visit https://gerrit.osmocom.org/11386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2aca205dfdf5c7de7cb48ea2b57eb54e678e12fc Gerrit-Change-Number: 11386 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 16 Oct 2018 20:02:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:03:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:03:04 +0000 Subject: Change in osmo-bsc[master]: gsm_08_08: allow zero length speech codec lists in compl l3 info. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11387 ) Change subject: gsm_08_08: allow zero length speech codec lists in compl l3 info. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id7332e5273ff0efb85043dd1e1bb804cfe2db944 Gerrit-Change-Number: 11387 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 16 Oct 2018 20:03:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:40:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:40:34 +0000 Subject: Change in osmo-bsc[master]: gsm_08_08: do not include zero length speech codec list. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11388 ) Change subject: gsm_08_08: do not include zero length speech codec list. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I07339322a71376e986a2d75b7bc1f552eafd02b5 Gerrit-Change-Number: 11388 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 16 Oct 2018 20:40:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:41:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:41:46 +0000 Subject: Change in openbsc[master]: mgcp: osmux_send_dummy: Fix return without value In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11372 ) Change subject: mgcp: osmux_send_dummy: Fix return without value ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I438349bffaa46a10ad8983090a4b17aed7e00d82 Gerrit-Change-Number: 11372 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 16 Oct 2018 20:41:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:41:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:41:49 +0000 Subject: Change in openbsc[master]: mgcp: osmux_send_dummy: Fix return without value In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11372 ) Change subject: mgcp: osmux_send_dummy: Fix return without value ...................................................................... mgcp: osmux_send_dummy: Fix return without value Not really critical since only user of this function doesn't check the return value. Fixes commit: 4a2cc9eb0a0f9424c16b26fcb757483a39d67482 Change-Id: I438349bffaa46a10ad8983090a4b17aed7e00d82 --- M openbsc/src/libmgcp/mgcp_osmux.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c index a0ac295..ce344ca 100644 --- a/openbsc/src/libmgcp/mgcp_osmux.c +++ b/openbsc/src/libmgcp/mgcp_osmux.c @@ -554,7 +554,7 @@ return 0; if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) - return; + return 0; LOGP(DMGCP, LOGL_DEBUG, "sending OSMUX dummy load to %s CID %u\n", -- To view, visit https://gerrit.osmocom.org/11372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I438349bffaa46a10ad8983090a4b17aed7e00d82 Gerrit-Change-Number: 11372 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:42:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:42:30 +0000 Subject: Change in osmo-mgw[master]: osmux: Avoid initing output without enabling osmux In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11374 ) Change subject: osmux: Avoid initing output without enabling osmux ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a334842463d311bc80a980e60fb702a0a9ad610 Gerrit-Change-Number: 11374 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 16 Oct 2018 20:42:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:43:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:43:37 +0000 Subject: Change in osmo-mgw[master]: mgcp: Log endpoint nr consistently as hex In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11375 ) Change subject: mgcp: Log endpoint nr consistently as hex ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idcb40e6fd561b24e111afe7463f44c43c530fac5 Gerrit-Change-Number: 11375 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 16 Oct 2018 20:43:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:43:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:43:50 +0000 Subject: Change in osmo-mgw[master]: osmux_send_dummy: Avoid logging incorrectly and sending if osmux not ... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11376 ) Change subject: osmux_send_dummy: Avoid logging incorrectly and sending if osmux not enabled ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iabc84cb482a425d4a6c2bb08c20b2e02a5a86b36 Gerrit-Change-Number: 11376 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 16 Oct 2018 20:43:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:44:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:44:28 +0000 Subject: Change in osmo-mgw[master]: osmux: Move parse_cid of legacy dummy frames to own function In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11378 ) Change subject: osmux: Move parse_cid of legacy dummy frames to own function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5766165985fbfcecc63d45b9e229322bc8cedf52 Gerrit-Change-Number: 11378 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 16 Oct 2018 20:44:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:44:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:44:38 +0000 Subject: Change in osmo-mgw[master]: osmux: Make func handling dummy frames independent of endp type In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11379 ) Change subject: osmux: Make func handling dummy frames independent of endp type ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3e16217737fd5ffb95c166c5f7344492cb6a6263 Gerrit-Change-Number: 11379 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 16 Oct 2018 20:44:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:44:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:44:47 +0000 Subject: Change in osmo-mgw[master]: osmux: allow enabling osmux only on correct activating state In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11380 ) Change subject: osmux: allow enabling osmux only on correct activating state ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic56eda1251be41369d869e687a1cf955df2c6d61 Gerrit-Change-Number: 11380 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 16 Oct 2018 20:44:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:44:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:44:51 +0000 Subject: Change in osmo-mgw[master]: osmux: Improve checks around activating and using enabled osmux In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11381 ) Change subject: osmux: Improve checks around activating and using enabled osmux ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iac11e447ec0d76e4e74ec982a6e3f63b35548978 Gerrit-Change-Number: 11381 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 16 Oct 2018 20:44:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:44:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:44:54 +0000 Subject: Change in osmo-mgw[master]: osmux.h: Document enum osmux_state In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11382 ) Change subject: osmux.h: Document enum osmux_state ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I28978fa505d259f144457f29af4ba615aeaac74c Gerrit-Change-Number: 11382 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 16 Oct 2018 20:44:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:45:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:45:00 +0000 Subject: Change in osmo-mgw[master]: osmux: Avoid processing further frames if conn not found In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11383 ) Change subject: osmux: Avoid processing further frames if conn not found ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I09190140ba917dfada4b0952230b68e0f5f6d43d Gerrit-Change-Number: 11383 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 16 Oct 2018 20:45:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:45:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:45:10 +0000 Subject: Change in osmo-mgw[master]: osmux: Don't process regular osmux frames if disabled by cfg In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11377 ) Change subject: osmux: Don't process regular osmux frames if disabled by cfg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5b6606d72a9f5ae593a8e3ab5fbbe7e1e5a0ae11 Gerrit-Change-Number: 11377 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 16 Oct 2018 20:45:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:45:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:45:14 +0000 Subject: Change in osmo-mgw[master]: osmux: Avoid initing output without enabling osmux In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11374 ) Change subject: osmux: Avoid initing output without enabling osmux ...................................................................... osmux: Avoid initing output without enabling osmux Otherwise we end up in a weird state where we have timers set up but osmux is still flagged as not enabled. Cherry-picked from openbsc cad739d2386640a68c24e3d470ddacdcaf377561. Change-Id: I0a334842463d311bc80a980e60fb702a0a9ad610 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index f842232..9ae82cd 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -284,7 +284,7 @@ }; rate_ctr_inc(&conn_net->rate_ctr_group->ctr[RTP_PACKETS_TX_CTR]); - rate_ctr_add(&conn_net->rate_ctr_group->ctr[RTP_OCTETS_TX_CTR], msg->len); + rate_ctr_add(&conn_net->rate_ctr_group->ctr[RTP_OCTETS_TX_CTR], msg->len); /* Send RTP data to BTS */ /* FIXME: Get rid of conn_bts and conn_net! */ @@ -530,10 +530,6 @@ return -1; } - osmux_xfrm_output_init(&conn->osmux.out, - (conn->osmux.cid * rtp_ssrc_winlen) + - (random() % rtp_ssrc_winlen)); - conn->osmux.in = osmux_handle_lookup(endp->cfg, addr, port); if (!conn->osmux.in) { LOGP(DLMGCP, LOGL_ERROR, "Cannot allocate input osmux handle for conn:%s\n", @@ -546,6 +542,10 @@ return -1; } + osmux_xfrm_output_init(&conn->osmux.out, + (conn->osmux.cid * rtp_ssrc_winlen) + + (random() % rtp_ssrc_winlen)); + switch (endp->cfg->role) { case MGCP_BSC_NAT: conn->type = MGCP_OSMUX_BSC_NAT; -- To view, visit https://gerrit.osmocom.org/11374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0a334842463d311bc80a980e60fb702a0a9ad610 Gerrit-Change-Number: 11374 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:45:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:45:14 +0000 Subject: Change in osmo-mgw[master]: mgcp: Log endpoint nr consistently as hex In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11375 ) Change subject: mgcp: Log endpoint nr consistently as hex ...................................................................... mgcp: Log endpoint nr consistently as hex Port from openbsc 078905a0603c91b227854abfa01c9e24143e39a1. Change-Id: Idcb40e6fd561b24e111afe7463f44c43c530fac5 --- M src/libosmo-mgcp/mgcp_osmux.c M src/libosmo-mgcp/mgcp_protocol.c M tests/mgcp/mgcp_test.c 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 9ae82cd..bc9eca2 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -407,12 +407,12 @@ if (osmux_enable_conn(endp, conn_net, &addr->sin_addr, addr->sin_port) < 0 ) { LOGP(DLMGCP, LOGL_ERROR, - "Could not enable osmux in endpoint %d\n", + "Could not enable osmux in endpoint 0x%x\n", ENDPOINT_NUMBER(endp)); goto out; } - LOGP(DLMGCP, LOGL_INFO, "Enabling osmux in endpoint %d for %s:%u\n", + LOGP(DLMGCP, LOGL_INFO, "Enabling osmux in endpoint 0x%x for %s:%u\n", ENDPOINT_NUMBER(endp), inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); out: diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index bc191b5..e17bdae 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -691,7 +691,7 @@ if (!strcmp(token, "C")) endp->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID; else - LOGP(DLMGCP, LOGL_ERROR, "endpoint %x: received unknown X-Osmo-IGN item '%s'\n", + LOGP(DLMGCP, LOGL_ERROR, "endpoint 0x%x: received unknown X-Osmo-IGN item '%s'\n", ENDPOINT_NUMBER(endp), token); } diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 4cb16dd..a540056 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -550,7 +550,7 @@ static int mgcp_test_policy_cb(struct mgcp_trunk_config *cfg, int endpoint, int state, const char *transactio_id) { - fprintf(stderr, "Policy CB got state %d on endpoint %d\n", + fprintf(stderr, "Policy CB got state %d on endpoint 0x%x\n", state, endpoint); last_endpoint = endpoint; return MGCP_POLICY_CONT; @@ -813,7 +813,7 @@ OSMO_ASSERT(last_endpoint != -1); endp = &cfg->trunk.endpoints[last_endpoint]; - fprintf(stderr, "endpoint %d: " + fprintf(stderr, "endpoint 0x%x: " "payload type %d (expected %d)\n", last_endpoint, conn->end.codec->payload_type, t->ptype); -- To view, visit https://gerrit.osmocom.org/11375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idcb40e6fd561b24e111afe7463f44c43c530fac5 Gerrit-Change-Number: 11375 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:45:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:45:15 +0000 Subject: Change in osmo-mgw[master]: osmux_send_dummy: Avoid logging incorrectly and sending if osmux not ... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11376 ) Change subject: osmux_send_dummy: Avoid logging incorrectly and sending if osmux not enabled ...................................................................... osmux_send_dummy: Avoid logging incorrectly and sending if osmux not enabled Port from openbsc 37a0307b6193c9b108cfd1aa2a88517a8b5cb907. Change-Id: Iabc84cb482a425d4a6c2bb08c20b2e02a5a86b36 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index bc9eca2..2e58c55 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -641,12 +641,20 @@ LOGP(DLMGCP, LOGL_ERROR, "Could not activate osmux for conn:%s\n", mgcp_conn_dump(conn->conn)); + return 0; } LOGP(DLMGCP, LOGL_ERROR, "Osmux CID %u for %s:%u is now enabled\n", conn->osmux.cid, inet_ntoa(conn->end.addr), endp->cfg->osmux_port); } + if(conn->osmux.state != OSMUX_STATE_ENABLED) { + LOGP(DLMGCP, LOGL_ERROR, + "OSMUX dummy to %s CID %u: Osmux not enabled on endpoint 0x%x state %d\n", + inet_ntoa(conn->end.addr), conn->osmux.cid, + ENDPOINT_NUMBER(endp), conn->osmux.state); + return 0; + } LOGP(DLMGCP, LOGL_DEBUG, "sending OSMUX dummy load to %s CID %u\n", inet_ntoa(conn->end.addr), conn->osmux.cid); -- To view, visit https://gerrit.osmocom.org/11376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iabc84cb482a425d4a6c2bb08c20b2e02a5a86b36 Gerrit-Change-Number: 11376 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:45:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:45:15 +0000 Subject: Change in osmo-mgw[master]: osmux: Don't process regular osmux frames if disabled by cfg In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11377 ) Change subject: osmux: Don't process regular osmux frames if disabled by cfg ...................................................................... osmux: Don't process regular osmux frames if disabled by cfg Prior to this commit, the check was only done on legacy dummy frames. Port from openbsc a42d4584fd01c9cd1021fab609bdaaafe859c13a. Change-Id: I5b6606d72a9f5ae593a8e3ab5fbbe7e1e5a0ae11 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 12 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 2e58c55..2e6307e 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -331,6 +331,12 @@ if (!msg) return -1; + if (!cfg->osmux) { + LOGP(DLMGCP, LOGL_ERROR, + "bsc-nat wants to use Osmux but bsc did not request it\n"); + goto out; + } + /* not any further processing dummy messages */ if (msg->data[0] == MGCP_DUMMY_LOAD) goto out; @@ -382,12 +388,6 @@ LOGP(DLMGCP, LOGL_DEBUG, "Received Osmux dummy load from %s\n", inet_ntoa(addr->sin_addr)); - if (!cfg->osmux) { - LOGP(DLMGCP, LOGL_ERROR, - "bsc wants to use Osmux but bsc-nat did not request it\n"); - goto out; - } - /* extract the osmux CID from the dummy message */ memcpy(&osmux_cid, &msg->data[1], sizeof(osmux_cid)); @@ -433,6 +433,12 @@ if (!msg) return -1; + if (!cfg->osmux) { + LOGP(DLMGCP, LOGL_ERROR, + "bsc wants to use Osmux but bsc-nat did not request it\n"); + goto out; + } + /* not any further processing dummy messages */ if (msg->data[0] == MGCP_DUMMY_LOAD) return osmux_handle_dummy(cfg, &addr, msg); -- To view, visit https://gerrit.osmocom.org/11377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5b6606d72a9f5ae593a8e3ab5fbbe7e1e5a0ae11 Gerrit-Change-Number: 11377 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:45:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:45:15 +0000 Subject: Change in osmo-mgw[master]: osmux: Move parse_cid of legacy dummy frames to own function In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11378 ) Change subject: osmux: Move parse_cid of legacy dummy frames to own function ...................................................................... osmux: Move parse_cid of legacy dummy frames to own function Backport from openbsc b010f869c915016b7fa97a26621582cd89de96b0. Change-Id: I5766165985fbfcecc63d45b9e229322bc8cedf52 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 15 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 2e6307e..9081873 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -316,6 +316,20 @@ return msg; } +static int osmux_legacy_dummy_parse_cid(struct sockaddr_in *addr, struct msgb *msg, + uint8_t *osmux_cid) +{ + if (msg->len < 1 + sizeof(osmux_cid)) { + LOGP(DLMGCP, LOGL_ERROR, + "Discarding truncated Osmux dummy load\n"); + return -1; + } + + /* extract the osmux CID from the dummy message */ + memcpy(osmux_cid, &msg->data[1], sizeof(*osmux_cid)); + return 0; +} + #define osmux_chunk_length(msg, rem) (rem - msg->len); int osmux_read_from_bsc_nat_cb(struct osmo_fd *ofd, unsigned int what) @@ -379,17 +393,8 @@ uint8_t osmux_cid; struct mgcp_conn_rtp *conn_net = NULL; - if (msg->len < 1 + sizeof(osmux_cid)) { - LOGP(DLMGCP, LOGL_ERROR, - "Discarding truncated Osmux dummy load\n"); + if (osmux_legacy_dummy_parse_cid(addr, msg, &osmux_cid) < 0) goto out; - } - - LOGP(DLMGCP, LOGL_DEBUG, "Received Osmux dummy load from %s\n", - inet_ntoa(addr->sin_addr)); - - /* extract the osmux CID from the dummy message */ - memcpy(&osmux_cid, &msg->data[1], sizeof(osmux_cid)); endp = endpoint_lookup(cfg, osmux_cid, &addr->sin_addr, MGCP_DEST_BTS); if (!endp) { -- To view, visit https://gerrit.osmocom.org/11378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5766165985fbfcecc63d45b9e229322bc8cedf52 Gerrit-Change-Number: 11378 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:45:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:45:15 +0000 Subject: Change in osmo-mgw[master]: osmux: Make func handling dummy frames independent of endp type In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11379 ) Change subject: osmux: Make func handling dummy frames independent of endp type ...................................................................... osmux: Make func handling dummy frames independent of endp type Port from openbsc 8f321179747f64819d940d72d0212192f69284ca. Change-Id: I3e16217737fd5ffb95c166c5f7344492cb6a6263 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 9 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 9081873..38cd3bd 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -387,30 +387,31 @@ /* This is called from the bsc-nat */ static int osmux_handle_dummy(struct mgcp_config *cfg, struct sockaddr_in *addr, - struct msgb *msg) + struct msgb *msg, int endp_type) { struct mgcp_endpoint *endp; uint8_t osmux_cid; - struct mgcp_conn_rtp *conn_net = NULL; + struct mgcp_conn_rtp *conn = NULL; if (osmux_legacy_dummy_parse_cid(addr, msg, &osmux_cid) < 0) goto out; - endp = endpoint_lookup(cfg, osmux_cid, &addr->sin_addr, MGCP_DEST_BTS); + endp = endpoint_lookup(cfg, osmux_cid, &addr->sin_addr, endp_type); if (!endp) { LOGP(DLMGCP, LOGL_ERROR, "Cannot find endpoint for Osmux CID %d\n", osmux_cid); goto out; } - conn_net = mgcp_conn_get_rtp(endp, CONN_ID_NET); - if (!conn_net) + /* FIXME: Get rid of CONN_ID_XXX! */ + conn = mgcp_conn_get_rtp(endp, endp_type == MGCP_DEST_BTS ? CONN_ID_NET : CONN_ID_BTS); + if (!conn) goto out; - if (conn_net->osmux.state == OSMUX_STATE_ENABLED) + if (conn->osmux.state == OSMUX_STATE_ENABLED) goto out; - if (osmux_enable_conn(endp, conn_net, &addr->sin_addr, addr->sin_port) < 0 ) { + if (osmux_enable_conn(endp, conn, &addr->sin_addr, addr->sin_port) < 0 ) { LOGP(DLMGCP, LOGL_ERROR, "Could not enable osmux in endpoint 0x%x\n", ENDPOINT_NUMBER(endp)); @@ -446,7 +447,7 @@ /* not any further processing dummy messages */ if (msg->data[0] == MGCP_DUMMY_LOAD) - return osmux_handle_dummy(cfg, &addr, msg); + return osmux_handle_dummy(cfg, &addr, msg, MGCP_DEST_BTS); rem = msg->len; while((osmuxh = osmux_xfrm_output_pull(msg)) != NULL) { -- To view, visit https://gerrit.osmocom.org/11379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3e16217737fd5ffb95c166c5f7344492cb6a6263 Gerrit-Change-Number: 11379 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:45:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:45:16 +0000 Subject: Change in osmo-mgw[master]: osmux: allow enabling osmux only on correct activating state In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11380 ) Change subject: osmux: allow enabling osmux only on correct activating state ...................................................................... osmux: allow enabling osmux only on correct activating state State ACTIVATING is set once negotiation between the 2 parts went successfuly. Port from openbsc 96bd7b075a59eb051079152241b127ca944b0781. Change-Id: Ic56eda1251be41369d869e687a1cf955df2c6d61 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 38cd3bd..2828d83 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -536,9 +536,9 @@ uint16_t osmux_dummy = endp->cfg->osmux_dummy; /* Check if osmux is enabled for the specified connection */ - if (conn->osmux.state == OSMUX_STATE_DISABLED) { - LOGP(DLMGCP, LOGL_ERROR, "OSMUX not enabled for conn:%s\n", - mgcp_conn_dump(conn->conn)); + if (conn->osmux.state != OSMUX_STATE_ACTIVATING) { + LOGP(DLMGCP, LOGL_ERROR, "conn:%s didn't negotiate Osmux, state %d\n", + mgcp_conn_dump(conn->conn), conn->osmux.state); return -1; } -- To view, visit https://gerrit.osmocom.org/11380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic56eda1251be41369d869e687a1cf955df2c6d61 Gerrit-Change-Number: 11380 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:45:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:45:16 +0000 Subject: Change in osmo-mgw[master]: osmux: Improve checks around activating and using enabled osmux In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11381 ) Change subject: osmux: Improve checks around activating and using enabled osmux ...................................................................... osmux: Improve checks around activating and using enabled osmux * Refactor code to have unified checks on all paths activating Osmux. * Improve checkings at activation time and add logging. * Code now enforces endp osmux status to be enabled before processing the frame through endp->osmux.out. Before, a delayed or bad pkt could arrive and be processed by an endp with osmux not enabled, using endp->osmux.out that was not initialized and ended up crashing: libosmo-netif/src/osmux.c:281:3: runtime error: member access within null pointer of type 'struct msgb' This could also happen if a BSC started sending or we received (non legacy dummy) osmux frames before we received the BSC CRCX ACK agreeing on osmux negotiation and switching to ACTIVATING state. Related: SYS#4350 Port from openbsc 4a2cc9eb0a0f9424c16b26fcb757483a39d67482. Includes fixup from openbsc I438349bffaa46a10ad8983090a4b17aed7e00d82. Change-Id: Iac11e447ec0d76e4e74ec982a6e3f63b35548978 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 43 insertions(+), 41 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 2828d83..ca446ff 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -316,6 +316,34 @@ return msg; } +/* Updates endp osmux state and returns 0 if it can process messages, -1 otherwise */ +static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn, + bool sending) +{ + switch(conn->osmux.state) { + case OSMUX_STATE_ACTIVATING: + if (osmux_enable_conn(endp, conn, &conn->end.addr, htons(endp->cfg->osmux_port)) < 0) { + LOGP(DLMGCP, LOGL_ERROR, + "Could not enable osmux for conn:%s\n", + mgcp_conn_dump(conn->conn)); + return -1; + } + LOGP(DLMGCP, LOGL_ERROR, + "Osmux CID %u for %s:%u is now enabled\n", + conn->osmux.cid, inet_ntoa(conn->end.addr), + endp->cfg->osmux_port); + return 0; + case OSMUX_STATE_ENABLED: + return 0; + default: + LOGP(DLMGCP, LOGL_ERROR, + "Osmux %s in conn %s without full negotiation, state %d\n", + sending ? "sent" : "received", + mgcp_conn_dump(conn->conn), conn->osmux.state); + return -1; + } +} + static int osmux_legacy_dummy_parse_cid(struct sockaddr_in *addr, struct msgb *msg, uint8_t *osmux_cid) { @@ -374,11 +402,12 @@ osmuxh->circuit_id); goto out; } - conn_bts->osmux.stats.octets += osmux_chunk_length(msg, rem); - conn_bts->osmux.stats.chunks++; + if (endp_osmux_state_check(endp, conn_bts, false) == 0) { + conn_bts->osmux.stats.octets += osmux_chunk_length(msg, rem); + conn_bts->osmux.stats.chunks++; + osmux_xfrm_output_sched(&conn_bts->osmux.out, osmuxh); + } rem = msg->len; - - osmux_xfrm_output_sched(&conn_bts->osmux.out, osmuxh); } out: msgb_free(msg); @@ -408,19 +437,8 @@ if (!conn) goto out; - if (conn->osmux.state == OSMUX_STATE_ENABLED) - goto out; - - if (osmux_enable_conn(endp, conn, &addr->sin_addr, addr->sin_port) < 0 ) { - LOGP(DLMGCP, LOGL_ERROR, - "Could not enable osmux in endpoint 0x%x\n", - ENDPOINT_NUMBER(endp)); - goto out; - } - - LOGP(DLMGCP, LOGL_INFO, "Enabling osmux in endpoint 0x%x for %s:%u\n", - ENDPOINT_NUMBER(endp), inet_ntoa(addr->sin_addr), - ntohs(addr->sin_port)); + endp_osmux_state_check(endp, conn, false); + /* Only needed to punch hole in firewall, it can be dropped */ out: msgb_free(msg); return 0; @@ -468,11 +486,12 @@ osmuxh->circuit_id); goto out; } - conn_net->osmux.stats.octets += osmux_chunk_length(msg, rem); - conn_net->osmux.stats.chunks++; + if (endp_osmux_state_check(endp, conn_net, false) == 0) { + conn_net->osmux.stats.octets += osmux_chunk_length(msg, rem); + conn_net->osmux.stats.chunks++; + osmux_xfrm_output_sched(&conn_net->osmux.out, osmuxh); + } rem = msg->len; - - osmux_xfrm_output_sched(&conn_net->osmux.out, osmuxh); } out: msgb_free(msg); @@ -647,26 +666,9 @@ if (memcmp(&conn->end.addr, &addr_unset, sizeof(addr_unset)) == 0) return 0; - if (conn->osmux.state == OSMUX_STATE_ACTIVATING) { - if (osmux_enable_conn(endp, conn, &conn->end.addr, - htons(endp->cfg->osmux_port)) < 0) { - LOGP(DLMGCP, LOGL_ERROR, - "Could not activate osmux for conn:%s\n", - mgcp_conn_dump(conn->conn)); - return 0; - } - LOGP(DLMGCP, LOGL_ERROR, - "Osmux CID %u for %s:%u is now enabled\n", - conn->osmux.cid, inet_ntoa(conn->end.addr), - endp->cfg->osmux_port); - } - if(conn->osmux.state != OSMUX_STATE_ENABLED) { - LOGP(DLMGCP, LOGL_ERROR, - "OSMUX dummy to %s CID %u: Osmux not enabled on endpoint 0x%x state %d\n", - inet_ntoa(conn->end.addr), conn->osmux.cid, - ENDPOINT_NUMBER(endp), conn->osmux.state); - return 0; - } + if (endp_osmux_state_check(endp, conn, true) < 0) + return 0; + LOGP(DLMGCP, LOGL_DEBUG, "sending OSMUX dummy load to %s CID %u\n", inet_ntoa(conn->end.addr), conn->osmux.cid); -- To view, visit https://gerrit.osmocom.org/11381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iac11e447ec0d76e4e74ec982a6e3f63b35548978 Gerrit-Change-Number: 11381 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:45:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:45:16 +0000 Subject: Change in osmo-mgw[master]: osmux.h: Document enum osmux_state In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11382 ) Change subject: osmux.h: Document enum osmux_state ...................................................................... osmux.h: Document enum osmux_state Port for openbsc 9ae32d0d0607f270f20239b8104e09ec20352301. Change-Id: I28978fa505d259f144457f29af4ba615aeaac74c --- M include/osmocom/mgcp/osmux.h 1 file changed, 4 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/mgcp/osmux.h b/include/osmocom/mgcp/osmux.h index ea849c8..685be9c 100644 --- a/include/osmocom/mgcp/osmux.h +++ b/include/osmocom/mgcp/osmux.h @@ -24,10 +24,10 @@ int osmux_used_cid(void); enum osmux_state { - OSMUX_STATE_DISABLED = 0, - OSMUX_STATE_NEGOTIATING, - OSMUX_STATE_ACTIVATING, - OSMUX_STATE_ENABLED, + OSMUX_STATE_DISABLED = 0, /* Osmux not being currently used by endp */ + OSMUX_STATE_NEGOTIATING, /* Osmux was locally requested in MGCP CRCX */ + OSMUX_STATE_ACTIVATING, /* Osmux was accepted in MGCP CRCX ACK. It can now be enabled by \ref osmux_enable_endpoint. */ + OSMUX_STATE_ENABLED, /* Osmux was initialized by \ref osmux_enable_endpoint and can process frames */ }; enum osmux_usage { @@ -35,4 +35,3 @@ OSMUX_USAGE_ON = 1, OSMUX_USAGE_ONLY = 2, }; - -- To view, visit https://gerrit.osmocom.org/11382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I28978fa505d259f144457f29af4ba615aeaac74c Gerrit-Change-Number: 11382 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 16 20:45:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 16 Oct 2018 20:45:17 +0000 Subject: Change in osmo-mgw[master]: osmux: Avoid processing further frames if conn not found In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11383 ) Change subject: osmux: Avoid processing further frames if conn not found ...................................................................... osmux: Avoid processing further frames if conn not found Other frames can come from known connections, so let's keep processing each of them. Change-Id: I09190140ba917dfada4b0952230b68e0f5f6d43d --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index ca446ff..a2c138d 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -394,7 +394,7 @@ /* FIXME: Get rid of CONN_ID_XXX! */ conn_bts = mgcp_conn_get_rtp(endp, CONN_ID_BTS); if (!conn_bts) - goto out; + continue; if (!endp) { LOGP(DLMGCP, LOGL_ERROR, @@ -478,7 +478,7 @@ /* FIXME: Get rid of CONN_ID_XXX! */ conn_net = mgcp_conn_get_rtp(endp, CONN_ID_NET); if (!conn_net) - goto out; + continue; if (!endp) { LOGP(DLMGCP, LOGL_ERROR, -- To view, visit https://gerrit.osmocom.org/11383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I09190140ba917dfada4b0952230b68e0f5f6d43d Gerrit-Change-Number: 11383 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Oct 17 00:54:38 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 17 Oct 2018 00:54:38 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-iuh_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2245?= Message-ID: <71302988.93.1539737678104.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 676.31 KB...] CC PTMSIRAI.o CC RAB-ID.o CC RABList.o CC RABListItem.o CC RAC.o CC RAI.o CC Registration-Cause.o CC RNC-ID.o CC SAC.o CC S-RNTIPrefix.o CC TMSILAI.o CC TMSIDS41.o CC TransportInfo.o CC TransportLayerAddress.o CC Tunnel-Information.o CC TypeOfError.o CC UDP-Port-Number.o CC UE-Capabilities.o CC UTRANCellID.o CC UE-Identity.o CC Update-cause.o CC URAIdentityList.o CC URAIdentity.o CC U-RNTI.o CC UnknownU-RNTIIndication.o CC HNBAP-PDU.o CC InitiatingMessage.o CC SuccessfulOutcome.o CC UnsuccessfulOutcome.o CC HNBRegisterRequest.o CC HNBRegisterAccept.o CC HNBRegisterReject.o CC UERegisterRequest.o CC UERegisterReject.o CC UERegisterAccept.o CC UEDe-Register.o CC HNBDe-Register.o CC CSGMembershipUpdate.o CC TNLUpdateRequest.o CC ErrorIndication.o CC TNLUpdateResponse.o CC TNLUpdateFailure.o CC HNBConfigTransferRequest.o CC HNBConfigTransferResponse.o CC RelocationComplete.o CC U-RNTIQueryRequest.o CC U-RNTIQueryResponse.o CC PrivateMessage.o CC IE.o AR libosmo-asn1-hnbap.a ar: `u' modifier ignored since `D' is the default (see `U') make[4]: Leaving directory ' Making all in rua make[4]: Entering directory ' CC RUA_Criticality.o CC RUA_Presence.o CC RUA_ProcedureCode.o CC RUA_PrivateIE-ID.o CC RUA_TriggeringMessage.o CC RUA_IE-Extensions.o CC RUA_CN-DomainIndicator.o CC RUA_ProtocolIE-ID.o CC RUA_CSGMembershipStatus.o CC RUA_Establishment-Cause.o CC RUA_Context-ID.o CC RUA_IntraDomainNasNodeSelector.o CC RUA_Gsm-map-IDNNS.o CC RUA_Ansi-41-IDNNS.o CC RUA_RANAP-Message.o CC RUA_RoutingParameter.o CC RUA_Cause.o CC RUA_CauseRadioNetwork.o CC RUA_CauseTransport.o CC RUA_CauseProtocol.o CC RUA_CauseMisc.o CC RUA_CriticalityDiagnostics.o CC RUA_CriticalityDiagnostics-IE-List.o CC RUA_TypeOfError.o CC RUA_RUA-PDU.o In file included from :8:0, from ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:14, from ../../include/osmocom/rua/RUA_CriticalityDiagnostics.h:17, from RUA_CriticalityDiagnostics.c:7: ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:23: warning: ?struct Member? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct Member { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct Member { ^~~~~~~~~~~~~ In file included from :8:0, from ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:14, from RUA_CriticalityDiagnostics-IE-List.c:7: ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:23: warning: ?struct Member? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct Member { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct Member { ^~~~~~~~~~~~~ CC RUA_InitiatingMessage.o CC RUA_UnsuccessfulOutcome.o CC RUA_SuccessfulOutcome.o CC RUA_Connect.o CC RUA_DirectTransfer.o CC RUA_Disconnect.o CC RUA_ConnectionlessTransfer.o CC RUA_IE.o CC RUA_ErrorIndication.o CC RUA_PrivateMessage.o AR libosmo-asn1-rua.a ar: `u' modifier ignored since `D' is the default (see `U') make[4]: Leaving directory ' Making all in ranap make[4]: Entering directory ' CC RANAP_Criticality.lo CC RANAP_Presence.lo CC RANAP_ProcedureCode.lo CC RANAP_PrivateIE-ID.lo CC RANAP_ProtocolIE-ID.lo CC RANAP_TriggeringMessage.lo CC RANAP_ProtocolExtensionID.lo CC RANAP_IE-Extensions.lo CC RANAP_AccuracyFulfilmentIndicator.lo CC RANAP_AllocationOrRetentionPriority.lo CC RANAP_Alt-RAB-Parameters.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.lo CC RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateInf.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateType.lo CC RANAP_Alt-RAB-Parameter-MaxBitrates.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateList.lo CC RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.lo CC RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.lo CC RANAP_AlternativeRABConfigurationRequest.lo CC RANAP_APN.lo CC RANAP_AreaIdentity.lo CC RANAP_Ass-RAB-Parameters.lo CC RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.lo CC RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.lo CC RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.lo CC RANAP_Ass-RAB-Parameter-MaxBitrateList.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_IE-Extensions.h:15, from ../../include/osmocom/ranap/RANAP_SAI.h:17, from ../../include/osmocom/ranap/RANAP_AreaIdentity.h:14, from RANAP_AreaIdentity.c:7: ../../include/osmocom/ranap/RANAP_GA-Polygon.h:26:23: warning: ?struct Member? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct Member { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_GA-Polygon.h:26:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct Member { ^~~~~~~~~~~~~ CC RANAP_AuthorisedPLMNs.lo CC RANAP_AuthorisedSNAs.lo CC RANAP_BindingID.lo CC RANAP_BroadcastAssistanceDataDecipheringKeys.lo CC RANAP_Cause.lo CC RANAP_CauseMisc.lo CC RANAP_CauseNAS.lo CC RANAP_CauseProtocol.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:14, from RANAP_AuthorisedPLMNs.c:7: ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:27:23: warning: ?struct MemberC? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberC { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberC { ^~~~~~~~~~~~~ CC RANAP_CauseRadioNetwork.lo CC RANAP_CauseRadioNetworkExtension.lo CC RANAP_CauseNon-Standard.lo CC RANAP_CauseTransmissionNetwork.lo CC RANAP_Cell-Access-Mode.lo CC RANAP_CellBased.lo CC RANAP_CellIdList.lo CC RANAP_Cell-Id.lo CC RANAP_Cell-Capacity-Class-Value.lo CC RANAP_CellLoadInformation.lo CC RANAP_CellLoadInformationGroup.lo CC RANAP_CellType.lo CC RANAP_ClientType.lo CC RANAP_CriticalityDiagnostics.lo CC RANAP_CriticalityDiagnostics-IE-List.lo CC RANAP_MessageStructure.lo /bin/bash: line 1: 1763 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DPACKAGE_NAME=\"osmo-iuh\" -DPACKAGE_TARNAME=\"osmo-iuh\" -DPACKAGE_VERSION=\"0.3.0.9-a770\" -DPACKAGE_STRING=\"osmo-iuh\ 0.3.0.9-a770\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-iuh\" -DVERSION=\"0.3.0.9-a770\" -DSTDC_HEADERS=1 -I. -fsanitize=address -fsanitize=undefined -Wall -I../../include -I -I -I -g -O2 -fsanitize=address -fsanitize=undefined -Wall -MT RANAP_MessageStructure.lo -MD -MP -MF .deps/RANAP_MessageStructure.Tpo -c -o RANAP_MessageStructure.lo RANAP_MessageStructure.c Makefile:2506: recipe for target 'RANAP_MessageStructure.lo' failed make[4]: *** [RANAP_MessageStructure.lo] Error 139 make[4]: *** Waiting for unfinished jobs.... In file included from :8:0, from ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:14, from ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics.h:17, from RANAP_CriticalityDiagnostics.c:7: ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:23: warning: ?struct MemberG? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberG { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberG { ^~~~~~~~~~~~~ In file included from :8:0, from ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:14, from RANAP_CriticalityDiagnostics-IE-List.c:7: ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:23: warning: ?struct MemberG? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberG { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberG { ^~~~~~~~~~~~~ make[4]: Leaving directory ' Makefile:642: recipe for target 'all-recursive' failed make[3]: *** [all-recursive] Error 1 make[3]: Leaving directory ' Makefile:454: recipe for target 'all' failed make[2]: *** [all] Error 2 make[2]: Leaving directory ' Makefile:458: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:382: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Oct 17 06:21:18 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 17 Oct 2018 06:21:18 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-iuh_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2246?= In-Reply-To: <71302988.93.1539737678104.JavaMail.jenkins@jenkins.osmocom.org> References: <71302988.93.1539737678104.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1870847092.96.1539757278059.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Oct 17 07:15:45 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 17 Oct 2018 07:15:45 +0000 Subject: Change in libosmocore[master]: gsm0808: allow decoding of zero length speech codec lists. In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/11373 ) Change subject: gsm0808: allow decoding of zero length speech codec lists. ...................................................................... gsm0808: allow decoding of zero length speech codec lists. 3GPP_TS_48.008, 3.2.2.103 Speech Codec List states the following: "The length indicator (octet 2) is a binary number indicating the absolute length of the contents after the length indicator. The length depends on the number and type of Speech Codec Elements to be included. The minimum length of one Speech Codec Element is 1 octet and the maximum length is 3 octets. The maximum number of Speech Codec Elements within the Speech Codec List is not defined." This clearly refers only to the length of a single speech codec element but not on the overall list. So speech codec lists with length 0 are indeed permitted by the spec. - Remove the assertion that checks on zero length speech codec lists. Change-Id: I1eb1f4466b98bdd26d765b0e4cc690b5e89e9dd6 Related: OS#3657 --- M src/gsm/gsm0808_utils.c M tests/gsm0808/gsm0808_test.c 2 files changed, 23 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 886f546..2348105 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -349,9 +349,6 @@ OSMO_ASSERT(msg); OSMO_ASSERT(scl); - /* Empty list */ - OSMO_ASSERT(scl->len >= 1); - msgb_put_u8(msg, GSM0808_IE_SPEECH_CODEC_LIST); tlv_len = msgb_put(msg, 1); old_tail = msg->tail; @@ -384,8 +381,6 @@ OSMO_ASSERT(scl); if (!elem) return -EINVAL; - if (len == 0) - return -EINVAL; memset(scl, 0, sizeof(*scl)); @@ -404,11 +399,6 @@ scl->len = decoded; - /* Empty list */ - if (decoded < 1) { - return -EINVAL; - } - return (int)(elem - old_elem); } diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 8cf1cf4..0b2794f 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -695,6 +695,28 @@ msgb_free(msg); } +static void test_gsm0808_enc_dec_empty_speech_codec_list() +{ + struct gsm0808_speech_codec_list enc_scl = { + .len = 0, + }; + struct gsm0808_speech_codec_list dec_scl = {}; + struct msgb *msg; + uint8_t rc_enc; + int rc_dec; + + msg = msgb_alloc(1024, "output buffer"); + rc_enc = gsm0808_enc_speech_codec_list(msg, &enc_scl); + OSMO_ASSERT(rc_enc == 2); + + rc_dec = gsm0808_dec_speech_codec_list(&dec_scl, msg->data + 2, msg->len - 2); + OSMO_ASSERT(rc_dec == 0); + + OSMO_ASSERT(memcmp(&enc_scl, &dec_scl, sizeof(enc_scl)) == 0); + + msgb_free(msg); +} + static void test_gsm0808_enc_dec_channel_type() { struct gsm0808_channel_type enc_ct = { @@ -1725,6 +1747,7 @@ test_gsm0808_enc_dec_speech_codec_ext_with_cfg(); test_gsm0808_enc_dec_speech_codec_with_cfg(); test_gsm0808_enc_dec_speech_codec_list(); + test_gsm0808_enc_dec_empty_speech_codec_list(); test_gsm0808_enc_dec_channel_type(); test_gsm0808_enc_dec_encrypt_info(); -- To view, visit https://gerrit.osmocom.org/11373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1eb1f4466b98bdd26d765b0e4cc690b5e89e9dd6 Gerrit-Change-Number: 11373 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 07:43:20 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 17 Oct 2018 07:43:20 +0000 Subject: Change in osmo-bsc[master]: bssap: check for zero length speech codec lists. In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/11386 ) Change subject: bssap: check for zero length speech codec lists. ...................................................................... Abandoned The check is redundant -- To view, visit https://gerrit.osmocom.org/11386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I2aca205dfdf5c7de7cb48ea2b57eb54e678e12fc Gerrit-Change-Number: 11386 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 07:50:24 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 17 Oct 2018 07:50:24 +0000 Subject: Change in osmo-bsc[master]: gsm_08_08: do not include zero length speech codec list. In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11388 ) Change subject: gsm_08_08: do not include zero length speech codec list. ...................................................................... Patch Set 1: > I am not sure we want to merge this patch. Why do you think having > no speech codec elements in list means "user plane interface is not > supported"? It can still support it but be misconfigured or on > purpose configured to have no codecs available? (From my understanding the ip based user plane interface refers to RTP voice.) I think its a matter of interpretation. The spec says that the element shall be included if supported. So in revers this means if its missing, the ip based user plane is not supported. This is surely debatable. From my personal taste I think a speech codec list with zero elements makes it easier to spot that something is wrong. -- To view, visit https://gerrit.osmocom.org/11388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I07339322a71376e986a2d75b7bc1f552eafd02b5 Gerrit-Change-Number: 11388 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 17 Oct 2018 07:50:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 07:59:17 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 17 Oct 2018 07:59:17 +0000 Subject: Change in osmo-bsc[master]: gsm_08_08: allow zero length speech codec lists in compl l3 info. In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/11387 ) Change subject: gsm_08_08: allow zero length speech codec lists in compl l3 info. ...................................................................... gsm_08_08: allow zero length speech codec lists in compl l3 info. The COMPLETE LAYER 3 INFORMATION message contains a an Codec List (BSS Supported). When generating the compl l3 info msg, we check if the speech codec list that we have generated before has at least one element. If it has 0 elements we abort immediately. However, speech codec lists with 0 elements are permitted by the spec, so we should remove the checks as there are corner cases where voice support is intentionally unavailable. - Remove check for zero length speech codec lists. Change-Id: Id7332e5273ff0efb85043dd1e1bb804cfe2db944 Depends: libosmocore I1eb1f4466b98bdd26d765b0e4cc690b5e89e9dd6 Related: OS#3657 --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 1 insertion(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 6e1e502..807eb8c 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -495,12 +495,7 @@ if (gscon_is_aoip(conn)) { gen_bss_supported_codec_list(&scl, msc, conn_get_bts(conn)); - if (scl.len > 0) - resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), &scl); - else { - LOGP(DMSC, LOGL_ERROR, "Failed to create layer3 message due to empty speech codec list.\n"); - return false; - } + resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), &scl); } else resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), NULL); -- To view, visit https://gerrit.osmocom.org/11387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id7332e5273ff0efb85043dd1e1bb804cfe2db944 Gerrit-Change-Number: 11387 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 08:21:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 17 Oct 2018 08:21:39 +0000 Subject: Change in docker-playground[master]: rename m3ua-test, sua-test to nplab-*-test In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#4). ( https://gerrit.osmocom.org/11368 ) Change subject: rename m3ua-test, sua-test to nplab-*-test ...................................................................... rename m3ua-test, sua-test to nplab-*-test Allows writing a generic Jenkins Job Builder config. Related: OS#3268 Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de --- R nplab-m3ua-test/.release R nplab-m3ua-test/Dockerfile R nplab-m3ua-test/Makefile R nplab-m3ua-test/all-sgp-tests.txt R nplab-m3ua-test/dotguile R nplab-m3ua-test/jenkins.sh R nplab-m3ua-test/m3ua-param-testtool.scm R nplab-m3ua-test/osmo-stp.cfg R nplab-sua-test/.release R nplab-sua-test/Dockerfile R nplab-sua-test/Makefile R nplab-sua-test/dotguile R nplab-sua-test/jenkins.sh R nplab-sua-test/osmo-stp.cfg R nplab-sua-test/some-sua-sgp-tests.txt R nplab-sua-test/sua-param-testtool-sgp.scm 16 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/68/11368/4 -- To view, visit https://gerrit.osmocom.org/11368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de Gerrit-Change-Number: 11368 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 08:22:57 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 17 Oct 2018 08:22:57 +0000 Subject: Change in docker-playground[master]: rename m3ua-test, sua-test to nplab-*-test In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11368 ) Change subject: rename m3ua-test, sua-test to nplab-*-test ...................................................................... Patch Set 4: > you can simply rename/move them. Done. NOTE: we need to modify the existing jobs to use the renamed folders after this is merged. -- To view, visit https://gerrit.osmocom.org/11368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de Gerrit-Change-Number: 11368 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 17 Oct 2018 08:22:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 08:58:06 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 17 Oct 2018 08:58:06 +0000 Subject: Change in osmo-msc[master]: gsm_04_08_cc: Add global guard timer for MNCC In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11307 to look at the new patch set (#2). Change subject: gsm_04_08_cc: Add global guard timer for MNCC ...................................................................... gsm_04_08_cc: Add global guard timer for MNCC The external MNCC handler may hang indefinitely in cases where the remote end of the MNCC ceases to work properly. Add a global guard timer to make sure the call reaches ACTIVE state. Change-Id: I7375d1e17cd746aac4eadfe1e587e82cf1630d3d Related: OS#3599 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M tests/msc_vlr/msc_vlr_test_call.err 6 files changed, 95 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/07/11307/2 -- To view, visit https://gerrit.osmocom.org/11307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7375d1e17cd746aac4eadfe1e587e82cf1630d3d Gerrit-Change-Number: 11307 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 09:07:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 17 Oct 2018 09:07:58 +0000 Subject: Change in osmo-trx[master]: sigProcLib: also detect both TS1 and TS2 RACH synch. sequences Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11390 Change subject: sigProcLib: also detect both TS1 and TS2 RACH synch. sequences ...................................................................... sigProcLib: also detect both TS1 and TS2 RACH synch. sequences According to 3GPP TS 05.02, section 5.2.7, there are three synch. sequences for Access Bursts: - TS0: GSM, GMSK (default), - TS1: EGPRS, 8-PSK, - TS2: EGPRS, GMSK. Until now, we used to detect TS0 only, let's also detect both TS1 and TS2, which are used in extended (11-bit) RACH. Change-Id: I838c21db29c54f1924dd478c2b34b46b70aab2cd Related: OS#3054 --- M GSM/GSMCommon.cpp M GSM/GSMCommon.h M Transceiver52M/radioInterface.cpp M Transceiver52M/sigProcLib.cpp 4 files changed, 38 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/90/11390/1 diff --git a/GSM/GSMCommon.cpp b/GSM/GSMCommon.cpp index 8aba3be..711ca70 100644 --- a/GSM/GSMCommon.cpp +++ b/GSM/GSMCommon.cpp @@ -54,7 +54,10 @@ const BitVector GSM::gDummyBurst("0001111101101110110000010100100111000001001000100000001111100011100010111000101110001010111010010100011001100111001111010011111000100101111101010000"); -const BitVector GSM::gRACHSynchSequence("01001011011111111001100110101010001111000"); +/* 3GPP TS 05.02, section 5.2.7 "Access burst (AB)", synch. sequence bits */ +const BitVector GSM::gRACHSynchSequenceTS0("01001011011111111001100110101010001111000"); /* GSM, GMSK (default) */ +const BitVector GSM::gRACHSynchSequenceTS1("01010100111110001000011000101111001001101"); /* EGPRS, 8-PSK */ +const BitVector GSM::gRACHSynchSequenceTS2("11101111001001110101011000001101101110111"); /* EGPRS, GMSK */ // |-head-||---------midamble----------------------||--------------data----------------||t| const BitVector GSM::gRACHBurst("0011101001001011011111111001100110101010001111000110111101111110000111001001010110011000"); diff --git a/GSM/GSMCommon.h b/GSM/GSMCommon.h index 8b8d5e8..f703c30 100644 --- a/GSM/GSMCommon.h +++ b/GSM/GSMCommon.h @@ -52,7 +52,9 @@ extern const BitVector gDummyBurst; /** Random access burst synch. sequence */ -extern const BitVector gRACHSynchSequence; +extern const BitVector gRACHSynchSequenceTS0; +extern const BitVector gRACHSynchSequenceTS1; +extern const BitVector gRACHSynchSequenceTS2; /** Random access burst synch. sequence, GSM 05.02 5.2.7 */ extern const BitVector gRACHBurst; diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index 0f949d7..6245cfc 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -245,7 +245,7 @@ * Pre-allocate head room for the largest correlation size * so we can later avoid a re-allocation and copy * */ - size_t head = GSM::gRACHSynchSequence.size(); + size_t head = GSM::gRACHSynchSequenceTS0.size(); /* * Form receive bursts and pass up to transceiver. Use repeating diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp index 692fbe0..e13282f 100644 --- a/Transceiver52M/sigProcLib.cpp +++ b/Transceiver52M/sigProcLib.cpp @@ -132,7 +132,7 @@ static CorrelationSequence *gMidambles[] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; static CorrelationSequence *gEdgeMidambles[] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; -static CorrelationSequence *gRACHSequence = NULL; +static CorrelationSequence *gRACHSequences[] = {NULL,NULL,NULL}; static PulseSequence *GSMPulse1 = NULL; static PulseSequence *GSMPulse4 = NULL; @@ -150,11 +150,15 @@ delayFilters[i] = NULL; } + for (int i = 0; i < 3; i++) { + delete gRACHSequences[i]; + gRACHSequences[i] = NULL; + } + delete GMSKRotation1; delete GMSKReverseRotation1; delete GMSKRotation4; delete GMSKReverseRotation4; - delete gRACHSequence; delete GSMPulse1; delete GSMPulse4; delete dnsampler; @@ -163,7 +167,6 @@ GMSKRotation4 = NULL; GMSKReverseRotation4 = NULL; GMSKReverseRotation1 = NULL; - gRACHSequence = NULL; GSMPulse1 = NULL; GSMPulse4 = NULL; } @@ -1332,7 +1335,7 @@ return seq; } -static bool generateRACHSequence(int sps) +static bool generateRACHSequence(CorrelationSequence **seq, const BitVector &bv, int sps) { bool status = true; float toa; @@ -1340,13 +1343,14 @@ signalVector *autocorr = NULL; signalVector *seq0 = NULL, *seq1 = NULL, *_seq1 = NULL; - delete gRACHSequence; + if (*seq != NULL) + delete *seq; - seq0 = modulateBurst(gRACHSynchSequence, 0, sps, false); + seq0 = modulateBurst(bv, 0, sps, false); if (!seq0) return false; - seq1 = modulateBurst(gRACHSynchSequence.segment(0, 40), 0, sps, true); + seq1 = modulateBurst(bv.segment(0, 40), 0, sps, true); if (!seq1) { status = false; goto release; @@ -1366,19 +1370,19 @@ goto release; } - gRACHSequence = new CorrelationSequence; - gRACHSequence->sequence = _seq1; - gRACHSequence->buffer = data; - gRACHSequence->gain = peakDetect(*autocorr, &toa, NULL); + *seq = new CorrelationSequence; + (*seq)->sequence = _seq1; + (*seq)->buffer = data; + (*seq)->gain = peakDetect(*autocorr, &toa, NULL); /* For 1 sps only * (Half of correlation length - 1) + midpoint of pulse shaping filer * 20.5 = (40 / 2 - 1) + 1.5 */ if (sps == 1) - gRACHSequence->toa = toa - 20.5; + (*seq)->toa = toa - 20.5; else - gRACHSequence->toa = 0.0; + (*seq)->toa = 0.0; release: delete autocorr; @@ -1388,7 +1392,7 @@ if (!status) { delete _seq1; free(data); - gRACHSequence = NULL; + *seq = NULL; } return status; @@ -1606,10 +1610,15 @@ target = 8 + 40; head = 8; tail = 8 + max_toa; - sync = gRACHSequence; - rc = detectGeneralBurst(burst, threshold, sps, amplitude, toa, - target, head, tail, sync); + for (int i = 0; i < 3; i++) { + sync = gRACHSequences[i]; + + rc = detectGeneralBurst(burst, threshold, sps, amplitude, toa, + target, head, tail, sync); + if (rc > 0) + break; + } return rc; } @@ -1858,7 +1867,10 @@ GSMPulse1 = generateGSMPulse(1); GSMPulse4 = generateGSMPulse(4); - generateRACHSequence(1); + generateRACHSequence(&gRACHSequences[0], gRACHSynchSequenceTS0, 1); + generateRACHSequence(&gRACHSequences[1], gRACHSynchSequenceTS1, 1); + generateRACHSequence(&gRACHSequences[2], gRACHSynchSequenceTS2, 1); + for (int tsc = 0; tsc < 8; tsc++) { generateMidamble(1, tsc); gEdgeMidambles[tsc] = generateEdgeMidamble(tsc); -- To view, visit https://gerrit.osmocom.org/11390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I838c21db29c54f1924dd478c2b34b46b70aab2cd Gerrit-Change-Number: 11390 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 10:00:15 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 17 Oct 2018 10:00:15 +0000 Subject: Change in osmo-msc[master]: gsm_04_08_cc: Add global guard timer for MNCC In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11307 to look at the new patch set (#3). Change subject: gsm_04_08_cc: Add global guard timer for MNCC ...................................................................... gsm_04_08_cc: Add global guard timer for MNCC The external MNCC handler may hang indefinitely in cases where the remote end of the MNCC ceases to work properly. Add a global guard timer to make sure the call reaches ACTIVE state. Change-Id: I7375d1e17cd746aac4eadfe1e587e82cf1630d3d Related: OS#3599 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M tests/msc_vlr/msc_vlr_test_call.err 6 files changed, 96 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/07/11307/3 -- To view, visit https://gerrit.osmocom.org/11307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7375d1e17cd746aac4eadfe1e587e82cf1630d3d Gerrit-Change-Number: 11307 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 10:07:06 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 17 Oct 2018 10:07:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: Extend timeout in TC_mo_setup_and_nothing Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11391 Change subject: MSC_Tests: Extend timeout in TC_mo_setup_and_nothing ...................................................................... MSC_Tests: Extend timeout in TC_mo_setup_and_nothing The mncc guard timer in osmo-msc expires after 180 sec. This tests terminates early and fails. Lets expand the timeout in order to give the test a chance to pass. Change-Id: I9f954a8807c0f0513422693ac24c647da0bfafd1 Related: OS#3599 --- M msc/MSC_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/11391/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 93d7c77..c0cd9d3 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1206,7 +1206,7 @@ /* Test MO Call SETUP with no response from MNCC */ private function f_tc_mo_setup_and_nothing(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { - f_init_handler(pars); + f_init_handler(pars, 190.0); var CallParameters cpars := valueof(t_CallParams('12345'H, 0)); @@ -1218,7 +1218,7 @@ BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_SETUP(cpars.transaction_id, cpars.called_party))); - f_expect_clear(30.0); + f_expect_clear(185.0); } testcase TC_mo_setup_and_nothing() runs on MTC_CT { var BSC_ConnHdlr vc_conn; -- To view, visit https://gerrit.osmocom.org/11391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9f954a8807c0f0513422693ac24c647da0bfafd1 Gerrit-Change-Number: 11391 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 13:17:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 17 Oct 2018 13:17:43 +0000 Subject: Change in osmo-dev[master]: support osmo-sip-connector with kamailio In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11144 ) Change subject: support osmo-sip-connector with kamailio ...................................................................... Patch Set 7: So far, all of the osmo-dev/net happens within that subdir, and I want to keep it that way if possible. I would also have commented similarly on the socket path, but that's a user config item. Maybe also make that rundir a user config item, then I can't really complain anymore. But even nicer would be to just place both socket and rundir in the same dir where the run.sh sits by default. No need to configure. If it's too much effort we can merge this now, but I guess it's simple enough? -- To view, visit https://gerrit.osmocom.org/11144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 Gerrit-Change-Number: 11144 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: daniel Gerrit-Comment-Date: Wed, 17 Oct 2018 13:17:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 13:20:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 17 Oct 2018 13:20:20 +0000 Subject: Change in osmo-ci[master]: jobs: testsuite.yml for all ttcn3/nplab jobs In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11370 ) Change subject: jobs: testsuite.yml for all ttcn3/nplab jobs ...................................................................... Patch Set 1: I don't like the file name "testsuite.yml" -- we have so many different test suites, better to indicate which one this is about in the name. What's "nplab"? -- To view, visit https://gerrit.osmocom.org/11370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie433925ee81a61c5788b4a6f2bc5b89c2689d251 Gerrit-Change-Number: 11370 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Wed, 17 Oct 2018 13:20:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 13:24:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 17 Oct 2018 13:24:33 +0000 Subject: Change in osmo-ci[master]: jobs: testsuite.yml for all ttcn3/nplab jobs In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11370 ) Change subject: jobs: testsuite.yml for all ttcn3/nplab jobs ...................................................................... Patch Set 1: Code-Review+1 (3 comments) https://gerrit.osmocom.org/#/c/11370/1/jobs/testsuite.yml File jobs/testsuite.yml: https://gerrit.osmocom.org/#/c/11370/1/jobs/testsuite.yml at 7 PS1, Line 7: - "{testsuite-name}{job-suffix}" I still don't like "suffix", too general. It is the package feed name, so please call it "feed" or somesuch. https://gerrit.osmocom.org/#/c/11370/1/jobs/testsuite.yml at 26 PS1, Line 26: # nightly (overwrites the existing, manually created jobs!) ideally this would migrate the manual jobs to being created by this file instead, which we want anyway. https://gerrit.osmocom.org/#/c/11370/1/jobs/testsuite.yml at 55 PS1, Line 55: IMAGE_SUFFIX="{image-suffix}" ./jenkins.sh same here: "IMAGE_SUFFIX" should be "PACKAGE_FEED" or something -- To view, visit https://gerrit.osmocom.org/11370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie433925ee81a61c5788b4a6f2bc5b89c2689d251 Gerrit-Change-Number: 11370 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 17 Oct 2018 13:24:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 13:29:16 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 17 Oct 2018 13:29:16 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add docker_images_require() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11365 ) Change subject: jenkins-common.sh: add docker_images_require() ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11365/1/jenkins-common.sh File jenkins-common.sh: https://gerrit.osmocom.org/#/c/11365/1/jenkins-common.sh at 5 PS1, Line 5: docker_images_require() { > In this commit, yes. But the next commit it will be used from all jenkins.sh files. [?] On the one hand we want atomic commits, i.e. as small as makes sense. But it doesn't make sense to add dead code that no-one uses. Sometimes it is desirable to separate patches like this, but then the commit log should explicitly state which other change-id it prepares for. For new functions, understanding the semantics usually requires to see how the callers invoke the new function. So yea, this would qualify for squashing with the patch that adds a caller. -- To view, visit https://gerrit.osmocom.org/11365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0afdf3400282634fca9b31d57eaeedd6b5c28aa1 Gerrit-Change-Number: 11365 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 17 Oct 2018 13:29:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 13:32:13 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 17 Oct 2018 13:32:13 +0000 Subject: Change in docker-playground[master]: jenkins.sh: IMAGE_SUFFIX, docker_images_require() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11366 ) Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require() ...................................................................... Patch Set 3: Code-Review+1 hmm, 'master' isn't a feed really, is it. I don't know, I would prefer some meaningful name instead of "suffix" ... but if Harald likes it then nevermind... -- To view, visit https://gerrit.osmocom.org/11366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e Gerrit-Change-Number: 11366 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 17 Oct 2018 13:32:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 13:33:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 17 Oct 2018 13:33:53 +0000 Subject: Change in osmo-ci[master]: jobs: testsuite.yml for all ttcn3/nplab jobs In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11370 ) Change subject: jobs: testsuite.yml for all ttcn3/nplab jobs ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11370/1/jobs/testsuite.yml File jobs/testsuite.yml: https://gerrit.osmocom.org/#/c/11370/1/jobs/testsuite.yml at 7 PS1, Line 7: - "{testsuite-name}{job-suffix}" > I still don't like "suffix", too general. [?] in that other patch I realize that "master" isn't a feed name, and maybe I should just let this one go. -- To view, visit https://gerrit.osmocom.org/11370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie433925ee81a61c5788b4a6f2bc5b89c2689d251 Gerrit-Change-Number: 11370 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 17 Oct 2018 13:33:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 13:38:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 17 Oct 2018 13:38:37 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add docker_images_require() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11365 ) Change subject: jenkins-common.sh: add docker_images_require() ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11365/2/jenkins-common.sh File jenkins-common.sh: https://gerrit.osmocom.org/#/c/11365/2/jenkins-common.sh at 8 PS2, Line 8: if [ -z "$NO_DOCKER_IMAGE_BUILD" ]; then btw, in general, it is better to avoid double negation / positive meaning negative in settings like these. i.e. do_this = [true|false] is easier to grok than dont_do_this = [true|false] Then a default of 1: DOCKER_IMAGE_BUILD="${DOCKER_IMAGE_BUILD:-1}" again not that important, but keep in mind for next time maybe. -- To view, visit https://gerrit.osmocom.org/11365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0afdf3400282634fca9b31d57eaeedd6b5c28aa1 Gerrit-Change-Number: 11365 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 17 Oct 2018 13:38:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 13:42:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 17 Oct 2018 13:42:42 +0000 Subject: Change in docker-playground[master]: rename m3ua-test, sua-test to nplab-*-test In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11368 ) Change subject: rename m3ua-test, sua-test to nplab-*-test ...................................................................... Patch Set 4: > NOTE: we need to modify the existing jobs to use the renamed > folders after this is merged. (If that is done by a yml file patch you have submitted, then indicate its change-id in the commit log) -- To view, visit https://gerrit.osmocom.org/11368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de Gerrit-Change-Number: 11368 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Wed, 17 Oct 2018 13:42:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 13:52:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 17 Oct 2018 13:52:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: Extend timeout in TC_mo_setup_and_nothing In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11391 ) Change subject: MSC_Tests: Extend timeout in TC_mo_setup_and_nothing ...................................................................... Patch Set 1: would it be an option to configure the MSC's timer to 20 seconds instead? After all, each test execution would idle around for three full minutes. If we don't have a configurable timer there, I guess we should add it to the MSC? -- To view, visit https://gerrit.osmocom.org/11391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f954a8807c0f0513422693ac24c647da0bfafd1 Gerrit-Change-Number: 11391 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Wed, 17 Oct 2018 13:52:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 13:52:54 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 17 Oct 2018 13:52:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: Extend timeout in TC_mo_setup_and_nothing In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11391 ) Change subject: MSC_Tests: Extend timeout in TC_mo_setup_and_nothing ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f954a8807c0f0513422693ac24c647da0bfafd1 Gerrit-Change-Number: 11391 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 17 Oct 2018 13:52:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 14:03:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 17 Oct 2018 14:03:34 +0000 Subject: Change in osmo-msc[master]: gsm_04_08_cc: Add global guard timer for MNCC In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11307 ) Change subject: gsm_04_08_cc: Add global guard timer for MNCC ...................................................................... Patch Set 3: (1 comment) here I see the timer that would shorten that ttcn3 test idle time https://gerrit.osmocom.org/#/c/11307/3/tests/msc_vlr/msc_vlr_test_call.err File tests/msc_vlr/msc_vlr_test_call.err: https://gerrit.osmocom.org/#/c/11307/3/tests/msc_vlr/msc_vlr_test_call.err at 280 PS3, Line 280: DCC Subscriber 42342: starting guard timer with 180 seconds (just making sure you're aware: the most convenient way to update these log files is to "cd osmo-msc/tests/msc_vlr/; make update_exp" -- you can pipe log output too, just this is a lot quicker to type.) -- To view, visit https://gerrit.osmocom.org/11307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7375d1e17cd746aac4eadfe1e587e82cf1630d3d Gerrit-Change-Number: 11307 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 17 Oct 2018 14:03:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 14:10:18 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 17 Oct 2018 14:10:18 +0000 Subject: Change in osmo-msc[master]: gsm_04_08_cc: Add global guard timer for MNCC In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11307 ) Change subject: gsm_04_08_cc: Add global guard timer for MNCC ...................................................................... Patch Set 3: Code-Review+1 (3 comments) https://gerrit.osmocom.org/#/c/11307/3/src/libmsc/gsm_04_08_cc.c File src/libmsc/gsm_04_08_cc.c: https://gerrit.osmocom.org/#/c/11307/3/src/libmsc/gsm_04_08_cc.c at 80 PS3, Line 80: vlr_subscr_msisdn_or_name(trans->vsub)); (best use same formatting as other logging in this file, e.g. line 2025) https://gerrit.osmocom.org/#/c/11307/3/src/libmsc/gsm_04_08_cc.c at 89 PS3, Line 89: vlr_subscr_msisdn_or_name(trans->vsub)); re https://gerrit.osmocom.org/#/c/11307/3/src/libmsc/osmo_msc.c File src/libmsc/osmo_msc.c: https://gerrit.osmocom.org/#/c/11307/3/src/libmsc/osmo_msc.c at 57 PS3, Line 57: /* If the mncc interface remains silent for more then 3 minutes, ("than" .. "during setup" ... or maybe just drop the comment anyway, it's obvious enough) -- To view, visit https://gerrit.osmocom.org/11307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7375d1e17cd746aac4eadfe1e587e82cf1630d3d Gerrit-Change-Number: 11307 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 17 Oct 2018 14:10:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 14:17:06 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 17 Oct 2018 14:17:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: add test to try two LU from different BSCs In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9204 ) Change subject: MSC_Tests: add test to try two LU from different BSCs ...................................................................... Patch Set 5: Code-Review+1 (3 comments) https://gerrit.osmocom.org/#/c/9204/5/library/BSSMAP_Emulation.ttcn File library/BSSMAP_Emulation.ttcn: https://gerrit.osmocom.org/#/c/9204/5/library/BSSMAP_Emulation.ttcn at 51 PS5, Line 51: (ws) https://gerrit.osmocom.org/#/c/9204/5/library/BSSMAP_Emulation.ttcn at 54 PS5, Line 54: port BSSMAPEM_PROC_PT BSSAP_PROC_1; I think with BTS we have an array of them? Is that possible with component ports? (arrays potentially save the need to code dup for each instance) https://gerrit.osmocom.org/#/c/9204/5/msc/BSC_ConnectionHandler.ttcn File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/#/c/9204/5/msc/BSC_ConnectionHandler.ttcn at 53 PS5, Line 53: type record of BSC_ConnHdlrBscPars BSC_ConnHdlrBscParsTable; ah, there's an array of BSCs here -- To view, visit https://gerrit.osmocom.org/9204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib3eabf8537066f43faed8fb983d9e1f4092ec515 Gerrit-Change-Number: 9204 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 17 Oct 2018 14:17:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 14:22:13 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 17 Oct 2018 14:22:13 +0000 Subject: Change in libosmocore[master]: gsm_08_58.h: Introduce struct abis_rsl_chan_nr In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11303 ) Change subject: gsm_08_58.h: Introduce struct abis_rsl_chan_nr ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/11303/2/include/osmocom/gsm/protocol/gsm_08_58.h File include/osmocom/gsm/protocol/gsm_08_58.h: https://gerrit.osmocom.org/#/c/11303/2/include/osmocom/gsm/protocol/gsm_08_58.h at 45 PS2, Line 45: ACCHs 0x01 > It's strange, it didn't look aligned in my editor, but it did during git show. in git's patch output, the first char in each line is a diff indicator (+,-,space), so a line that has no tabs in it always appears one space further right than a line with tabs. Also tabs might snap to a different column in the diff output. https://gerrit.osmocom.org/#/c/11303/2/include/osmocom/gsm/protocol/gsm_08_58.h at 85 PS2, Line 85: union abis_rsl_chan_nr chan_nr_fields; /*!< RSL channel number (value) */ (before this, the comment was spaced by tab; I don't like that, but I guess it should stay consistent to above anyway. same below.) -- To view, visit https://gerrit.osmocom.org/11303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icd6822021207270a00106c50f8ca6b93c1250df9 Gerrit-Change-Number: 11303 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 17 Oct 2018 14:22:13 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 17 14:33:44 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 17 Oct 2018 14:33:44 +0000 Subject: Change in osmo-trx[master]: sigProcLib: also detect both TS1 and TS2 RACH synch. sequences In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11390 ) Change subject: sigProcLib: also detect both TS1 and TS2 RACH synch. sequences ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I838c21db29c54f1924dd478c2b34b46b70aab2cd Gerrit-Change-Number: 11390 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Tom Tsou Gerrit-Comment-Date: Wed, 17 Oct 2018 14:33:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Oct 17 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 17 Oct 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#279?= In-Reply-To: <608548050.92.1539702607257.JavaMail.jenkins@jenkins.osmocom.org> References: <608548050.92.1539702607257.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1659651509.106.1539789007410.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Oct 18 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 18 Oct 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#280?= In-Reply-To: <1659651509.106.1539789007410.JavaMail.jenkins@jenkins.osmocom.org> References: <1659651509.106.1539789007410.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <614017278.113.1539875407269.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Fri Oct 19 00:15:32 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 19 Oct 2018 00:15:32 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_?= =?UTF-8?Q?master,osmocom-master-debian9,lc15,True_#899?= Message-ID: <67419643.114.1539908132451.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 89.27 KB...] Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[3]: Entering directory ' /bin/mkdir -p ' /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmo-release.mk ' /usr/bin/install -c -m 644 libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc libosmogb.pc libosmoctrl.pc libosmocoding.pc libosmosim.pc ' /usr/bin/install -c osmo-release.sh ' make install-data-hook make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-hook'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' + STOW_DIR= stow --restow libosmocore + export PKG_CONFIG_PATH=: + export LD_LIBRARY_PATH= + set +x =============================== osmo-pcu =============================== + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, '.'. libtoolize: copying file './ltmain.sh' libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([m4])' to configure.ac, libtoolize: and rerunning libtoolize and aclocal. libtoolize: Consider adding '-I m4' to ACLOCAL_AMFLAGS in Makefile.am. configure.ac:21: installing './compile' configure.ac:24: installing './config.guess' configure.ac:24: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/Makefile.am: installing './depcomp' tests/Makefile.am:13: warning: source file 'alloc/AllocTest.cpp' is in a subdirectory, tests/Makefile.am:13: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. tests/Makefile.am:21: warning: source file 'alloc/MslotTest.cpp' is in a subdirectory, tests/Makefile.am:21: but option 'subdir-objects' is disabled tests/Makefile.am:38: warning: source file 'bitcomp/BitcompTest.cpp' is in a subdirectory, tests/Makefile.am:38: but option 'subdir-objects' is disabled tests/Makefile.am:38: warning: source file '../src/egprs_rlc_compression.cpp' is in a subdirectory, tests/Makefile.am:38: but option 'subdir-objects' is disabled tests/Makefile.am:97: warning: source file 'codel/codel_test.c' is in a subdirectory, tests/Makefile.am:97: but option 'subdir-objects' is disabled tests/Makefile.am:44: warning: source file 'edge/EdgeTest.cpp' is in a subdirectory, tests/Makefile.am:44: but option 'subdir-objects' is disabled tests/Makefile.am:52: warning: source file 'emu/pcu_emu.cpp' is in a subdirectory, tests/Makefile.am:52: but option 'subdir-objects' is disabled tests/Makefile.am:52: warning: source file 'emu/test_replay_gprs_attach.cpp' is in a subdirectory, tests/Makefile.am:52: but option 'subdir-objects' is disabled tests/Makefile.am:52: warning: source file 'emu/openbsc_clone.c' is in a subdirectory, tests/Makefile.am:52: but option 'subdir-objects' is disabled tests/Makefile.am:52: warning: source file 'emu/test_pdp_activation.cpp' is in a subdirectory, tests/Makefile.am:52: but option 'subdir-objects' is disabled tests/Makefile.am:103: warning: source file 'fn/FnTest.cpp' is in a subdirectory, tests/Makefile.am:103: but option 'subdir-objects' is disabled tests/Makefile.am:81: warning: source file 'llc/LlcTest.cpp' is in a subdirectory, tests/Makefile.am:81: but option 'subdir-objects' is disabled tests/Makefile.am:92: warning: source file 'llist/LListTest.cpp' is in a subdirectory, tests/Makefile.am:92: but option 'subdir-objects' is disabled tests/Makefile.am:70: warning: source file 'ms/MsTest.cpp' is in a subdirectory, tests/Makefile.am:70: but option 'subdir-objects' is disabled tests/Makefile.am:7: warning: source file 'rlcmac/RLCMACTest.cpp' is in a subdirectory, tests/Makefile.am:7: but option 'subdir-objects' is disabled tests/Makefile.am:29: warning: source file 'tbf/TbfTest.cpp' is in a subdirectory, tests/Makefile.am:29: but option 'subdir-objects' is disabled tests/Makefile.am:62: warning: source file 'types/TypesTest.cpp' is in a subdirectory, tests/Makefile.am:62: but option 'subdir-objects' is disabled + ./configure --enable-lc15bts-phy --with-litecell15= --enable-vty-tests 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 for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... 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 checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking how to run the C++ preprocessor... g++ -E checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC -DPIC checking if g++ PIC flag -fPIC -DPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking if g++ supports -c -o file.o... (cached) yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... (cached) GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMOGB... yes checking whether to enable direct DSP access for PDCH of sysmocom-bts... unset checking whether to enable direct PHY access for PDCH of NuRAN Wireless Litecell 1.5 BTS... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY tests... yes CPPFLAGS="" CFLAGS="-g -O2" CXXFLAGS="-g -O2" LDFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating osmo-pcu.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating tests/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 Making all in include make[1]: Entering directory ' make[1]: Nothing to be done for 'all'. make[1]: Leaving directory ' Making all in src make[1]: Entering directory ' CXX gprs_debug.lo CXX csn1.lo CXX gprs_bssgp_pcu.lo CXX gsm_rlcmac.lo CXX gprs_rlcmac.lo CXX gprs_rlcmac_sched.lo CXX gprs_rlcmac_meas.lo CXX gprs_rlcmac_ts_alloc.lo gprs_bssgp_pcu.cpp:982:2: warning: #warning "This causes ASAN to complain. It is not critical for normal operation but should be fixed nevertheless" [-Wcpp] #warning "This causes ASAN to complain. It is not critical for normal operation but should be fixed nevertheless" ^~~~~~~ CXX gprs_ms.lo CXX gsm_timer.lo CXX gprs_ms_storage.lo /bin/bash: line 2: 11250 Segmentation fault /bin/bash ../libtool --silent --tag=CXX --mode=compile g++ -DPACKAGE_NAME=\"osmo-pcu\" -DPACKAGE_TARNAME=\"osmo-pcu\" -DPACKAGE_VERSION=\"0.5.1.7-173d\" -DPACKAGE_STRING=\"osmo-pcu\ 0.5.1.7-173d\" -DPACKAGE_BUGREPORT=\"osmocom-net-gprs at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-pcu\" -DVERSION=\"0.5.1.7-173d\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DSTDC_HEADERS=1 -I. -I../include -Wall -I -I -fno-strict-aliasing -I -DENABLE_DIRECT_PHY -I -I./osmo-bts-litecell15 -Wall -ldl -pthread -g -O2 -MT gprs_ms_storage.lo -MD -MP -MF $depbase.Tpo -c -o gprs_ms_storage.lo gprs_ms_storage.cpp Makefile:778: recipe for target 'gprs_ms_storage.lo' failed make[1]: *** [gprs_ms_storage.lo] Error 139 make[1]: *** Waiting for unfinished jobs.... make[1]: Leaving directory ' Makefile:465: recipe for target 'all-recursive' failed make: *** [all-recursive] Error 1 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Fri Oct 19 07:38:08 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 19 Oct 2018 07:38:08 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pc?= =?UTF-8?Q?u_=C2=BB_master,osmocom-master-debian9,lc15,True_#900?= In-Reply-To: <67419643.114.1539908132451.JavaMail.jenkins@jenkins.osmocom.org> References: <67419643.114.1539908132451.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1822271808.120.1539934688793.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Fri Oct 19 12:08:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 19 Oct 2018 12:08:07 +0000 Subject: Change in osmocom-bb[master]: layer23/common: move SIM APDU caching from l1ctl.c In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11247 ) Change subject: layer23/common: move SIM APDU caching from l1ctl.c ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I564c610e45aa3b630ca5d1ec6bc1cace0dc9c566 Gerrit-Change-Number: 11247 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Fri, 19 Oct 2018 12:08:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 19 14:48:24 2018 From: gerrit-no-reply at lists.osmocom.org (Omar Ramadan) Date: Fri, 19 Oct 2018 14:48:24 +0000 Subject: Change in osmo-bts[master]: test Message-ID: Omar Ramadan has uploaded this change for review. ( https://gerrit.osmocom.org/11392 Change subject: test ...................................................................... test Change-Id: I2a94ec78001e36c09b10716820fcf4e73b0dd6e4 --- M README.md 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/92/11392/1 diff --git a/README.md b/README.md index 38b4bd9..0079ea4 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ + osmo-bts - Osmocom BTS Implementation ==================================== -- To view, visit https://gerrit.osmocom.org/11392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2a94ec78001e36c09b10716820fcf4e73b0dd6e4 Gerrit-Change-Number: 11392 Gerrit-PatchSet: 1 Gerrit-Owner: Omar Ramadan -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 19 14:49:30 2018 From: gerrit-no-reply at lists.osmocom.org (Omar Ramadan) Date: Fri, 19 Oct 2018 14:49:30 +0000 Subject: Change in osmo-bts[master]: test In-Reply-To: References: Message-ID: Omar Ramadan has abandoned this change. ( https://gerrit.osmocom.org/11392 ) Change subject: test ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I2a94ec78001e36c09b10716820fcf4e73b0dd6e4 Gerrit-Change-Number: 11392 Gerrit-PatchSet: 1 Gerrit-Owner: Omar Ramadan Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Oct 19 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 19 Oct 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#281?= In-Reply-To: <614017278.113.1539875407269.JavaMail.jenkins@jenkins.osmocom.org> References: <614017278.113.1539875407269.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1198127817.122.1539961807493.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat Oct 20 12:04:42 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sat, 20 Oct 2018 12:04:42 +0000 Subject: Change in libosmocore[master]: libosmogsm/gsup.c: assert message type in osmo_gsup_encode() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11325 ) Change subject: libosmogsm/gsup.c: assert message type in osmo_gsup_encode() ...................................................................... Patch Set 1: Code-Review-1 Have you found some way to trigger this? In general I'd rather let the caller handle this instead of forcing segfault upon it: those are hard to debug and next to impossible to test beforehand. How would you justify potential fallout in the projects using it? -- To view, visit https://gerrit.osmocom.org/11325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibbac18e2b68b765c17c2bc959c4c085037953a7f Gerrit-Change-Number: 11325 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Sat, 20 Oct 2018 12:04:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 20 12:15:23 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sat, 20 Oct 2018 12:15:23 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: cosmetic: drop useless includes In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11250 ) Change subject: layer23/l1ctl.c: cosmetic: drop useless includes ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I16f595110faf27444175864384ce6800a90e10da Gerrit-Change-Number: 11250 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Sat, 20 Oct 2018 12:15:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Oct 20 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 20 Oct 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#282?= In-Reply-To: <1198127817.122.1539961807493.JavaMail.jenkins@jenkins.osmocom.org> References: <1198127817.122.1539961807493.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <755436845.130.1540048207391.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat Oct 20 18:59:26 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 20 Oct 2018 18:59:26 +0000 Subject: Change in docker-playground[master]: gr-gsm-master/Dockerfile: fix: disable GRCC compilation Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11393 Change subject: gr-gsm-master/Dockerfile: fix: disable GRCC compilation ...................................................................... gr-gsm-master/Dockerfile: fix: disable GRCC compilation Change-Id: I80b079a700caf2b87d627606ae3978a7f9d864a7 --- M gr-gsm-master/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/93/11393/1 diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile index 813b66b..24c8c95 100644 --- a/gr-gsm-master/Dockerfile +++ b/gr-gsm-master/Dockerfile @@ -70,6 +70,7 @@ && cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -Wno-dev \ + -DENABLE_GRCC=OFF \ ../ \ && make -j5 \ && make install \ -- To view, visit https://gerrit.osmocom.org/11393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I80b079a700caf2b87d627606ae3978a7f9d864a7 Gerrit-Change-Number: 11393 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 20 19:21:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 20 Oct 2018 19:21:09 +0000 Subject: Change in docker-playground[master]: gr-gsm-master/Dockerfile: fix: disable GRCC compilation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11393 ) Change subject: gr-gsm-master/Dockerfile: fix: disable GRCC compilation ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I80b079a700caf2b87d627606ae3978a7f9d864a7 Gerrit-Change-Number: 11393 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Sat, 20 Oct 2018 19:21:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 20 19:21:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 20 Oct 2018 19:21:20 +0000 Subject: Change in docker-playground[master]: gr-gsm-master/Dockerfile: fix: disable GRCC compilation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11393 ) Change subject: gr-gsm-master/Dockerfile: fix: disable GRCC compilation ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I80b079a700caf2b87d627606ae3978a7f9d864a7 Gerrit-Change-Number: 11393 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Sat, 20 Oct 2018 19:21:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 20 19:21:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 20 Oct 2018 19:21:21 +0000 Subject: Change in docker-playground[master]: gr-gsm-master/Dockerfile: fix: disable GRCC compilation In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11393 ) Change subject: gr-gsm-master/Dockerfile: fix: disable GRCC compilation ...................................................................... gr-gsm-master/Dockerfile: fix: disable GRCC compilation Change-Id: I80b079a700caf2b87d627606ae3978a7f9d864a7 --- M gr-gsm-master/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile index 813b66b..24c8c95 100644 --- a/gr-gsm-master/Dockerfile +++ b/gr-gsm-master/Dockerfile @@ -70,6 +70,7 @@ && cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -Wno-dev \ + -DENABLE_GRCC=OFF \ ../ \ && make -j5 \ && make install \ -- To view, visit https://gerrit.osmocom.org/11393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I80b079a700caf2b87d627606ae3978a7f9d864a7 Gerrit-Change-Number: 11393 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 20 20:40:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 20 Oct 2018 20:40:23 +0000 Subject: Change in osmocom-bb[master]: host/trxcon/scheduler: add PDTCH channel support Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11394 Change subject: host/trxcon/scheduler: add PDTCH channel support ...................................................................... host/trxcon/scheduler: add PDTCH channel support Change-Id: I1176576f54c1d68e79cc6ac37d61a9033f7018dd --- M src/host/trxcon/Makefile.am M src/host/trxcon/sched_lchan_desc.c A src/host/trxcon/sched_lchan_pdtch.c M src/host/trxcon/sched_trx.h 4 files changed, 214 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/94/11394/1 diff --git a/src/host/trxcon/Makefile.am b/src/host/trxcon/Makefile.am index 7095cb5..b51db02 100644 --- a/src/host/trxcon/Makefile.am +++ b/src/host/trxcon/Makefile.am @@ -32,6 +32,7 @@ # Scheduler trxcon_SOURCES += \ sched_lchan_common.c \ + sched_lchan_pdtch.c \ sched_lchan_desc.c \ sched_lchan_xcch.c \ sched_lchan_tchf.c \ diff --git a/src/host/trxcon/sched_lchan_desc.c b/src/host/trxcon/sched_lchan_desc.c index 8b2b5e1..93639a3 100644 --- a/src/host/trxcon/sched_lchan_desc.c +++ b/src/host/trxcon/sched_lchan_desc.c @@ -25,10 +25,6 @@ #include "sched_trx.h" -/* TODO: implement */ -#define tx_pdtch_fn NULL -#define rx_pdtch_fn NULL - /* Forward declaration of handlers */ int rx_data_fn(struct trx_instance *trx, struct trx_ts *ts, struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid, @@ -58,6 +54,12 @@ int tx_tchh_fn(struct trx_instance *trx, struct trx_ts *ts, struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid); +int rx_pdtch_fn(struct trx_instance *trx, struct trx_ts *ts, + struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid, + sbit_t *bits, int8_t rssi, int16_t toa256); + +int tx_pdtch_fn(struct trx_instance *trx, struct trx_ts *ts, + struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid); const struct trx_lchan_desc trx_lchan_desc[_TRX_CHAN_MAX] = { { diff --git a/src/host/trxcon/sched_lchan_pdtch.c b/src/host/trxcon/sched_lchan_pdtch.c new file mode 100644 index 0000000..1a8987b --- /dev/null +++ b/src/host/trxcon/sched_lchan_pdtch.c @@ -0,0 +1,204 @@ +/* + * OsmocomBB <-> SDR connection bridge + * TDMA scheduler: handlers for DL / UL bursts on logical channels + * + * (C) 2018 by Vadim Yanitskiy + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include +#include +#include + +#include +#include + +#include +#include +#include + +#include "l1ctl_proto.h" +#include "scheduler.h" +#include "sched_trx.h" +#include "logging.h" +#include "trx_if.h" +#include "trxcon.h" +#include "l1ctl.h" + +int rx_pdtch_fn(struct trx_instance *trx, struct trx_ts *ts, + struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid, + sbit_t *bits, int8_t rssi, int16_t toa256) +{ + const struct trx_lchan_desc *lchan_desc; + uint8_t l2[GPRS_L2_MAX_LEN], *mask; + int n_errors, n_bits_total, rc; + sbit_t *buffer, *offset; + uint32_t *first_fn; + size_t l2_len; + + /* Set up pointers */ + lchan_desc = &trx_lchan_desc[lchan->type]; + first_fn = &lchan->rx_first_fn; + mask = &lchan->rx_burst_mask; + buffer = lchan->rx_bursts; + + LOGP(DSCHD, LOGL_DEBUG, "Packet data received on %s: " + "fn=%u ts=%u bid=%u\n", lchan_desc->name, fn, ts->index, bid); + + /* Reset internal state */ + if (bid == 0) { + /* Clean up old measurements */ + memset(&lchan->meas, 0x00, sizeof(lchan->meas)); + + *first_fn = fn; + *mask = 0x0; + } + + /* Update mask */ + *mask |= (1 << bid); + + /* Update measurements */ + lchan->meas.toa256_sum += toa256; + lchan->meas.rssi_sum += rssi; + lchan->meas.toa256_num++; + lchan->meas.rssi_num++; + + /* Copy burst to buffer of 4 bursts */ + offset = buffer + bid * 116; + memcpy(offset, bits + 3, 58); + memcpy(offset + 58, bits + 87, 58); + + /* Wait until complete set of bursts */ + if (bid != 3) + return 0; + + /* Check for complete set of bursts */ + if ((*mask & 0xf) != 0xf) { + LOGP(DSCHD, LOGL_ERROR, "Received incomplete data frame at " + "fn=%u (%u/%u) for %s\n", *first_fn, + (*first_fn) % ts->mf_layout->period, + ts->mf_layout->period, + lchan_desc->name); + + return -1; + } + + /* Attempt to decode */ + rc = gsm0503_pdtch_decode(l2, buffer, + NULL, &n_errors, &n_bits_total); + if (rc < 0) { + LOGP(DSCHD, LOGL_ERROR, "Received bad packet data frame " + "at fn=%u (%u/%u) for %s\n", *first_fn, + (*first_fn) % ts->mf_layout->period, + ts->mf_layout->period, + lchan_desc->name); + } + + /* Determine L2 length */ + l2_len = rc > 0 ? rc : 0; + + /* Send a L2 frame to the higher layers */ + sched_send_dt_ind(trx, ts, lchan, + l2, l2_len, n_errors, rc < 0, true); + + return 0; +} + + +int tx_pdtch_fn(struct trx_instance *trx, struct trx_ts *ts, + struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid) +{ + const struct trx_lchan_desc *lchan_desc; + ubit_t burst[GSM_BURST_LEN]; + ubit_t *buffer, *offset; + const uint8_t *tsc; + uint8_t *mask; + int rc; + + /* Set up pointers */ + lchan_desc = &trx_lchan_desc[lchan->type]; + mask = &lchan->tx_burst_mask; + buffer = lchan->tx_bursts; + + if (bid > 0) { + /* If we have encoded bursts */ + if (*mask) + goto send_burst; + else + return 0; + } + + /* Encode payload */ + rc = gsm0503_pdtch_encode(buffer, lchan->prim->payload, + lchan->prim->payload_len); + if (rc) { + LOGP(DSCHD, LOGL_ERROR, "Failed to encode L2 payload\n"); + + /* Forget this primitive */ + sched_prim_drop(lchan); + + return -EINVAL; + } + +send_burst: + /* Determine which burst should be sent */ + offset = buffer + bid * 116; + + /* Update mask */ + *mask |= (1 << bid); + + /* Choose proper TSC */ + tsc = sched_nb_training_bits[trx->tsc]; + + /* Compose a new burst */ + memset(burst, 0, 3); /* TB */ + memcpy(burst + 3, offset, 58); /* Payload 1/2 */ + memcpy(burst + 61, tsc, 26); /* TSC */ + memcpy(burst + 87, offset + 58, 58); /* Payload 2/2 */ + memset(burst + 145, 0, 3); /* TB */ + + LOGP(DSCHD, LOGL_DEBUG, "Transmitting %s fn=%u ts=%u burst=%u\n", + lchan_desc->name, fn, ts->index, bid); + + /* Forward burst to scheduler */ + rc = sched_trx_handle_tx_burst(trx, ts, lchan, fn, burst); + if (rc) { + /* Forget this primitive */ + sched_prim_drop(lchan); + + /* Reset mask */ + *mask = 0x00; + + return rc; + } + + /* If we have sent the last (4/4) burst */ + if ((*mask & 0x0f) == 0x0f) { + /* Confirm data / traffic sending */ + sched_send_dt_conf(trx, ts, lchan, fn, true); + + /* Forget processed primitive */ + sched_prim_drop(lchan); + + /* Reset mask */ + *mask = 0x00; + } + + return 0; +} diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index 1f0dbc2..b7236d5 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -17,6 +17,9 @@ #define GPRS_BURST_LEN GSM_BURST_LEN #define EDGE_BURST_LEN 444 +#define GPRS_L2_MAX_LEN 54 +#define EDGE_L2_MAX_LEN 155 + #define TRX_CH_LID_DEDIC 0x00 #define TRX_CH_LID_SACCH 0x40 -- To view, visit https://gerrit.osmocom.org/11394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1176576f54c1d68e79cc6ac37d61a9033f7018dd Gerrit-Change-Number: 11394 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 20 20:40:24 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 20 Oct 2018 20:40:24 +0000 Subject: Change in osmocom-bb[master]: l1ctl_proto.h: use flexible array member to store a TCH frame Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11395 Change subject: l1ctl_proto.h: use flexible array member to store a TCH frame ...................................................................... l1ctl_proto.h: use flexible array member to store a TCH frame Unlike the LAPDm messages, TCH frames may have different length. Instead of having fixed payload (i.e. TCH frame) length, let's use flexible array member. This allows one to calculate the frame length using MSGB API. Change-Id: I119fa36c84e95c3003d57c19e25f8146ed45c3c6 --- M include/l1ctl_proto.h M src/host/layer23/src/common/l1ctl.c M src/host/virt_phy/src/virt_prim_traffic.c M src/target/firmware/layer1/prim_tch.c 4 files changed, 34 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/95/11395/1 diff --git a/include/l1ctl_proto.h b/include/l1ctl_proto.h index f1bff86..c6156f5 100644 --- a/include/l1ctl_proto.h +++ b/include/l1ctl_proto.h @@ -96,8 +96,6 @@ L1CTL_MCS9, }; -#define TRAFFIC_DATA_LEN 40 - /* * NOTE: struct size. We do add manual padding out of the believe * that it will avoid some unaligned access. @@ -162,7 +160,7 @@ /* traffic from the network */ struct l1ctl_traffic_ind { - uint8_t data[TRAFFIC_DATA_LEN]; + uint8_t data[0]; } __attribute__((packed)); /* @@ -346,7 +344,7 @@ /* traffic data to network */ struct l1ctl_traffic_req { - uint8_t data[TRAFFIC_DATA_LEN]; + uint8_t data[0]; } __attribute__((packed)); struct l1ctl_tbf_cfg_req { diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 6f4a6d8..7f09691 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -778,6 +778,8 @@ { struct l1ctl_info_dl *dl; struct l1ctl_traffic_ind *ti; + size_t frame_len; + uint8_t *frame; if (msgb_l1len(msg) < sizeof(*dl)) { LOGP(DL1C, LOGL_ERROR, "TRAFFIC IND MSG too short " @@ -787,10 +789,17 @@ /* Header handling */ dl = (struct l1ctl_info_dl *) msg->l1h; - msg->l2h = dl->payload; - ti = (struct l1ctl_traffic_ind *) msg->l2h; + ti = (struct l1ctl_traffic_ind *) dl->payload; + frame = (uint8_t *) ti->data; - DEBUGP(DL1C, "TRAFFIC IND (%s)\n", osmo_hexdump(ti->data, 33)); + msg->l2h = dl->payload; + msg->l3h = frame; + + /* Calculate the frame length */ + frame_len = msgb_l3len(msg); + + DEBUGP(DL1C, "TRAFFIC IND len=%zu (%s)\n", frame_len, + osmo_hexdump(frame, frame_len)); /* distribute or drop */ if (ms->l1_entity.l1_traffic_ind) @@ -807,28 +816,28 @@ struct l1ctl_hdr *l1h; struct l1ctl_info_ul *l1i_ul; struct l1ctl_traffic_req *tr; + size_t frame_len; + uint8_t *frame; /* Header handling */ tr = (struct l1ctl_traffic_req *) msg->l2h; + frame = (uint8_t *) tr->data; + msg->l3h = frame; - DEBUGP(DL1C, "TRAFFIC REQ (%s)\n", - osmo_hexdump(msg->l2h, msgb_l2len(msg))); + /* Calculate the frame length */ + frame_len = msgb_l3len(msg); - if (msgb_l2len(msg) != 33) { - LOGP(DL1C, LOGL_ERROR, "Traffic Request has incorrect length " - "(%u != 33)\n", msgb_l2len(msg)); - msgb_free(msg); - return -EINVAL; - } + DEBUGP(DL1C, "TRAFFIC REQ len=%zu (%s)\n", frame_len, + osmo_hexdump(frame, frame_len)); - if ((tr->data[0] >> 4) != 0xd) { + if ((frame[0] >> 4) != 0xd) { LOGP(DL1C, LOGL_ERROR, "Traffic Request has incorrect magic " - "(%u != 0xd)\n", tr->data[0] >> 4); + "(%u != 0xd)\n", frame[0] >> 4); msgb_free(msg); return -EINVAL; } -// printf("TX %s\n", osmo_hexdump(tr->data, 33)); +// printf("TX %s\n", osmo_hexdump(frame, frame_len)); /* prepend uplink info header */ l1i_ul = (struct l1ctl_info_ul *) msgb_push(msg, sizeof(*l1i_ul)); diff --git a/src/host/virt_phy/src/virt_prim_traffic.c b/src/host/virt_phy/src/virt_prim_traffic.c index 4e58de6..5f6b273 100644 --- a/src/host/virt_phy/src/virt_prim_traffic.c +++ b/src/host/virt_phy/src/virt_prim_traffic.c @@ -84,6 +84,7 @@ struct msgb *l1ctl_msg = NULL; struct l1ctl_traffic_ind * l1ti; struct l1ctl_info_dl * l1dl; + uint8_t *frame, frame_len; uint8_t rsl_chan_type, subchan, timeslot; l1ctl_msg = l1ctl_msgb_alloc(L1CTL_TRAFFIC_IND); l1dl = (struct l1ctl_info_dl *) msgb_put(l1ctl_msg, sizeof(*l1dl)); @@ -102,7 +103,10 @@ /* TODO: traffic decoding and decryption */ - memcpy(l1ti->data, msgb_data(msg), msgb_length(msg)); + frame_len = msgb_length(msg); + frame = (uint8_t *) msgb_put(l1ctl_msg, frame_len); + memcpy(frame, msgb_data(msg), frame_len); + DEBUGPMS(DL1P, ms, "Tx L1CTL_TRAFFIC_IND (chan_nr=0x%02x, link_id=0x%02x)\n", chan_nr, link_id); l1ctl_sap_tx_to_l23_inst(ms, l1ctl_msg); } diff --git a/src/target/firmware/layer1/prim_tch.c b/src/target/firmware/layer1/prim_tch.c index 2dadaaf..a8036d2 100644 --- a/src/target/firmware/layer1/prim_tch.c +++ b/src/target/firmware/layer1/prim_tch.c @@ -338,6 +338,7 @@ struct msgb *msg; struct l1ctl_info_dl *dl; struct l1ctl_traffic_ind *ti; + uint8_t *payload; /* Allocate msgb */ /* FIXME: we actually want all allocation out of L1S! */ @@ -349,15 +350,16 @@ dl = (struct l1ctl_info_dl *) msgb_put(msg, sizeof(*dl)); ti = (struct l1ctl_traffic_ind *) msgb_put(msg, sizeof(*ti)); + payload = (uint8_t *) msgb_put(msg, 33); /* Copy actual data, skipping the information block [0,1,2] */ - dsp_memcpy_from_api(ti->data, &traffic_buf[3], 33, 1); + dsp_memcpy_from_api(payload, &traffic_buf[3], 33, 1); /** * Perform some bit conversations * FIXME: what about other (than FR) codecs? */ - tch_fr_bit_magic(ti, 1); + tch_fr_bit_magic(payload, 1); /* Give message to up layer */ l1_queue_for_l2(msg); -- To view, visit https://gerrit.osmocom.org/11395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I119fa36c84e95c3003d57c19e25f8146ed45c3c6 Gerrit-Change-Number: 11395 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 20 20:46:28 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 20 Oct 2018 20:46:28 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: add PDTCH channel support In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11394 to look at the new patch set (#2). Change subject: trxcon/scheduler: add PDTCH channel support ...................................................................... trxcon/scheduler: add PDTCH channel support Change-Id: I1176576f54c1d68e79cc6ac37d61a9033f7018dd --- M src/host/trxcon/Makefile.am M src/host/trxcon/sched_lchan_desc.c A src/host/trxcon/sched_lchan_pdtch.c M src/host/trxcon/sched_trx.h 4 files changed, 214 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/94/11394/2 -- To view, visit https://gerrit.osmocom.org/11394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1176576f54c1d68e79cc6ac37d61a9033f7018dd Gerrit-Change-Number: 11394 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 20 20:46:28 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 20 Oct 2018 20:46:28 +0000 Subject: Change in osmocom-bb[master]: l1ctl_proto.h: use flexible array member for traffic messages In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11395 to look at the new patch set (#2). Change subject: l1ctl_proto.h: use flexible array member for traffic messages ...................................................................... l1ctl_proto.h: use flexible array member for traffic messages Unlike the DATA messages, traffic frames may have different length. Instead of having fixed payload (i.e. TCH frame) length, let's introduce a flexible array member. This would allow one to calculate the frame length using the MSGB API. Change-Id: I119fa36c84e95c3003d57c19e25f8146ed45c3c6 --- M include/l1ctl_proto.h M src/host/layer23/src/common/l1ctl.c M src/host/virt_phy/src/virt_prim_traffic.c M src/target/firmware/layer1/prim_tch.c 4 files changed, 34 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/95/11395/2 -- To view, visit https://gerrit.osmocom.org/11395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I119fa36c84e95c3003d57c19e25f8146ed45c3c6 Gerrit-Change-Number: 11395 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 20 20:47:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 20 Oct 2018 20:47:12 +0000 Subject: Change in osmocom-bb[fixeria/trx]: WIP: host/trxcon/scheduler: add PDTCH channel support In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/7023 ) Change subject: WIP: host/trxcon/scheduler: add PDTCH channel support ...................................................................... Abandoned See 11394. -- To view, visit https://gerrit.osmocom.org/7023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: fixeria/trx Gerrit-MessageType: abandon Gerrit-Change-Id: I1176576f54c1d68e79cc6ac37d61a9033f7018dd Gerrit-Change-Number: 7023 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Oct 21 00:49:44 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 21 Oct 2018 00:49:44 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-libosmo-sccp_=C2=BB_a1=3Ddefa?= =?UTF-8?Q?ult,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1652?= Message-ID: <1906320319.132.1540082984184.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 56.57 KB...] CC gsm620.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC rxlev_stat.lo CC a5.lo CC tlv_parser.lo CC comp128.lo CC comp128v23.lo CC gsm48.lo CC rsl.lo CC gsm_utils.lo gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:448:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ gsm_utils.c:456:9: note: #pragma message: Secure random failed: using GnuTLS fallback. #pragma message ("Secure random failed: using GnuTLS fallback.") ^~~~~~~ CC gsm48_ie.lo CC gsm0808.lo CC sysinfo.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC gsm0480.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo CC gsm0411_smr.lo CC gsm0414.lo CC lapd_core.lo CC lapdm.lo CC kasumi.lo CC gsm_04_08_gprs.lo CC auth_core.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_milenage.lo CC gea.lo CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CC gan.lo CC ipa.lo CC gsm0341.lo CC apn.lo CC gsup.lo CC gprs_gea.lo ipa.c: In function ?ipa_ccm_idtag_parse?: ipa.c:103:2: warning: ?ipa_ccm_idtag_parse_off? is deprecated: Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^~~~~~ In file included from ipa.c:45:0: ../../include/osmocom/gsm/ipa.h:31:5: note: declared here int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) ^~~~~~~~~~~~~~~~~~~~~~~ CC gsm0503_conv.lo CC oap.lo CC gsm0808_utils.lo CC gsm23003.lo CC mncc.lo CC bts_features.lo CC oap_client.lo CC milenage/aes-encblock.lo CCLD libgsmint.la ar: `u' modifier ignored since `D' is the default (see `U') CCLD libosmogsm.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la ' libtool: warning: relinking 'libosmogsm.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogsm.map -version-info 10:0:0 -no-undefined -o libosmogsm.la -rpath libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T libtool: install: (cd && { ln -s -f libosmogsm.so.10.0.0 libosmogsm.so.10 || { rm -f libosmogsm.so.10 && ln -s libosmogsm.so.10.0.0 libosmogsm.so.10; }; }) libtool: install: (cd && { ln -s -f libosmogsm.so.10.0.0 libosmogsm.so || { rm -f libosmogsm.so && ln -s libosmogsm.so.10.0.0 libosmogsm.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmogsm.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/coding make[2]: Entering directory ' CC gsm0503_interleaving.lo CC gsm0503_mapping.lo CC gsm0503_parity.lo CC gsm0503_tables.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la ' libtool: warning: relinking 'libosmocoding.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmocoding.map -version-info 1:1:1 -no-undefined -ltalloc -o libosmocoding.la -rpath gsm0503_interleaving.lo gsm0503_mapping.lo gsm0503_tables.lo gsm0503_parity.lo gsm0503_coding.lo ../libosmocore.la ../gsm/libosmogsm.la ../codec/libosmocodec.la ) libtool: install: /usr/bin/install -c .libs/libosmocoding.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocoding.so.0.1.1 libosmocoding.so.0 || { rm -f libosmocoding.so.0 && ln -s libosmocoding.so.0.1.1 libosmocoding.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocoding.so.0.1.1 libosmocoding.so || { rm -f libosmocoding.so && ln -s libosmocoding.so.0.1.1 libosmocoding.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocoding.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gb make[2]: Entering directory ' CC gprs_bssgp_vty.lo CC gprs_bssgp_util.lo CC gprs_ns.lo CC gprs_ns_frgre.lo CC common_vty.lo CC gprs_ns_vty.lo CC gprs_bssgp.lo CC gprs_bssgp_bss.lo CCLD libosmogb.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la ' libtool: warning: relinking 'libosmogb.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -fno-strict-aliasing -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogb.map -version-info 7:0:1 -o libosmogb.la -rpath gprs_ns.lo gprs_ns_frgre.lo gprs_ns_vty.lo gprs_bssgp.lo gprs_bssgp_util.lo gprs_bssgp_vty.lo gprs_bssgp_bss.lo common_vty.lo -ltalloc ../../src/libosmocore.la ../../src/vty/libosmovty.la ../../src/gsm/libosmogsm.la ) ../../libtool: line 1719: 3622 Segmentation fault /bin/bash " --silent --tag CC --mode=relink gcc -Wall -fno-strict-aliasing -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogb.map -version-info 7:0:1 -o libosmogb.la -rpath gprs_ns.lo gprs_ns_frgre.lo gprs_ns_vty.lo gprs_bssgp.lo gprs_bssgp_util.lo gprs_bssgp_vty.lo gprs_bssgp_bss.lo common_vty.lo -ltalloc ../../src/libosmocore.la ../../src/vty/libosmovty.la ../../src/gsm/libosmogsm.la libtool: error: error: relink 'libosmogb.la' with the above command before installing it Makefile:426: recipe for target 'install-libLTLIBRARIES' failed make[3]: *** [install-libLTLIBRARIES] Error 1 make[3]: Leaving directory ' Makefile:603: recipe for target 'install-am' failed make[2]: *** [install-am] Error 2 make[2]: Leaving directory ' Makefile:614: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:913: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Oct 21 06:16:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 21 Oct 2018 06:16:23 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-libosmo-sccp_=C2=BB_a1?= =?UTF-8?Q?=3Ddefault,a2=3Ddefault,a3=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1653?= In-Reply-To: <1906320319.132.1540082984184.JavaMail.jenkins@jenkins.osmocom.org> References: <1906320319.132.1540082984184.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1062453606.135.1540102583070.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun Oct 21 08:59:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 08:59:53 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: fclose() what we fopen() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11396 Change subject: osmo-config-merge: fclose() what we fopen() ...................................................................... osmo-config-merge: fclose() what we fopen() Change-Id: Ib44f902e5bca2277f1b340d34fabbd2a298d683e Fixes: Coverity CID#188851 --- M utils/osmo-config-merge.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/11396/1 diff --git a/utils/osmo-config-merge.c b/utils/osmo-config-merge.c index a872d64..afaf86b 100644 --- a/utils/osmo-config-merge.c +++ b/utils/osmo-config-merge.c @@ -144,6 +144,7 @@ if (indent > cur_indent+1) { fprintf(stderr, "File '%s' isn't well-formed in line %u, aborting!\n", fname, line_num); + fclose(infile); return NULL; } /* new child to last node */ @@ -166,6 +167,7 @@ cur_indent = indent; } + fclose(infile); return root; } -- To view, visit https://gerrit.osmocom.org/11396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib44f902e5bca2277f1b340d34fabbd2a298d683e Gerrit-Change-Number: 11396 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 09:13:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 09:13:46 +0000 Subject: Change in osmo-bsc[master]: range_enc_determine_range(): Don't dereference array on size=0 Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11397 Change subject: range_enc_determine_range(): Don't dereference array on size=0 ...................................................................... range_enc_determine_range(): Don't dereference array on size=0 Change-Id: I5bbb10af8b8e8ebc22bf79f5468e71a41b5e74b3 Fixes: Coverity CID#182710 --- M src/osmo-bsc/arfcn_range_encode.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/11397/1 diff --git a/src/osmo-bsc/arfcn_range_encode.c b/src/osmo-bsc/arfcn_range_encode.c index 84f9f63..54d98a9 100644 --- a/src/osmo-bsc/arfcn_range_encode.c +++ b/src/osmo-bsc/arfcn_range_encode.c @@ -168,6 +168,10 @@ { int max = 0; + /* don't dereference arfcns[] array if size is 0 */ + if (size == 0) + return ARFCN_RANGE_128; + /* * Go for the easiest. And pick arfcns[0] == f0. */ -- To view, visit https://gerrit.osmocom.org/11397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5bbb10af8b8e8ebc22bf79f5468e71a41b5e74b3 Gerrit-Change-Number: 11397 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 09:18:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 09:18:28 +0000 Subject: Change in osmo-bsc[master]: handover_start_inter_bsc_in(): Uninitialized variable Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11398 Change subject: handover_start_inter_bsc_in(): Uninitialized variable ...................................................................... handover_start_inter_bsc_in(): Uninitialized variable This only afffects a log statement, so not really an issue. Change-Id: I8e5b164194855f78a266c1a4441730cc6c378d11 Fixes: Coverity CID#188829 --- M src/osmo-bsc/handover_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/98/11398/1 diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 4286084..68230e1 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -522,7 +522,7 @@ struct handover_in_req *req = &ho->inter_bsc_in; int match_idx; enum gsm48_chan_mode mode; - bool full_rate; + bool full_rate = false; uint16_t s15_s0; struct osmo_fsm_inst *fi; -- To view, visit https://gerrit.osmocom.org/11398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8e5b164194855f78a266c1a4441730cc6c378d11 Gerrit-Change-Number: 11398 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 09:31:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 09:31:38 +0000 Subject: Change in osmo-bsc[master]: don't use rsl_cause_name() in LOGP statements Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11399 Change subject: don't use rsl_cause_name() in LOGP statements ...................................................................... don't use rsl_cause_name() in LOGP statements rsl_cause_name() doesn't only return the name of the cause, but also returns a pointer to the binary cause IE value. If we want to use that cause IE value, then we must not call rsl_cause_name() from within a LOGP/DEBUGP statement, as this will only be executed if the log level is high enough. I actually believe the rsl_cause_name() should be side-effect free, i.e. it should simply return a name and not also return a pointer to the cause in an output pointer-pointer. This way it's less easy to fall into this trap. Change-Id: I0ecabcd6435f3f74448d5d3350fe659d7df91a6d Fixes: Coverity CID#188832, CID#188847 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/99/11399/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 589d673..2443bb5 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -861,6 +861,7 @@ struct tlv_parsed tp; struct gsm_lchan *lchan = msg->lchan; const uint8_t *cause_p; + const char *cause_name; rate_ctr_inc(&msg->lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_CHAN_ACT_NACK]); @@ -871,7 +872,8 @@ } rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh)); - LOG_LCHAN(lchan, LOGL_ERROR, "CHANNEL ACTIVATE NACK%s\n", rsl_cause_name(&tp, &cause_p)); + cause_name = rsl_cause_name(&tp, &cause_p); + LOG_LCHAN(lchan, LOGL_ERROR, "CHANNEL ACTIVATE NACK%s\n", cause_name); if (msg_for_osmocom_dyn_ts(msg)) osmo_fsm_inst_dispatch(lchan->ts->fi, TS_EV_PDCH_ACT_NACK, (void*)cause_p); @@ -887,10 +889,12 @@ struct gsm_lchan *lchan = msg->lchan; struct tlv_parsed tp; const uint8_t *cause_p; + const char *cause_name; rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh)); + cause_name = rsl_cause_name(&tp, &cause_p); - LOG_LCHAN(lchan, LOGL_ERROR, "CONNECTION FAIL%s\n", rsl_cause_name(&tp, &cause_p)); + LOG_LCHAN(lchan, LOGL_ERROR, "CONNECTION FAIL%s\n", cause_name); rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL]); -- To view, visit https://gerrit.osmocom.org/11399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0ecabcd6435f3f74448d5d3350fe659d7df91a6d Gerrit-Change-Number: 11399 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 09:42:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 09:42:05 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: fclose() what we fopen() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11396 ) Change subject: osmo-config-merge: fclose() what we fopen() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib44f902e5bca2277f1b340d34fabbd2a298d683e Gerrit-Change-Number: 11396 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 09:42:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 09:42:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 09:42:06 +0000 Subject: Change in libosmocore[master]: osmo-config-merge: fclose() what we fopen() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11396 ) Change subject: osmo-config-merge: fclose() what we fopen() ...................................................................... osmo-config-merge: fclose() what we fopen() Change-Id: Ib44f902e5bca2277f1b340d34fabbd2a298d683e Fixes: Coverity CID#188851 --- M utils/osmo-config-merge.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/utils/osmo-config-merge.c b/utils/osmo-config-merge.c index a872d64..afaf86b 100644 --- a/utils/osmo-config-merge.c +++ b/utils/osmo-config-merge.c @@ -144,6 +144,7 @@ if (indent > cur_indent+1) { fprintf(stderr, "File '%s' isn't well-formed in line %u, aborting!\n", fname, line_num); + fclose(infile); return NULL; } /* new child to last node */ @@ -166,6 +167,7 @@ cur_indent = indent; } + fclose(infile); return root; } -- To view, visit https://gerrit.osmocom.org/11396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib44f902e5bca2277f1b340d34fabbd2a298d683e Gerrit-Change-Number: 11396 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 09:43:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 09:43:19 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: add PDTCH channel support In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11394 ) Change subject: trxcon/scheduler: add PDTCH channel support ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1176576f54c1d68e79cc6ac37d61a9033f7018dd Gerrit-Change-Number: 11394 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Sun, 21 Oct 2018 09:43:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 09:43:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 09:43:55 +0000 Subject: Change in osmocom-bb[master]: l1ctl_proto.h: use flexible array member for traffic messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11395 ) Change subject: l1ctl_proto.h: use flexible array member for traffic messages ...................................................................... Patch Set 2: Code-Review+1 this may need synchronization with other implementations of l1ctl_proto, such as the TTCN-3 code? -- To view, visit https://gerrit.osmocom.org/11395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I119fa36c84e95c3003d57c19e25f8146ed45c3c6 Gerrit-Change-Number: 11395 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 09:43:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 09:43:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 09:43:59 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: add PDTCH channel support In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11394 ) Change subject: trxcon/scheduler: add PDTCH channel support ...................................................................... trxcon/scheduler: add PDTCH channel support Change-Id: I1176576f54c1d68e79cc6ac37d61a9033f7018dd --- M src/host/trxcon/Makefile.am M src/host/trxcon/sched_lchan_desc.c A src/host/trxcon/sched_lchan_pdtch.c M src/host/trxcon/sched_trx.h 4 files changed, 214 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/trxcon/Makefile.am b/src/host/trxcon/Makefile.am index 7095cb5..b51db02 100644 --- a/src/host/trxcon/Makefile.am +++ b/src/host/trxcon/Makefile.am @@ -32,6 +32,7 @@ # Scheduler trxcon_SOURCES += \ sched_lchan_common.c \ + sched_lchan_pdtch.c \ sched_lchan_desc.c \ sched_lchan_xcch.c \ sched_lchan_tchf.c \ diff --git a/src/host/trxcon/sched_lchan_desc.c b/src/host/trxcon/sched_lchan_desc.c index 8b2b5e1..93639a3 100644 --- a/src/host/trxcon/sched_lchan_desc.c +++ b/src/host/trxcon/sched_lchan_desc.c @@ -25,10 +25,6 @@ #include "sched_trx.h" -/* TODO: implement */ -#define tx_pdtch_fn NULL -#define rx_pdtch_fn NULL - /* Forward declaration of handlers */ int rx_data_fn(struct trx_instance *trx, struct trx_ts *ts, struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid, @@ -58,6 +54,12 @@ int tx_tchh_fn(struct trx_instance *trx, struct trx_ts *ts, struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid); +int rx_pdtch_fn(struct trx_instance *trx, struct trx_ts *ts, + struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid, + sbit_t *bits, int8_t rssi, int16_t toa256); + +int tx_pdtch_fn(struct trx_instance *trx, struct trx_ts *ts, + struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid); const struct trx_lchan_desc trx_lchan_desc[_TRX_CHAN_MAX] = { { diff --git a/src/host/trxcon/sched_lchan_pdtch.c b/src/host/trxcon/sched_lchan_pdtch.c new file mode 100644 index 0000000..1a8987b --- /dev/null +++ b/src/host/trxcon/sched_lchan_pdtch.c @@ -0,0 +1,204 @@ +/* + * OsmocomBB <-> SDR connection bridge + * TDMA scheduler: handlers for DL / UL bursts on logical channels + * + * (C) 2018 by Vadim Yanitskiy + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include +#include +#include + +#include +#include + +#include +#include +#include + +#include "l1ctl_proto.h" +#include "scheduler.h" +#include "sched_trx.h" +#include "logging.h" +#include "trx_if.h" +#include "trxcon.h" +#include "l1ctl.h" + +int rx_pdtch_fn(struct trx_instance *trx, struct trx_ts *ts, + struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid, + sbit_t *bits, int8_t rssi, int16_t toa256) +{ + const struct trx_lchan_desc *lchan_desc; + uint8_t l2[GPRS_L2_MAX_LEN], *mask; + int n_errors, n_bits_total, rc; + sbit_t *buffer, *offset; + uint32_t *first_fn; + size_t l2_len; + + /* Set up pointers */ + lchan_desc = &trx_lchan_desc[lchan->type]; + first_fn = &lchan->rx_first_fn; + mask = &lchan->rx_burst_mask; + buffer = lchan->rx_bursts; + + LOGP(DSCHD, LOGL_DEBUG, "Packet data received on %s: " + "fn=%u ts=%u bid=%u\n", lchan_desc->name, fn, ts->index, bid); + + /* Reset internal state */ + if (bid == 0) { + /* Clean up old measurements */ + memset(&lchan->meas, 0x00, sizeof(lchan->meas)); + + *first_fn = fn; + *mask = 0x0; + } + + /* Update mask */ + *mask |= (1 << bid); + + /* Update measurements */ + lchan->meas.toa256_sum += toa256; + lchan->meas.rssi_sum += rssi; + lchan->meas.toa256_num++; + lchan->meas.rssi_num++; + + /* Copy burst to buffer of 4 bursts */ + offset = buffer + bid * 116; + memcpy(offset, bits + 3, 58); + memcpy(offset + 58, bits + 87, 58); + + /* Wait until complete set of bursts */ + if (bid != 3) + return 0; + + /* Check for complete set of bursts */ + if ((*mask & 0xf) != 0xf) { + LOGP(DSCHD, LOGL_ERROR, "Received incomplete data frame at " + "fn=%u (%u/%u) for %s\n", *first_fn, + (*first_fn) % ts->mf_layout->period, + ts->mf_layout->period, + lchan_desc->name); + + return -1; + } + + /* Attempt to decode */ + rc = gsm0503_pdtch_decode(l2, buffer, + NULL, &n_errors, &n_bits_total); + if (rc < 0) { + LOGP(DSCHD, LOGL_ERROR, "Received bad packet data frame " + "at fn=%u (%u/%u) for %s\n", *first_fn, + (*first_fn) % ts->mf_layout->period, + ts->mf_layout->period, + lchan_desc->name); + } + + /* Determine L2 length */ + l2_len = rc > 0 ? rc : 0; + + /* Send a L2 frame to the higher layers */ + sched_send_dt_ind(trx, ts, lchan, + l2, l2_len, n_errors, rc < 0, true); + + return 0; +} + + +int tx_pdtch_fn(struct trx_instance *trx, struct trx_ts *ts, + struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid) +{ + const struct trx_lchan_desc *lchan_desc; + ubit_t burst[GSM_BURST_LEN]; + ubit_t *buffer, *offset; + const uint8_t *tsc; + uint8_t *mask; + int rc; + + /* Set up pointers */ + lchan_desc = &trx_lchan_desc[lchan->type]; + mask = &lchan->tx_burst_mask; + buffer = lchan->tx_bursts; + + if (bid > 0) { + /* If we have encoded bursts */ + if (*mask) + goto send_burst; + else + return 0; + } + + /* Encode payload */ + rc = gsm0503_pdtch_encode(buffer, lchan->prim->payload, + lchan->prim->payload_len); + if (rc) { + LOGP(DSCHD, LOGL_ERROR, "Failed to encode L2 payload\n"); + + /* Forget this primitive */ + sched_prim_drop(lchan); + + return -EINVAL; + } + +send_burst: + /* Determine which burst should be sent */ + offset = buffer + bid * 116; + + /* Update mask */ + *mask |= (1 << bid); + + /* Choose proper TSC */ + tsc = sched_nb_training_bits[trx->tsc]; + + /* Compose a new burst */ + memset(burst, 0, 3); /* TB */ + memcpy(burst + 3, offset, 58); /* Payload 1/2 */ + memcpy(burst + 61, tsc, 26); /* TSC */ + memcpy(burst + 87, offset + 58, 58); /* Payload 2/2 */ + memset(burst + 145, 0, 3); /* TB */ + + LOGP(DSCHD, LOGL_DEBUG, "Transmitting %s fn=%u ts=%u burst=%u\n", + lchan_desc->name, fn, ts->index, bid); + + /* Forward burst to scheduler */ + rc = sched_trx_handle_tx_burst(trx, ts, lchan, fn, burst); + if (rc) { + /* Forget this primitive */ + sched_prim_drop(lchan); + + /* Reset mask */ + *mask = 0x00; + + return rc; + } + + /* If we have sent the last (4/4) burst */ + if ((*mask & 0x0f) == 0x0f) { + /* Confirm data / traffic sending */ + sched_send_dt_conf(trx, ts, lchan, fn, true); + + /* Forget processed primitive */ + sched_prim_drop(lchan); + + /* Reset mask */ + *mask = 0x00; + } + + return 0; +} diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index 1f0dbc2..b7236d5 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -17,6 +17,9 @@ #define GPRS_BURST_LEN GSM_BURST_LEN #define EDGE_BURST_LEN 444 +#define GPRS_L2_MAX_LEN 54 +#define EDGE_L2_MAX_LEN 155 + #define TRX_CH_LID_DEDIC 0x00 #define TRX_CH_LID_SACCH 0x40 -- To view, visit https://gerrit.osmocom.org/11394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1176576f54c1d68e79cc6ac37d61a9033f7018dd Gerrit-Change-Number: 11394 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 09:44:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 09:44:12 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: cosmetic: drop useless includes In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11250 ) Change subject: layer23/l1ctl.c: cosmetic: drop useless includes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I16f595110faf27444175864384ce6800a90e10da Gerrit-Change-Number: 11250 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Sun, 21 Oct 2018 09:44:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 09:46:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 09:46:23 +0000 Subject: Change in osmo-iuh[master]: hnbgw_tx_hnb_register_rej(): Missing return statement Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11400 Change subject: hnbgw_tx_hnb_register_rej(): Missing return statement ...................................................................... hnbgw_tx_hnb_register_rej(): Missing return statement Change-Id: I0bdee8ede9ffdc16c16a4f5723acb7b4bceb2158 Fixes: Coverity CID#188869 --- M src/hnbgw_hnbap.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/00/11400/1 diff --git a/src/hnbgw_hnbap.c b/src/hnbgw_hnbap.c index 2a19dda..1d50d4d 100644 --- a/src/hnbgw_hnbap.c +++ b/src/hnbgw_hnbap.c @@ -85,7 +85,10 @@ } else { /* The message was not queued. Destroy the connection right away. */ hnb_context_release(ctx); + return rc; } + + return 0; } static int hnbgw_tx_hnb_register_acc(struct hnb_context *ctx) -- To view, visit https://gerrit.osmocom.org/11400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0bdee8ede9ffdc16c16a4f5723acb7b4bceb2158 Gerrit-Change-Number: 11400 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 09:51:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 09:51:56 +0000 Subject: Change in osmo-pcu[master]: gprs_rlcmac_received_lost(): Fix regression / uninitialized now_tv Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11401 Change subject: gprs_rlcmac_received_lost(): Fix regression / uninitialized now_tv ...................................................................... gprs_rlcmac_received_lost(): Fix regression / uninitialized now_tv In Change-Id I7d22e7b5902c230efeae66eb20c17026a4037887 we introduced the use of timespecsub(). Unfortuantely, we also accidentially removed the call to osmo_clock_gettime() along with it, leaving now_tv completely uninitialized. Change-Id: Ieced0c62700b2fe4ab0208258183154cc701490b Related: OS#3225 Fixes: Coverity CID#188872 --- M src/gprs_rlcmac_meas.cpp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/01/11401/1 diff --git a/src/gprs_rlcmac_meas.cpp b/src/gprs_rlcmac_meas.cpp index f6448d5..9ff06db 100644 --- a/src/gprs_rlcmac_meas.cpp +++ b/src/gprs_rlcmac_meas.cpp @@ -131,6 +131,7 @@ tbf->m_bw.dl_loss_received += received; tbf->m_bw.dl_loss_lost += lost; + osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv); timespecsub(&now_tv, loss_tv, &elapsed); if (elapsed.tv_sec < 1) return 0; -- To view, visit https://gerrit.osmocom.org/11401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ieced0c62700b2fe4ab0208258183154cc701490b Gerrit-Change-Number: 11401 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 10:02:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 10:02:06 +0000 Subject: Change in osmo-mgw[master]: check_rtp_origin(): Don't memcmp sockadd_in and in_addr Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11402 Change subject: check_rtp_origin(): Don't memcmp sockadd_in and in_addr ...................................................................... check_rtp_origin(): Don't memcmp sockadd_in and in_addr We were comparing 16 bytes (sockaddr_in) in memcmp() rather than using four bytes (struct in_addr in mgcp conn end). This is a good example why we should actually simply use the == (equals) operator rather than using memcmp which treats everything as void. Change-Id: Ic64256619ef893d625400e8b1b573ea2c629ed9c Fixes: Coverity CID#188874 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/02/11402/1 diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index d769ef3..fe63f1e 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -874,7 +874,7 @@ endp = conn->conn->endp; struct sockaddr_in zero_addr = {}; - if (memcmp(&zero_addr, &conn->end.addr, sizeof(zero_addr)) == 0) { + if (memcmp(&zero_addr.sin_addr, &conn->end.addr, sizeof(zero_addr.sin_addr)) == 0) { switch (conn->conn->mode) { case MGCP_CONN_LOOPBACK: /* HACK: for IuUP, we want to reply with an IuUP Initialization ACK upon the first RTP -- To view, visit https://gerrit.osmocom.org/11402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic64256619ef893d625400e8b1b573ea2c629ed9c Gerrit-Change-Number: 11402 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 10:02:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 10:02:07 +0000 Subject: Change in osmo-mgw[master]: check_rtp_origin(): Avoid using memcmp for comparing integer types Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11403 Change subject: check_rtp_origin(): Avoid using memcmp for comparing integer types ...................................................................... check_rtp_origin(): Avoid using memcmp for comparing integer types in_addr consists only of s_addr, which is an integer type that can be compared directly. By avoiding memcmp() here we would have been able to catch Coverity CID#188874 even without Coverity, and make the code more compact... Change-Id: Ic6105d39ae2fb4b301f87448b16763fe9f695621 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/03/11403/1 diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index fe63f1e..de34cc6 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -872,9 +872,8 @@ { struct mgcp_endpoint *endp; endp = conn->conn->endp; - struct sockaddr_in zero_addr = {}; - if (memcmp(&zero_addr.sin_addr, &conn->end.addr, sizeof(zero_addr.sin_addr)) == 0) { + if (conn->end.addr.s_addr == 0) { switch (conn->conn->mode) { case MGCP_CONN_LOOPBACK: /* HACK: for IuUP, we want to reply with an IuUP Initialization ACK upon the first RTP @@ -904,8 +903,7 @@ /* Note: Check if the inbound RTP data comes from the same host to * which we send our outgoing RTP traffic. */ - if (memcmp(&addr->sin_addr, &conn->end.addr, sizeof(addr->sin_addr)) - != 0) { + if (conn->end.addr.s_addr != addr->sin_addr.s_addr) { LOGP(DRTP, LOGL_ERROR, "endpoint:0x%x data from wrong address: %s, ", ENDPOINT_NUMBER(endp), inet_ntoa(addr->sin_addr)); -- To view, visit https://gerrit.osmocom.org/11403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6105d39ae2fb4b301f87448b16763fe9f695621 Gerrit-Change-Number: 11403 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 10:09:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 10:09:51 +0000 Subject: Change in osmo-ggsn[master]: sgsnemu: Use in46a_from_eua() with array of in46_addr Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11404 Change subject: sgsnemu: Use in46a_from_eua() with array of in46_addr ...................................................................... sgsnemu: Use in46a_from_eua() with array of in46_addr Change-Id: Ie5a572a507d0556736a661cd3c1216e1e2a2a5df Fixes: Coverity CID#180704 --- M sgsnemu/sgsnemu.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/04/11404/1 diff --git a/sgsnemu/sgsnemu.c b/sgsnemu/sgsnemu.c index 1e61a09..9be8335 100644 --- a/sgsnemu/sgsnemu.c +++ b/sgsnemu/sgsnemu.c @@ -1373,7 +1373,7 @@ static int create_pdp_conf(struct pdp_t *pdp, void *cbp, int cause) { - struct in46_addr addr; + struct in46_addr addr[2]; struct iphash_t *iph = (struct iphash_t *)cbp; -- To view, visit https://gerrit.osmocom.org/11404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie5a572a507d0556736a661cd3c1216e1e2a2a5df Gerrit-Change-Number: 11404 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 10:16:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 10:16:07 +0000 Subject: Change in osmo-trx[master]: SocketsTest.testReaderIP(): Zero terminate received buffer Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11405 Change subject: SocketsTest.testReaderIP(): Zero terminate received buffer ...................................................................... SocketsTest.testReaderIP(): Zero terminate received buffer Change-Id: Icd144e672ab15cfb0955897dd6eb529c56908eba --- M tests/CommonLibs/SocketsTest.cpp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/05/11405/1 diff --git a/tests/CommonLibs/SocketsTest.cpp b/tests/CommonLibs/SocketsTest.cpp index eb92e25..e4eef54 100644 --- a/tests/CommonLibs/SocketsTest.cpp +++ b/tests/CommonLibs/SocketsTest.cpp @@ -47,9 +47,10 @@ readSocket->nonblocking(); int rc = 0; while (rcread(buf, MAX_UDP_LENGTH); if (count>0) { + buf[count] = 0; CERR("read: " << buf); rc++; } else { -- To view, visit https://gerrit.osmocom.org/11405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icd144e672ab15cfb0955897dd6eb529c56908eba Gerrit-Change-Number: 11405 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 10:16:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 10:16:08 +0000 Subject: Change in osmo-trx[master]: trx_validate_config(): Fix validation of rx_sps Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11406 Change subject: trx_validate_config(): Fix validation of rx_sps ...................................................................... trx_validate_config(): Fix validation of rx_sps Change-Id: I7e932cff59335add09c76caba6f9ac1e7cf69022 Fixes: Coverity CID#188871 --- M CommonLibs/Logger.cpp M Transceiver52M/osmo-trx.cpp 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/06/11406/1 diff --git a/CommonLibs/Logger.cpp b/CommonLibs/Logger.cpp index 171c635..cdf0544 100644 --- a/CommonLibs/Logger.cpp +++ b/CommonLibs/Logger.cpp @@ -52,7 +52,7 @@ ScopedLock lock(gLogToLock); // The COUT() macro prevents messages from stomping each other but adds uninteresting thread numbers, // so just use std::cout. - LOGPSRC(mCategory, mPriority, filename, line, fmt, mStream.str().c_str()); + //LOGPSRC(mCategory, mPriority, filename, line, fmt, mStream.str().c_str()); pthread_setcancelstate(old_state, NULL); } diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index d01a4cf..7f72c47 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -376,7 +376,7 @@ /* Force 4 SPS for EDGE or multi-ARFCN configurations */ if ((trx->cfg.egprs || trx->cfg.multi_arfcn) && - (trx->cfg.tx_sps!=4 || trx->cfg.tx_sps!=4)) { + (trx->cfg.tx_sps!=4 || trx->cfg.rx_sps!=4)) { LOG(ERROR) << "EDGE and Multi-Carrier options require 4 tx and rx sps. Check you config."; return -1; } -- To view, visit https://gerrit.osmocom.org/11406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7e932cff59335add09c76caba6f9ac1e7cf69022 Gerrit-Change-Number: 11406 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 10:22:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 10:22:27 +0000 Subject: Change in osmo-bsc[master]: ipaccess-proxy: Add error handling to IAP CCM ID RESP parsing Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11407 Change subject: ipaccess-proxy: Add error handling to IAP CCM ID RESP parsing ...................................................................... ipaccess-proxy: Add error handling to IAP CCM ID RESP parsing Change-Id: I56ec149979572486b904fc1409cf3cd096b6eb34 Fixes: Coverity CID#188867 --- M src/ipaccess/ipaccess-proxy.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/07/11407/1 diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c index a2ce633..26c5bcd 100644 --- a/src/ipaccess/ipaccess-proxy.c +++ b/src/ipaccess/ipaccess-proxy.c @@ -458,7 +458,11 @@ case IPAC_MSGT_ID_RESP: DEBUGP(DLMI, "ID_RESP "); /* parse tags, search for Unit ID */ - ipa_ccm_id_resp_parse(&tlvp, (uint8_t *)msg->l2h+1, msgb_l2len(msg)-1); + ret = ipa_ccm_id_resp_parse(&tlvp, (uint8_t *)msg->l2h+1, msgb_l2len(msg)-1); + if (ret < 0) { + LOGP(DLINP, LOGL_ERROR, "Error parsing CCM ID RESP !?!\n"); + return -EIO; + } DEBUGP(DLMI, "\n"); if (!TLVP_PRESENT(&tlvp, IPAC_IDTAG_UNIT)) { -- To view, visit https://gerrit.osmocom.org/11407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I56ec149979572486b904fc1409cf3cd096b6eb34 Gerrit-Change-Number: 11407 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 10:22:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 10:22:27 +0000 Subject: Change in osmo-bsc[master]: acc_ramp: An unsigned int is always >= 0 Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11408 Change subject: acc_ramp: An unsigned int is always >= 0 ...................................................................... acc_ramp: An unsigned int is always >= 0 Change-Id: I653ae9ede578370b4d7b1a150e9ec3c0702bbb31 Fixes: Coverity CID#188862 --- M src/osmo-bsc/acc_ramp.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/08/11408/1 diff --git a/src/osmo-bsc/acc_ramp.c b/src/osmo-bsc/acc_ramp.c index ac9f02d..bc2e3fb 100644 --- a/src/osmo-bsc/acc_ramp.c +++ b/src/osmo-bsc/acc_ramp.c @@ -36,7 +36,7 @@ */ static bool acc_is_permanently_barred(struct gsm_bts *bts, unsigned int acc) { - OSMO_ASSERT(acc >= 0 && acc <= 9); + OSMO_ASSERT(acc <= 9); if (acc == 8 || acc == 9) return (bts->si_common.rach_control.t2 & (1 << (acc - 8))); return (bts->si_common.rach_control.t3 & (1 << (acc))); @@ -44,7 +44,7 @@ static void allow_one_acc(struct acc_ramp *acc_ramp, unsigned int acc) { - OSMO_ASSERT(acc >= 0 && acc <= 9); + OSMO_ASSERT(acc <= 9); if (acc_ramp->barred_accs & (1 << acc)) LOGP(DRSL, LOGL_NOTICE, "(bts=%d) ACC RAMP: allowing Access Control Class %u\n", acc_ramp->bts->nr, acc); acc_ramp->barred_accs &= ~(1 << acc); @@ -52,7 +52,7 @@ static void barr_one_acc(struct acc_ramp *acc_ramp, unsigned int acc) { - OSMO_ASSERT(acc >= 0 && acc <= 9); + OSMO_ASSERT(acc <= 9); if ((acc_ramp->barred_accs & (1 << acc)) == 0) LOGP(DRSL, LOGL_NOTICE, "(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/11408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I653ae9ede578370b4d7b1a150e9ec3c0702bbb31 Gerrit-Change-Number: 11408 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 10:27:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 10:27:34 +0000 Subject: Change in osmo-bsc[master]: subscr_conn_fsm: Fix null-pointer deref / N-CONNECT.ind from unknown MSC Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11409 Change subject: subscr_conn_fsm: Fix null-pointer deref / N-CONNECT.ind from unknown MSC ...................................................................... subscr_conn_fsm: Fix null-pointer deref / N-CONNECT.ind from unknown MSC Change-Id: Id0eca3dd729d2e4c8c6ff83f05efde00b42c16f1 Fixes: Coverity CID#188860 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/09/11409/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 52afd54..bca9e1f 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -276,8 +276,9 @@ if (!conn->sccp.msc) { LOGPFSML(fi, LOGL_NOTICE, "N-CONNECT.ind from unknown MSC %s\n", osmo_sccp_addr_dump(&scu_prim->u.connect.calling_addr)); - osmo_sccp_tx_disconn(conn->sccp.msc->a.sccp_user, scu_prim->u.connect.conn_id, - &scu_prim->u.connect.called_addr, 0); + /* We cannot find a way to the sccp_user without the MSC, so we cannot + * use osmo_sccp_tx_disconn() :( */ + //osmo_sccp_tx_disconn(conn->sccp.msc->a.sccp_user, scu_prim->u.connect.conn_id, &scu_prim->u.connect.called_addr, 0); osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); return; } -- To view, visit https://gerrit.osmocom.org/11409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id0eca3dd729d2e4c8c6ff83f05efde00b42c16f1 Gerrit-Change-Number: 11409 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 10:33:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 10:33:22 +0000 Subject: Change in libosmocore[master]: WIP: gsm_412 Cell Broadcast Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11410 Change subject: WIP: gsm_412 Cell Broadcast ...................................................................... WIP: gsm_412 Cell Broadcast Change-Id: I1a17c2ae8bf62150327956c10cb5bb896939e3fd --- M include/osmocom/gsm/protocol/gsm_04_12.h 1 file changed, 68 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/10/11410/1 diff --git a/include/osmocom/gsm/protocol/gsm_04_12.h b/include/osmocom/gsm/protocol/gsm_04_12.h index 826e69b..749e3d7 100644 --- a/include/osmocom/gsm/protocol/gsm_04_12.h +++ b/include/osmocom/gsm/protocol/gsm_04_12.h @@ -30,3 +30,71 @@ uint8_t cbsms_msg_map[6]; uint8_t data[0]; } __attribute__((packed)); + +/* Section 9.3: ?? */ + +/* 9.3.24: Warning Tyoe */ +#define GSM412_WARN_TYPE_EARTHQUAKE 0x00 +#define GSM412_WARN_TYPE_TSUNAMI 0x01 +#define GSM412_WARN_TYPE_QUAKE_ANDTSUNAMI 0x02 +#define GSM412_WARN_TYPE_TEST 0x03 +#define GSM412_WARN_TYPE_OTHER 0x04 +struct gsm412_warning_type { + uint16_t warning_type:7, + emerg_user_alert:1, + popup:1, + padding:7; +} __attribute__((packed)); + + +/* 9.3.25 */ +struct gsm412_warning_sec_info { + uint8_t year; + uint8_t month; + uint8_t day; + uint8_t hour; + uint8_t minute; + uint8_t second; + uint8_t timezone; + uint8_t signature[43]; +} __attribute__((packed)); + +/* Section 9.4: Message Format on the Radio Network - MS/UE Interface */ + +/* 9.4.1.2.1 Serial Number */ +#define GSM412_SERNR_GS_CELL_IMM 0 +#define GSM412_SERNR_GS_PLMN_NORM 1 +#define GSM412_SERNR_GS_LA_SA_TA_NORM 2 +#define GSM412_SERNR_GS_CELL_NORM 3 + +struct gsm412_9_serial_nr { + uint16_t gs:2, + msg_code:10, + update_nr: 4; +} __attribute__((packed)); + +/* 9.4.1.2.4 Page Parameter */ +struct gsm412_9_page_param { + uint8_t total_pages:4, + page_nr:4; +} __attribute__((packed)); + +/* 9.4.1.2 Message Parameter */ +struct gsm412_9_message { + struct gsm412_9_serial_nr ser_nr; /* 9.4.1.2.1 */ + uint16_t msg_id; /* 9.4.1.2.2 */ + uint8_t dcs; /* TS 23.038 */ + struct gsm412_9_page_param page_param; /* 9.4.1.2.4 */ + uint8_t content[0]; /* byte 7..88, i.e. 0-82 octets */ +} __attribute__((packed)); + +/* 9.4.1.3 ETWS Primary Notification Message */ +struct gsm412_9_etws_prim_notif_msg { + struct gsm412_9_serial_nr ser_nr; /* 9.4.1.2.1 */ + uint16_t msg_id; /* 9.4.1.2.2 */ + struct gsm412_warning_type warning_type; /* 9.3.24 */ + uint8_t warning_sec_info[50]; /* 9.3.25 */ +} __attribute__((packed)); + + +//struct gsm412_ -- To view, visit https://gerrit.osmocom.org/11410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1a17c2ae8bf62150327956c10cb5bb896939e3fd Gerrit-Change-Number: 11410 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 10:33:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 10:33:23 +0000 Subject: Change in libosmocore[master]: gsm23003: Add MME domain name related helper functions Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11411 Change subject: gsm23003: Add MME domain name related helper functions ...................................................................... gsm23003: Add MME domain name related helper functions osmo_gen_mme_group_domain(), osmo_gen_mme_group_domain() and osmo_gen_home_network_domain() Change-Id: Ia882d9db05ec0037e593aeebea21bc31adb680bb --- M include/osmocom/gsm/gsm23003.h M include/osmocom/gsm/protocol/gsm_23_003.h M src/gsm/gsm23003.c M src/gsm/libosmogsm.map 4 files changed, 61 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/11411/1 diff --git a/include/osmocom/gsm/gsm23003.h b/include/osmocom/gsm/gsm23003.h index fd4f369..0539fc7 100644 --- a/include/osmocom/gsm/gsm23003.h +++ b/include/osmocom/gsm/gsm23003.h @@ -120,3 +120,7 @@ int osmo_mnc_cmp(uint16_t a_mnc, bool a_mnc_3_digits, uint16_t b_mnc, bool b_mnc_3_digits); int osmo_plmn_cmp(const struct osmo_plmn_id *a, const struct osmo_plmn_id *b); + +int osmo_gen_home_network_domain(char *out, uint16_t mcc, uint16_t mnc); +int osmo_gen_mme_domain(char *out, uint8_t mmec, uint16_t mmegi, uint16_t mcc, uint16_t mnc); +int osmo_gen_mme_group_domain(char *out, uint16_t mmegi, uint16_t mcc, uint16_t mnc); diff --git a/include/osmocom/gsm/protocol/gsm_23_003.h b/include/osmocom/gsm/protocol/gsm_23_003.h index 0e66939..ee697ff 100644 --- a/include/osmocom/gsm/protocol/gsm_23_003.h +++ b/include/osmocom/gsm/protocol/gsm_23_003.h @@ -24,3 +24,9 @@ GSM23003_IMEI_SNR_NUM_DIGITS + 1) #define GSM23003_IMEISV_NUM_DIGITS (GSM23003_IMEI_TAC_NUM_DIGITS + \ GSM23003_IMEI_SNR_NUM_DIGITS + 2) + +/* Chapter 19.2 "epc.mnc000.mcc000.3gppnetwork.org" */ +#define GSM23003_HOME_NETWORK_DOMAIN_LEN 33 + +/* Chapter 19.4.2.4: "mmec00.mmegi0000.mme.epc.mnc000.mcc000.3gppnetwork.org" */ +#define GSM23003_MME_DOMAIN_LEN 55 diff --git a/src/gsm/gsm23003.c b/src/gsm/gsm23003.c index 2c3b21e..bb73364 100644 --- a/src/gsm/gsm23003.c +++ b/src/gsm/gsm23003.c @@ -297,3 +297,51 @@ return 1; return osmo_mnc_cmp(a->mnc, a->mnc_3_digits, b->mnc, b->mnc_3_digits); } + +/*! Generate TS 23.003 Section 19.2 Home Network Realm/Domain (text form) + * \param out[out] caller-provided output buffer, at least 33 bytes long + * \param mcc[in] Mobile Country Code + * \param mnc[in] Mobile Network Code + * \returns number of characters printed (excluding NUL); negative on error */ +int osmo_gen_home_network_domain(char *out, uint16_t mcc, uint16_t mnc) +{ + if (mcc > 999) + return -EINVAL; + if (mnc > 999) + return -EINVAL; + return sprintf(out, "epc.mnc%03u.mcc%03u.3gppnetwork.org", mcc, mnc); +} + +/*! Generate TS 23.003 Section 19.4.2.4 MME Domain (text form) + * \param out[out] caller-provided output buffer, at least 56 bytes long + * \param mmec[in] MME Code + * \param mmegi[in] MME Group Identifier + * \param mcc[in] Mobile Country Code + * \param mnc[in] Mobile Network Code + * \returns number of characters printed (excluding NUL); negative on error */ +int osmo_gen_mme_domain(char *out, uint8_t mmec, uint16_t mmegi, uint16_t mcc, uint16_t mnc) +{ + char domain[GSM23003_HOME_NETWORK_DOMAIN_LEN+1]; + int rc; + rc = osmo_gen_home_network_domain(domain, mcc, mnc); + if (rc < 0) + return rc; + return sprintf(out, "mmec%02x.mmegi%04x.mme.%s", mmec, mmegi, domain); +} + +/*! Generate TS 23.003 Section 19.4.2.4 MME Group Domain (text form) + * \param out[out] caller-provided output buffer, at least 56 bytes long + * \param mmec[in] MME Code + * \param mmegi[in] MME Group Identifier + * \param mcc[in] Mobile Country Code + * \param mnc[in] Mobile Network Code + * \returns number of characters printed (excluding NUL); negative on error */ +int osmo_gen_mme_group_domain(char *out, uint16_t mmegi, uint16_t mcc, uint16_t mnc) +{ + char domain[GSM23003_HOME_NETWORK_DOMAIN_LEN+1]; + int rc; + rc = osmo_gen_home_network_domain(domain, mcc, mnc); + if (rc < 0) + return rc; + return sprintf(out, "mmegi%04x.mme.%s", mmegi, domain); +} diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index dcc491d..103334b 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -318,6 +318,9 @@ osmo_mnc_from_str; osmo_mnc_cmp; osmo_plmn_cmp; +osmo_gen_home_network_domain; +osmo_gen_mme_domain; +osmo_gen_mme_group_domain; gsm48_chan_mode_names; gsm_chan_t_names; gsm48_pdisc_names; -- To view, visit https://gerrit.osmocom.org/11411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia882d9db05ec0037e593aeebea21bc31adb680bb Gerrit-Change-Number: 11411 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 10:33:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 10:33:23 +0000 Subject: Change in libosmocore[master]: SGsAP protocol definitions (header + C file) Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11412 Change subject: SGsAP protocol definitions (header + C file) ...................................................................... SGsAP protocol definitions (header + C file) Change-Id: Idddfc9b851eb4c2fa7dd661a9ce1b03a04883109 --- M include/Makefile.am A include/osmocom/gsm/protocol/gsm_29_118.h M src/gsm/Makefile.am A src/gsm/gsm29118.c M src/gsm/libosmogsm.map 5 files changed, 304 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/12/11412/1 diff --git a/include/Makefile.am b/include/Makefile.am index 19695d1..59a5fed 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -114,6 +114,7 @@ osmocom/gsm/protocol/gsm_09_02.h \ osmocom/gsm/protocol/gsm_12_21.h \ osmocom/gsm/protocol/gsm_23_003.h \ + osmocom/gsm/protocol/gsm_29_118.h \ osmocom/gsm/protocol/gsm_44_318.h \ osmocom/gsm/protocol/ipaccess.h \ osmocom/gsm/protocol/smpp34_osmocom.h \ diff --git a/include/osmocom/gsm/protocol/gsm_29_118.h b/include/osmocom/gsm/protocol/gsm_29_118.h new file mode 100644 index 0000000..24e9de2 --- /dev/null +++ b/include/osmocom/gsm/protocol/gsm_29_118.h @@ -0,0 +1,169 @@ +#pragma once + + +/* TS 29.118 Section 9.2 */ +enum sgsap_msg_type { + /* unassigned */ + SGSAP_MSGT_PAGING_REQ = 0x01, + SGSAP_MSGT_PAGING_REJ = 0x02, + /* unassigned */ + SGSAP_MSGT_SERVICE_REQ = 0x06, + SGSAP_MSGT_DL_UD = 0x07, + SGSAP_MSGT_UL_UD = 0x08, + SGSAP_MSGT_LOC_UPD_REQ = 0x09, + SGSAP_MSGT_LOC_UPD_ACK = 0x0a, + SGSAP_MSGT_LOC_UPD_REJ = 0x0b, + SGSAP_MSGT_TMSI_REALL_CMPL = 0x0c, + SGSAP_MSGT_ALERT_REQ = 0x0d, + SGSAP_MSGT_ALERT_ACK = 0x0e, + SGSAP_MSGT_ALERT_REJ = 0x0f, + SGSAP_MSGT_UE_ACT_IND = 0x10, + SGSAP_MSGT_EPS_DET_IND = 0x11, + SGSAP_MSGT_EPS_DET_ACK = 0x12, + SGSAP_MSGT_IMSI_DET_IND = 0x13, + SGSAP_MSGT_IMSI_DET_ACK = 0x14, + SGSAP_MSGT_RESET_IND = 0x15, + SGSAP_MSGT_RESET_ACK = 0x16, + SGSAP_MSGT_SERVICE_ABORT_REQ = 0x17, + SGSAP_MSGT_MO_CSFB_IND = 0x18, + /* unassigned */ + SGSAP_MSGT_MM_INFO_REQ = 0x1a, + SGSAP_MSGT_RELEASE_REQ = 0x1b, + /* unassigned */ + SGSAP_MSGT_STATUS = 0x1d, + /* unassigned */ + SGSAP_MSGT_UE_UNREACHABLE = 0x1f, +}; +const struct value_string sgsap_msg_type_names[]; +static inline const char *sgsap_msg_type_name(enum sgsap_msg_type msgt) { + return get_value_string(sgsap_msg_type_names, msgt); +} + +/* TS 29.118 Section 9.3 */ +enum sgsap_iei { + SGSAP_IE_IMSI = 0x01, + SGSAP_IE_VLR_NAME = 0x02, + SGSAP_IE_TMSI = 0x03, + SGSAP_IE_LAI = 0x04, + SGSAP_IE_CHAN_NEEDED = 0x05, + SGSAP_IE_EMLPP_PRIORITY = 0x06, + SGSAP_IE_TMSI_STATUS = 0x07, + SGSAP_IE_SGS_CAUSE = 0x08, + SGSAP_IE_MME_NAME = 0x09, + SGSAP_IE_EPS_LU_TYPE = 0x0a, + SGSAP_IE_GLOBAL_CN_ID = 0x0b, + SGSAP_IE_MOBILE_ID = 0x0e, + SGSAP_IE_REJECT_CAUSE = 0x0f, + SGSAP_IE_IMSI_DET_EPS_TYPE = 0x10, + SGSAP_IE_IMSI_DET_NONEPS_TYPE = 0x11, + SGSAP_IE_IMEISV = 0x15, + SGSAP_IE_NAS_MSG_CONTAINER = 0x16, + SGSAP_IE_MM_INFO = 0x17, + SGSAP_IE_ERR_MSG = 0x1b, + SGSAP_IE_CLI = 0x1c, + SGSAP_IE_LCS_CLIENT_ID = 0x1d, + SGSAP_IE_LCS_INDICATOR = 0x1e, + SGSAP_IE_SS_CODE = 0x1f, + SGSAP_IE_SERVICE_INDICATOR = 0x20, + SGSAP_IE_UE_TIMEZONE = 0x21, + SGSAP_IE_MS_CLASSMARK2 = 0x22, + SGSAP_IE_TAI = 0x23, + SGSAP_IE_EUTRAN_CGI = 0x24, + SGSAP_IE_UE_EMM_MODE = 0x25, + SGSAP_IE_ADDL_PAGING_INDICATORS = 0x26, + SGSAP_IE_TMSI_BASED_NRI_CONT = 0x27, +}; + + +/* TS 29.118 Section 9.4.2 */ +enum sgsap_eps_lu_type { + SGSAP_EPS_LUT_IMSI_ATTACH = 0x01, + SGSAP_EPS_LUT_NORMAL = 0x02, +}; +const struct value_string sgsap_eps_lu_type_names[]; +static inline const char *sgsap_eps_lu_type_name(enum sgsap_eps_lu_type lut) { + return get_value_string(sgsap_eps_lu_type_names, lut); +} + +/* TS 29.118 Section 9.4.7 */ +enum sgsap_imsi_det_eps_type { + SGSAP_ID_EPS_T_NETWORK_INITIATED = 0x01, + SGSAP_ID_EPS_T_UE_INITIATED = 0x02, + SGSAP_ID_EPS_T_EPS_NOT_ALLOWED = 0x03, +}; +const struct value_string sgsap_ismi_det_eps_type_names[]; +static inline const char *sgsap_imsi_det_eps_type_name(enum sgsap_imsi_det_eps_type idt) { + return get_value_string(sgsap_ismi_det_eps_type_names, idt); +} + +/* TS 29.118 Section 9.4.8 */ +enum sgsap_imsi_det_noneps_type { + SGSAP_ID_NONEPS_T_EXPLICIT_UE_NONEPS = 0x01, + SGSAP_ID_NONEPS_T_COMBINED_UE_EPS_NONEPS = 0x02, + SGSAP_ID_NONEPS_T_IMPLICIT_UE_EPS_NONEPS = 0x03, +}; +const struct value_string sgsap_ismi_det_noneps_type_names[]; +static inline const char *sgsap_imsi_det_noneps_type_name(enum sgsap_imsi_det_noneps_type idt) { + return get_value_string(sgsap_ismi_det_noneps_type_names, idt); +} + +/* TS 29.118 Section 9.4.17 */ +enum sgsap_service_ind { + SGSAP_SERV_IND_CS_CALL = 0x01, + SGSAP_SERV_IND_SMS = 0x02, +}; +const struct value_string sgsap_service_ind_names[]; +static inline const char *sgsap_service_ind_name(enum sgsap_service_ind si) { + return get_value_string(sgsap_service_ind_names, si); +} + +/* TS 29.118 Section 9.4.18 */ +enum sgsap_sgs_cause { + SGSAP_SGS_CAUSE_IMSI_DET_EPS = 0x01, + SGSAP_SGS_CAUSE_IMSI_DET_EPS_NONEPS = 0x02, + SGSAP_SGS_CAUSE_IMSI_UNKNOWN = 0x03, + SGSAP_SGS_CAUSE_IMSI_DET_NON_EPS = 0x04, + SGSAP_SGS_CAUSE_IMSI_IMPL_DET_NON_EPS = 0x05, + SGSAP_SGS_CAUSE_UE_UNREACHABLE = 0x06, + SGSAP_SGS_CAUSE_MSG_INCOMP_STATE = 0x07, + SGSAP_SGS_CAUSE_MISSING_MAND_IE = 0x08, + SGSAP_SGS_CAUSE_INVALID_MAND_IE = 0x09, + SGSAP_SGS_CAUSE_COND_IE_ERROR = 0x0a, + SGSAP_SGS_CAUSE_SEMANT_INCORR_MSG = 0x0b, + SGSAP_SGS_CAUSE_MSG_UNKNOWN = 0x0c, + SGSAP_SGS_CAUSE_MT_CSFB_REJ_USER = 0x0d, + SGSAP_SGS_CAUSE_UE_TEMP_UNREACHABLE = 0x0e, +}; +const struct value_string sgsap_sgs_cause_names[]; +static inline const char *sgsap_sgs_cause_name(enum sgsap_sgs_cause cause) { + return get_value_string(sgsap_sgs_cause_names, cause); +} + +/* TS 29.118 Section 9.4.21c */ +enum sgsap_ue_emm_mode { + SGSAP_UE_EMM_MODE_IDLE = 0x00, + SGSAP_UE_EMM_MODE_CONNECTED = 0x01, +}; +const struct value_string sgsap_ue_emm_mode_names[]; +static inline const char *sgsap_ue_emm_mode_name(enum sgsap_ue_emm_mode mode) { + return get_value_string(sgsap_ue_emm_mode_names, mode); +} + +/* TS 29.118 Section 10.1 Table 10.1.2 */ +#define SGS_TS5_DEFAULT 10 /* Guards the Paging Procedure at the VLR */ +#define SGS_TS6_2_DEFAULT 40 /* Guards the TMSI reallocation procedure */ +#define SGS_TS7_DEFAULT 4 /* Guards the non-EPS alert procedure */ +#define SGS_TS11_DEFAULT 4 /* Guards the VLR reset procedure */ +#define SGS_TS14_DEFAULT 10 /* Guards the UE fallback to UTRAN/GERAN */ +#define SGS_TS15_DEFAULT 10 /* Guards the MO UE fallback to UTRAN/GERAN */ + +/* TS 29.118 Section 10.2 Table 10.2.1 */ +#define SGS_NS7_DEFAULT 2 +#define SGS_NS11_DEFAULT 2 +/* TS 29.118 Section 10.2 Table 10.2.2 */ +#define SGS_NS8_DEFAULT 2 +#define SGS_NS9_DEFAULT 2 +#define SGS_NS10_DEFAULT 2 +#define SGS_NS12_DEFAULT 2 + +const struct tlv_definition sgsap_ie_tlvdef; diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 29299a6..e28ea33 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -30,7 +30,8 @@ milenage/aes-internal.c milenage/aes-internal-enc.c \ milenage/milenage.c gan.c ipa.c gsm0341.c apn.c \ gsup.c gprs_gea.c gsm0503_conv.c oap.c gsm0808_utils.c \ - gsm23003.c mncc.c bts_features.c oap_client.c + gsm23003.c mncc.c bts_features.c oap_client.c \ + gsm29118.c libgsmint_la_LDFLAGS = -no-undefined libgsmint_la_LIBADD = $(top_builddir)/src/libosmocore.la diff --git a/src/gsm/gsm29118.c b/src/gsm/gsm29118.c new file mode 100644 index 0000000..de625a9 --- /dev/null +++ b/src/gsm/gsm29118.c @@ -0,0 +1,123 @@ +#include +#include + +#include + +const struct value_string sgsap_msg_type_names[] = { + { SGSAP_MSGT_PAGING_REQ, "PAGING-REQUEST" }, + { SGSAP_MSGT_PAGING_REJ, "PAGING-REJECT" }, + { SGSAP_MSGT_SERVICE_REQ, "SERVICE-REQUEST" }, + { SGSAP_MSGT_DL_UD, "DOWNLINK-UNITDATA" }, + { SGSAP_MSGT_UL_UD, "UPLINK-UNITDATA" }, + { SGSAP_MSGT_LOC_UPD_REQ, "LOCATION-UPDATE-REQUEST" }, + { SGSAP_MSGT_LOC_UPD_ACK, "LOCATION-UPDATE-ACCEPT" }, + { SGSAP_MSGT_LOC_UPD_REJ, "LOCATION-UPDATE-REJECT" }, + { SGSAP_MSGT_TMSI_REALL_CMPL, "TMSI-REALLOCATION-COMPLETE" }, + { SGSAP_MSGT_ALERT_REQ, "ALERT-REQQUEST" }, + { SGSAP_MSGT_ALERT_ACK, "ALERT-ACK" }, + { SGSAP_MSGT_ALERT_REJ, "ALERT-REJECT" }, + { SGSAP_MSGT_UE_ACT_IND, "UE-ACTIVITY-INDICATION" }, + { SGSAP_MSGT_EPS_DET_IND, "EPS-DETACH-INDICATION" }, + { SGSAP_MSGT_EPS_DET_ACK, "EPS-DETACH-ACK" }, + { SGSAP_MSGT_IMSI_DET_IND, "IMSI-DETACH-INDICATION" }, + { SGSAP_MSGT_IMSI_DET_ACK, "IMSI-DETACH-ACK" }, + { SGSAP_MSGT_RESET_IND, "RESET-INDICATION" }, + { SGSAP_MSGT_RESET_ACK, "RESET-ACK" }, + { SGSAP_MSGT_SERVICE_ABORT_REQ, "SERVICE-ABORT-REQUEST" }, + { SGSAP_MSGT_MO_CSFB_IND, "MO-CSFB-INDICATION" }, + { SGSAP_MSGT_MM_INFO_REQ, "MM-INFO-REQUEST" }, + { SGSAP_MSGT_RELEASE_REQ, "RELEASE-REQUEST" }, + { SGSAP_MSGT_STATUS, "STATUS" }, + { SGSAP_MSGT_UE_UNREACHABLE, "UE-UNREACHABLE" }, + { 0, NULL } +}; + +const struct value_string sgsap_eps_lu_type_names[] = { + { SGSAP_EPS_LUT_IMSI_ATTACH, "IMSI Attach" }, + { SGSAP_EPS_LUT_NORMAL, "Normal" }, + { 0, NULL } +}; + +const struct value_string sgsap_ismi_det_eps_type_names[] = { + { SGSAP_ID_EPS_T_NETWORK_INITIATED, "Network initiated IMSI detach from EPS" }, + { SGSAP_ID_EPS_T_UE_INITIATED, "UE initiated IMSI detach from EPS" }, + { SGSAP_ID_EPS_T_EPS_NOT_ALLOWED, "EPS not allowed" }, + { 0, NULL } +}; + +const struct value_string sgsap_ismi_det_noneps_type_names[] = { + { SGSAP_ID_NONEPS_T_EXPLICIT_UE_NONEPS, + "Explicit UE initiated IMSI detach from non-EPS" }, + { SGSAP_ID_NONEPS_T_COMBINED_UE_EPS_NONEPS, + "Combined UE initiated IMSI detach from EPS and non-EPS" }, + { SGSAP_ID_NONEPS_T_IMPLICIT_UE_EPS_NONEPS, + "Implicit network initiated IMSI detach from EPS and non-EPS" }, + { 0, NULL } +}; + +const struct value_string sgsap_service_ind_names[] = { + { SGSAP_SERV_IND_CS_CALL, "CS Call" }, + { SGSAP_SERV_IND_SMS, "SMS" }, + { 0, NULL } +}; + +const struct value_string sgsap_sgs_cause_names[] = { + { SGSAP_SGS_CAUSE_IMSI_DET_EPS, "IMSI detached for EPS" }, + { SGSAP_SGS_CAUSE_IMSI_DET_EPS_NONEPS, "IMSI detached for EPS and non-EPS" }, + { SGSAP_SGS_CAUSE_IMSI_UNKNOWN, "IMSI unknown" }, + { SGSAP_SGS_CAUSE_IMSI_DET_NON_EPS, "IMSI detached for non-EPS" }, + { SGSAP_SGS_CAUSE_IMSI_IMPL_DET_NON_EPS,"IMSI implicitly detached for non-EPS" }, + { SGSAP_SGS_CAUSE_UE_UNREACHABLE, "UE unreachable" }, + { SGSAP_SGS_CAUSE_MSG_INCOMP_STATE, "Message not compatible with protocol state" }, + { SGSAP_SGS_CAUSE_MISSING_MAND_IE, "Missing mandatory IE" }, + { SGSAP_SGS_CAUSE_INVALID_MAND_IE, "Invalid mandatory IE" }, + { SGSAP_SGS_CAUSE_COND_IE_ERROR, "Conditional IE error" }, + { SGSAP_SGS_CAUSE_SEMANT_INCORR_MSG, "Semantically incorrect message" }, + { SGSAP_SGS_CAUSE_MSG_UNKNOWN, "Message unknown" }, + { SGSAP_SGS_CAUSE_MT_CSFB_REJ_USER, "MT CSFB call rejected by user" }, + { SGSAP_SGS_CAUSE_UE_TEMP_UNREACHABLE, "UE temporarily unreachable" }, + { 0, NULL } +}; + + +const struct value_string sgsap_ue_emm_mode_names[] = { + { SGSAP_UE_EMM_MODE_IDLE, "EMM-IDLE" }, + { SGSAP_UE_EMM_MODE_CONNECTED, "EMM-CONNECTED" }, + { 0, NULL } +}; + +const struct tlv_definition sgsap_ie_tlvdef = { + .def = { + [SGSAP_IE_IMSI] = { TLV_TYPE_TLV }, + [SGSAP_IE_VLR_NAME] = { TLV_TYPE_TLV }, + [SGSAP_IE_TMSI] = { TLV_TYPE_TLV }, + [SGSAP_IE_LAI] = { TLV_TYPE_TLV }, + [SGSAP_IE_CHAN_NEEDED] = { TLV_TYPE_TLV }, + [SGSAP_IE_EMLPP_PRIORITY] = { TLV_TYPE_TLV }, + [SGSAP_IE_TMSI_STATUS] = { TLV_TYPE_TLV }, + [SGSAP_IE_SGS_CAUSE] = { TLV_TYPE_TLV }, + [SGSAP_IE_MME_NAME] = { TLV_TYPE_TLV }, + [SGSAP_IE_EPS_LU_TYPE] = { TLV_TYPE_TLV }, + [SGSAP_IE_GLOBAL_CN_ID] = { TLV_TYPE_TLV }, + [SGSAP_IE_MOBILE_ID] = { TLV_TYPE_TLV }, + [SGSAP_IE_REJECT_CAUSE] = { TLV_TYPE_TLV }, + [SGSAP_IE_IMSI_DET_EPS_TYPE] = { TLV_TYPE_TLV }, + [SGSAP_IE_IMSI_DET_NONEPS_TYPE] = { TLV_TYPE_TLV }, + [SGSAP_IE_IMEISV] = { TLV_TYPE_TLV }, + [SGSAP_IE_NAS_MSG_CONTAINER] = { TLV_TYPE_TLV }, + [SGSAP_IE_MM_INFO] = { TLV_TYPE_TLV }, + [SGSAP_IE_ERR_MSG] = { TLV_TYPE_TLV }, + [SGSAP_IE_CLI] = { TLV_TYPE_TLV }, + [SGSAP_IE_LCS_CLIENT_ID] = { TLV_TYPE_TLV }, + [SGSAP_IE_LCS_INDICATOR] = { TLV_TYPE_TLV }, + [SGSAP_IE_SS_CODE] = { TLV_TYPE_TLV }, + [SGSAP_IE_SERVICE_INDICATOR] = { TLV_TYPE_TLV }, + [SGSAP_IE_UE_TIMEZONE] = { TLV_TYPE_TLV }, + [SGSAP_IE_MS_CLASSMARK2] = { TLV_TYPE_TLV }, + [SGSAP_IE_TAI] = { TLV_TYPE_TLV }, + [SGSAP_IE_EUTRAN_CGI] = { TLV_TYPE_TLV }, + [SGSAP_IE_UE_EMM_MODE] = { TLV_TYPE_TLV }, + [SGSAP_IE_ADDL_PAGING_INDICATORS]={ TLV_TYPE_TLV }, + [SGSAP_IE_TMSI_BASED_NRI_CONT] = { TLV_TYPE_TLV }, + }, +}; diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 103334b..3c05085 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -508,5 +508,14 @@ osmo_oap_client_init; osmo_oap_client_register; +sgsap_msg_type_names; +sgsap_eps_lu_type_names; +sgsap_ismi_det_eps_type_names; +sgsap_ismi_det_noneps_type_names; +sgsap_service_ind_names; +sgsap_sgs_cause_names; +sgsap_ue_emm_mode_names; +sgsap_ie_tlvdef; + local: *; }; -- To view, visit https://gerrit.osmocom.org/11412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idddfc9b851eb4c2fa7dd661a9ce1b03a04883109 Gerrit-Change-Number: 11412 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 10:33:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 10:33:23 +0000 Subject: Change in libosmocore[master]: timerfd_create(): Fix error handling of osmo_fd_register() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11413 Change subject: timerfd_create(): Fix error handling of osmo_fd_register() ...................................................................... timerfd_create(): Fix error handling of osmo_fd_register() Change-Id: Ia2528cc3e3155bbc9cb32dee0e3af99cc6e1c654 Closes: Coverity CID#188853 --- M src/select.c 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/11413/1 diff --git a/src/select.c b/src/select.c index 0b115c6..b07ad8c 100644 --- a/src/select.c +++ b/src/select.c @@ -324,11 +324,17 @@ ofd->when = BSC_FD_READ; if (ofd->fd < 0) { + int rc; + ofd->fd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK); if (ofd->fd < 0) return ofd->fd; - osmo_fd_register(ofd); + rc = osmo_fd_register(ofd); + if (rc < 0) { + close(ofd->fd); + return rc; + } } return 0; } -- To view, visit https://gerrit.osmocom.org/11413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2528cc3e3155bbc9cb32dee0e3af99cc6e1c654 Gerrit-Change-Number: 11413 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 10:56:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 10:56:33 +0000 Subject: Change in osmo-msc[master]: gsm0407_is_duplicate(): Handle error ret of gsm0407_pdisc_ctr_bin() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11414 Change subject: gsm0407_is_duplicate(): Handle error ret of gsm0407_pdisc_ctr_bin() ...................................................................... gsm0407_is_duplicate(): Handle error ret of gsm0407_pdisc_ctr_bin() Change-Id: If9525694bcbc5c6c0e622e899dd634dc11ed61c4 Fixes: Coverity CID#182702 --- M src/libmsc/gsm_04_08.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/14/11414/1 diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 0f52d09..d5cc212 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1397,7 +1397,8 @@ { struct gsm48_hdr *gh; uint8_t pdisc; - uint8_t n_sd, modulo, bin; + uint8_t n_sd, modulo; + int bin; gh = msgb_l3(msg); pdisc = gsm48_hdr_pdisc(gh); -- To view, visit https://gerrit.osmocom.org/11414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If9525694bcbc5c6c0e622e899dd634dc11ed61c4 Gerrit-Change-Number: 11414 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:06:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:06:02 +0000 Subject: Change in osmo-bts[master]: scheduler_trx.c: Switch to osmo_timerfd() of libosmocore >= 0.12.0 Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11415 Change subject: scheduler_trx.c: Switch to osmo_timerfd() of libosmocore >= 0.12.0 ...................................................................... scheduler_trx.c: Switch to osmo_timerfd() of libosmocore >= 0.12.0 Change-Id: I721d493659fde57eca1543b2e63171df1be1279d Fixes: Coverity CID#178646 --- M configure.ac M src/osmo-bts-trx/scheduler_trx.c 2 files changed, 10 insertions(+), 72 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/15/11415/1 diff --git a/configure.ac b/configure.ac index 38e6713..f2d4f84 100644 --- a/configure.ac +++ b/configure.ac @@ -62,12 +62,12 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.12.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.12.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.12.0) +PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 0.12.0) +PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 0.12.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 0.5.0) diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 4bac235..fa3aed2 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -1434,68 +1434,6 @@ ts->tv_nsec = ts->tv_nsec % 1000000000; } -/*! disable the osmocom-wrapped timerfd */ -/* FIXME: Use libosmocore after release with Ibeffba7c997252c003723bcd5d14122c4ded2fe7 was made */ -static int timer_ofd_disable(struct osmo_fd *ofd) -{ - const struct itimerspec its_null = { - .it_value = { 0, 0 }, - .it_interval = { 0, 0 }, - }; - return timerfd_settime(ofd->fd, 0, &its_null, NULL); -} - -/*! schedule the osmcoom-wrapped timerfd to occur first at \a first, then periodically at \a interval - * \param[in] ofd Osmocom wrapped timerfd - * \param[in] first Relative time at which the timer should first execute (NULL = \a interval) - * \param[in] interval Time interval at which subsequent timer shall fire - * \returns 0 on success; negative on error */ -/* FIXME: Use libosmocore after release with Ibeffba7c997252c003723bcd5d14122c4ded2fe7 was made */ -static int timer_ofd_schedule(struct osmo_fd *ofd, const struct timespec *first, - const struct timespec *interval) -{ - struct itimerspec its; - - if (ofd->fd < 0) - return -EINVAL; - - /* first expiration */ - if (first) - its.it_value = *first; - else - its.it_value = *interval; - /* repeating interval */ - its.it_interval = *interval; - - return timerfd_settime(ofd->fd, 0, &its, NULL); -} - -/*! setup osmocom-wrapped timerfd - * \param[inout] ofd Osmocom-wrapped timerfd on which to operate - * \param[in] cb Call-back function called when timerfd becomes readable - * \param[in] data Opaque data to be passed on to call-back - * \returns 0 on success; negative on error - * - * We simply initialize the data structures here, but do not yet - * schedule the timer. - */ -/* FIXME: Use libosmocore after release with Ibeffba7c997252c003723bcd5d14122c4ded2fe7 was made */ -static int timer_ofd_setup(struct osmo_fd *ofd, int (*cb)(struct osmo_fd *, unsigned int), void *data) -{ - ofd->cb = cb; - ofd->data = data; - ofd->when = BSC_FD_READ; - - if (ofd->fd < 0) { - ofd->fd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK); - if (ofd->fd < 0) - return ofd->fd; - - osmo_fd_register(ofd); - } - return 0; -} - /*! Increment a GSM frame number modulo GSM_HYPERFRAME */ #define INCREMENT_FN(fn) (fn) = (((fn) + 1) % GSM_HYPERFRAME) @@ -1557,7 +1495,7 @@ return 0; no_clock: - timer_ofd_disable(&tcs->fn_timer_ofd); + osmo_timerfd_disable(&tcs->fn_timer_ofd); transceiver_available = 0; bts_shutdown(bts, "No clock from osmo-trx"); @@ -1575,8 +1513,8 @@ trx_sched_fn(bts, tcs->last_fn_timer.fn); /* schedule first FN clock timer */ - timer_ofd_setup(&tcs->fn_timer_ofd, trx_fn_timer_cb, bts); - timer_ofd_schedule(&tcs->fn_timer_ofd, NULL, interval); + osmo_timerfd_setup(&tcs->fn_timer_ofd, trx_fn_timer_cb, bts); + osmo_timerfd_schedule(&tcs->fn_timer_ofd, NULL, interval); tcs->last_fn_timer.tv = *tv_now; tcs->last_clk_ind.tv = *tv_now; @@ -1666,7 +1604,7 @@ normalize_timespec(&first); LOGP(DL1C, LOGL_NOTICE, "We were %d FN faster than TRX, compensating\n", -elapsed_fn); /* set time to the time our next FN has to be transmitted */ - timer_ofd_schedule(&tcs->fn_timer_ofd, &first, &interval); + osmo_timerfd_schedule(&tcs->fn_timer_ofd, &first, &interval); return 0; } -- To view, visit https://gerrit.osmocom.org/11415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I721d493659fde57eca1543b2e63171df1be1279d Gerrit-Change-Number: 11415 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:23:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:23:35 +0000 Subject: Change in libosmocore[master]: telnet_interface: avoid double-close of fd() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11416 Change subject: telnet_interface: avoid double-close of fd() ...................................................................... telnet_interface: avoid double-close of fd() Change-Id: Ibd81f29fa22d53553bd73c055d6a1f5255a69bad Fixes: Coverity CID#135238 --- M src/vty/telnet_interface.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/16/11416/1 diff --git a/src/vty/telnet_interface.c b/src/vty/telnet_interface.c index 0ccf8dc..fdd88c1 100644 --- a/src/vty/telnet_interface.c +++ b/src/vty/telnet_interface.c @@ -177,7 +177,7 @@ connection->vty = vty_create(new_connection, connection); if (!connection->vty) { LOGP(0, LOGL_ERROR, "couldn't create VTY\n"); - close(new_connection); + /* vty_create() is already closing the fd if it returns NULL */ talloc_free(connection); return -1; } -- To view, visit https://gerrit.osmocom.org/11416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd81f29fa22d53553bd73c055d6a1f5255a69bad Gerrit-Change-Number: 11416 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:23:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:23:35 +0000 Subject: Change in libosmocore[master]: vty.c: Set vty->fd to -1 after closing the FD Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11417 Change subject: vty.c: Set vty->fd to -1 after closing the FD ...................................................................... vty.c: Set vty->fd to -1 after closing the FD Change-Id: I07d105f4a810dd809fbf6feb5c04e7410020c887 --- M src/vty/vty.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/11417/1 diff --git a/src/vty/vty.c b/src/vty/vty.c index ad53537..70f6811 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -221,8 +221,10 @@ vector_unset(vtyvec, vty->fd); /* Close socket. */ - if (vty->fd > 0) + if (vty->fd > 0) { close(vty->fd); + vty->fd = -1; + } if (vty->buf) { talloc_free(vty->buf); -- To view, visit https://gerrit.osmocom.org/11417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I07d105f4a810dd809fbf6feb5c04e7410020c887 Gerrit-Change-Number: 11417 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:30:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:30:13 +0000 Subject: Change in osmo-ggsn[master]: sgsnemu: Fix printing of tun device name Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11418 Change subject: sgsnemu: Fix printing of tun device name ...................................................................... sgsnemu: Fix printing of tun device name Change-Id: I6cd89b7b59a6c1d506cfbe9d3088cb844d133313 Fixes: Coverity CID#178638 --- M sgsnemu/sgsnemu.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/18/11418/1 diff --git a/sgsnemu/sgsnemu.c b/sgsnemu/sgsnemu.c index 1e61a09..a2220f0 100644 --- a/sgsnemu/sgsnemu.c +++ b/sgsnemu/sgsnemu.c @@ -293,7 +293,7 @@ printf("timelimit: %d\n", args_info.timelimit_arg); printf("createif: %d\n", args_info.createif_flag); if (args_info.tun_device_arg) - printf("tun-device: %d\n", args_info.tun_device_arg); + printf("tun-device: %s\n", args_info.tun_device_arg); if (args_info.ipup_arg) printf("ipup: %s\n", args_info.ipup_arg); if (args_info.ipdown_arg) -- To view, visit https://gerrit.osmocom.org/11418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6cd89b7b59a6c1d506cfbe9d3088cb844d133313 Gerrit-Change-Number: 11418 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:30:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:30:13 +0000 Subject: Change in osmo-ggsn[master]: ippool.c: Use "%td" format string for ptrdiff_t Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11419 Change subject: ippool.c: Use "%td" format string for ptrdiff_t ...................................................................... ippool.c: Use "%td" format string for ptrdiff_t Change-Id: Iacafa0919baebac6b5a799deb41a673c022c6743 Fixes: Coverity CID#135225 --- M lib/ippool.c 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/19/11419/1 diff --git a/lib/ippool.c b/lib/ippool.c index a9a64be..6561f1f 100644 --- a/lib/ippool.c +++ b/lib/ippool.c @@ -26,16 +26,16 @@ { unsigned int n; printf("ippool_printaddr\n"); - printf("Firstdyn %d\n", this->firstdyn - this->member); - printf("Lastdyn %d\n", this->lastdyn - this->member); - printf("Firststat %d\n", this->firststat - this->member); - printf("Laststat %d\n", this->laststat - this->member); - printf("Listsize %d\n", this->listsize); + printf("Firstdyn %td\n", this->firstdyn - this->member); + printf("Lastdyn %td\n", this->lastdyn - this->member); + printf("Firststat %td\n", this->firststat - this->member); + printf("Laststat %td\n", this->laststat - this->member); + printf("Listsize %td\n", this->listsize); for (n = 0; n < this->listsize; n++) { char s[256]; in46a_ntop(&this->member[n].addr, s, sizeof(s)); - printf("Unit %d inuse %d prev %d next %d addr %s\n", + printf("Unit %d inuse %d prev %td next %td addr %s\n", n, this->member[n].inuse, this->member[n].prev - this->member, -- To view, visit https://gerrit.osmocom.org/11419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iacafa0919baebac6b5a799deb41a673c022c6743 Gerrit-Change-Number: 11419 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:38:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:38:37 +0000 Subject: Change in osmo-bsc[master]: bssmap_handle_cipher_mode(): Don't sent reject if !conn Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11420 Change subject: bssmap_handle_cipher_mode(): Don't sent reject if !conn ...................................................................... bssmap_handle_cipher_mode(): Don't sent reject if !conn We can only send a reject response if we have a valid conn. Change-Id: I0ea535f494173ad4996c70dc82d7f69455e4e15e Fixes: Coverity CID#188824 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/20/11420/1 diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 537b851..a20d5d0 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -439,7 +439,7 @@ if (!conn) { LOGP(DMSC, LOGL_ERROR, "No lchan/msc_data in cipher mode command.\n"); - goto reject; + return -1; } if (conn->ciphering_handled) { -- To view, visit https://gerrit.osmocom.org/11420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0ea535f494173ad4996c70dc82d7f69455e4e15e Gerrit-Change-Number: 11420 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:38:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:38:38 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Fix open() return value checking Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11421 Change subject: ipaccess-config: Fix open() return value checking ...................................................................... ipaccess-config: Fix open() return value checking open() returning 0 is valid, but negative values indicate errors. Change-Id: Id7e62116bfee550ef9906e78a0fce6f28af27a97 Fixes: Coverity CID#57865 --- M src/ipaccess/ipaccess-config.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/21/11421/1 diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 079bae2..5491700 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -634,7 +634,7 @@ INIT_LLIST_HEAD(entry); fd = open(filename, O_RDONLY); - if (!fd) { + if (fd < 0) { perror("nada"); return -1; } @@ -729,7 +729,7 @@ printf("Opening possible firmware '%s'\n", filename); fd = open(filename, O_RDONLY); - if (!fd) { + if (fd < 0) { perror("nada"); return; } -- To view, visit https://gerrit.osmocom.org/11421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id7e62116bfee550ef9906e78a0fce6f28af27a97 Gerrit-Change-Number: 11421 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:41:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:41:29 +0000 Subject: Change in osmo-iuh[master]: hnbgw_tx_hnb_register_rej(): Missing return statement In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11400 ) Change subject: hnbgw_tx_hnb_register_rej(): Missing return statement ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0bdee8ede9ffdc16c16a4f5723acb7b4bceb2158 Gerrit-Change-Number: 11400 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 11:41:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:41:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:41:30 +0000 Subject: Change in osmo-iuh[master]: hnbgw_tx_hnb_register_rej(): Missing return statement In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11400 ) Change subject: hnbgw_tx_hnb_register_rej(): Missing return statement ...................................................................... hnbgw_tx_hnb_register_rej(): Missing return statement Change-Id: I0bdee8ede9ffdc16c16a4f5723acb7b4bceb2158 Fixes: Coverity CID#188869 --- M src/hnbgw_hnbap.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/hnbgw_hnbap.c b/src/hnbgw_hnbap.c index 2a19dda..1d50d4d 100644 --- a/src/hnbgw_hnbap.c +++ b/src/hnbgw_hnbap.c @@ -85,7 +85,10 @@ } else { /* The message was not queued. Destroy the connection right away. */ hnb_context_release(ctx); + return rc; } + + return 0; } static int hnbgw_tx_hnb_register_acc(struct hnb_context *ctx) -- To view, visit https://gerrit.osmocom.org/11400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0bdee8ede9ffdc16c16a4f5723acb7b4bceb2158 Gerrit-Change-Number: 11400 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:41:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:41:46 +0000 Subject: Change in osmo-ggsn[master]: sgsnemu: Use in46a_from_eua() with array of in46_addr In-Reply-To: References: Message-ID: Harald Welte has abandoned this change. ( https://gerrit.osmocom.org/11404 ) Change subject: sgsnemu: Use in46a_from_eua() with array of in46_addr ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ie5a572a507d0556736a661cd3c1216e1e2a2a5df Gerrit-Change-Number: 11404 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:42:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:42:20 +0000 Subject: Change in osmo-mgw[master]: check_rtp_origin(): Don't memcmp sockadd_in and in_addr In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11402 ) Change subject: check_rtp_origin(): Don't memcmp sockadd_in and in_addr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic64256619ef893d625400e8b1b573ea2c629ed9c Gerrit-Change-Number: 11402 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 11:42:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:42:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:42:22 +0000 Subject: Change in osmo-mgw[master]: check_rtp_origin(): Avoid using memcmp for comparing integer types In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11403 ) Change subject: check_rtp_origin(): Avoid using memcmp for comparing integer types ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic6105d39ae2fb4b301f87448b16763fe9f695621 Gerrit-Change-Number: 11403 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 11:42:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:42:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:42:34 +0000 Subject: Change in osmo-bsc[master]: range_enc_determine_range(): Don't dereference array on size=0 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11397 ) Change subject: range_enc_determine_range(): Don't dereference array on size=0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5bbb10af8b8e8ebc22bf79f5468e71a41b5e74b3 Gerrit-Change-Number: 11397 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 11:42:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:42:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:42:56 +0000 Subject: Change in osmo-bsc[master]: ipaccess-proxy: Add error handling to IAP CCM ID RESP parsing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11407 ) Change subject: ipaccess-proxy: Add error handling to IAP CCM ID RESP parsing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I56ec149979572486b904fc1409cf3cd096b6eb34 Gerrit-Change-Number: 11407 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 11:42:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:43:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:43:09 +0000 Subject: Change in osmo-bsc[master]: acc_ramp: An unsigned int is always >= 0 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11408 ) Change subject: acc_ramp: An unsigned int is always >= 0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I653ae9ede578370b4d7b1a150e9ec3c0702bbb31 Gerrit-Change-Number: 11408 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 11:43:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:43:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:43:17 +0000 Subject: Change in osmo-bsc[master]: subscr_conn_fsm: Fix null-pointer deref / N-CONNECT.ind from unknown MSC In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11409 ) Change subject: subscr_conn_fsm: Fix null-pointer deref / N-CONNECT.ind from unknown MSC ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id0eca3dd729d2e4c8c6ff83f05efde00b42c16f1 Gerrit-Change-Number: 11409 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 11:43:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:43:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:43:25 +0000 Subject: Change in osmo-bsc[master]: bssmap_handle_cipher_mode(): Don't sent reject if !conn In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11420 ) Change subject: bssmap_handle_cipher_mode(): Don't sent reject if !conn ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0ea535f494173ad4996c70dc82d7f69455e4e15e Gerrit-Change-Number: 11420 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 11:43:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:43:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:43:34 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Fix open() return value checking In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11421 ) Change subject: ipaccess-config: Fix open() return value checking ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id7e62116bfee550ef9906e78a0fce6f28af27a97 Gerrit-Change-Number: 11421 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 11:43:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:43:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:43:47 +0000 Subject: Change in osmo-ggsn[master]: sgsnemu: Fix printing of tun device name In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11418 ) Change subject: sgsnemu: Fix printing of tun device name ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6cd89b7b59a6c1d506cfbe9d3088cb844d133313 Gerrit-Change-Number: 11418 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 11:43:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:43:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:43:48 +0000 Subject: Change in osmo-ggsn[master]: ippool.c: Use "%td" format string for ptrdiff_t In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11419 ) Change subject: ippool.c: Use "%td" format string for ptrdiff_t ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iacafa0919baebac6b5a799deb41a673c022c6743 Gerrit-Change-Number: 11419 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 11:43:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:43:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:43:50 +0000 Subject: Change in osmo-ggsn[master]: sgsnemu: Fix printing of tun device name In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11418 ) Change subject: sgsnemu: Fix printing of tun device name ...................................................................... sgsnemu: Fix printing of tun device name Change-Id: I6cd89b7b59a6c1d506cfbe9d3088cb844d133313 Fixes: Coverity CID#178638 --- M sgsnemu/sgsnemu.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/sgsnemu/sgsnemu.c b/sgsnemu/sgsnemu.c index 1e61a09..a2220f0 100644 --- a/sgsnemu/sgsnemu.c +++ b/sgsnemu/sgsnemu.c @@ -293,7 +293,7 @@ printf("timelimit: %d\n", args_info.timelimit_arg); printf("createif: %d\n", args_info.createif_flag); if (args_info.tun_device_arg) - printf("tun-device: %d\n", args_info.tun_device_arg); + printf("tun-device: %s\n", args_info.tun_device_arg); if (args_info.ipup_arg) printf("ipup: %s\n", args_info.ipup_arg); if (args_info.ipdown_arg) -- To view, visit https://gerrit.osmocom.org/11418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6cd89b7b59a6c1d506cfbe9d3088cb844d133313 Gerrit-Change-Number: 11418 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:43:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:43:50 +0000 Subject: Change in osmo-ggsn[master]: ippool.c: Use "%td" format string for ptrdiff_t In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11419 ) Change subject: ippool.c: Use "%td" format string for ptrdiff_t ...................................................................... ippool.c: Use "%td" format string for ptrdiff_t Change-Id: Iacafa0919baebac6b5a799deb41a673c022c6743 Fixes: Coverity CID#135225 --- M lib/ippool.c 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/lib/ippool.c b/lib/ippool.c index a9a64be..6561f1f 100644 --- a/lib/ippool.c +++ b/lib/ippool.c @@ -26,16 +26,16 @@ { unsigned int n; printf("ippool_printaddr\n"); - printf("Firstdyn %d\n", this->firstdyn - this->member); - printf("Lastdyn %d\n", this->lastdyn - this->member); - printf("Firststat %d\n", this->firststat - this->member); - printf("Laststat %d\n", this->laststat - this->member); - printf("Listsize %d\n", this->listsize); + printf("Firstdyn %td\n", this->firstdyn - this->member); + printf("Lastdyn %td\n", this->lastdyn - this->member); + printf("Firststat %td\n", this->firststat - this->member); + printf("Laststat %td\n", this->laststat - this->member); + printf("Listsize %td\n", this->listsize); for (n = 0; n < this->listsize; n++) { char s[256]; in46a_ntop(&this->member[n].addr, s, sizeof(s)); - printf("Unit %d inuse %d prev %d next %d addr %s\n", + printf("Unit %d inuse %d prev %td next %td addr %s\n", n, this->member[n].inuse, this->member[n].prev - this->member, -- To view, visit https://gerrit.osmocom.org/11419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iacafa0919baebac6b5a799deb41a673c022c6743 Gerrit-Change-Number: 11419 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:44:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:44:32 +0000 Subject: Change in libosmocore[master]: telnet_interface: avoid double-close of fd() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11416 ) Change subject: telnet_interface: avoid double-close of fd() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibd81f29fa22d53553bd73c055d6a1f5255a69bad Gerrit-Change-Number: 11416 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 11:44:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:44:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:44:36 +0000 Subject: Change in libosmocore[master]: vty.c: Set vty->fd to -1 after closing the FD In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11417 ) Change subject: vty.c: Set vty->fd to -1 after closing the FD ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I07d105f4a810dd809fbf6feb5c04e7410020c887 Gerrit-Change-Number: 11417 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 11:44:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:46:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:46:21 +0000 Subject: Change in libosmocore[master]: timerfd_create(): Fix error handling of osmo_fd_register() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11413 to look at the new patch set (#3). Change subject: timerfd_create(): Fix error handling of osmo_fd_register() ...................................................................... timerfd_create(): Fix error handling of osmo_fd_register() Change-Id: Ia2528cc3e3155bbc9cb32dee0e3af99cc6e1c654 Closes: Coverity CID#188853 --- M src/select.c 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/11413/3 -- To view, visit https://gerrit.osmocom.org/11413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia2528cc3e3155bbc9cb32dee0e3af99cc6e1c654 Gerrit-Change-Number: 11413 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:46:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:46:40 +0000 Subject: Change in libosmocore[master]: timerfd_create(): Fix error handling of osmo_fd_register() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11413 ) Change subject: timerfd_create(): Fix error handling of osmo_fd_register() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia2528cc3e3155bbc9cb32dee0e3af99cc6e1c654 Gerrit-Change-Number: 11413 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 11:46:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:47:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:47:18 +0000 Subject: Change in osmo-bts[master]: scheduler_trx.c: Switch to osmo_timerfd() of libosmocore >= 0.12.0 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11415 ) Change subject: scheduler_trx.c: Switch to osmo_timerfd() of libosmocore >= 0.12.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I721d493659fde57eca1543b2e63171df1be1279d Gerrit-Change-Number: 11415 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 11:47:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:47:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:47:20 +0000 Subject: Change in osmo-bts[master]: scheduler_trx.c: Switch to osmo_timerfd() of libosmocore >= 0.12.0 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11415 ) Change subject: scheduler_trx.c: Switch to osmo_timerfd() of libosmocore >= 0.12.0 ...................................................................... scheduler_trx.c: Switch to osmo_timerfd() of libosmocore >= 0.12.0 Change-Id: I721d493659fde57eca1543b2e63171df1be1279d Fixes: Coverity CID#178646 --- M configure.ac M src/osmo-bts-trx/scheduler_trx.c 2 files changed, 10 insertions(+), 72 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 38e6713..f2d4f84 100644 --- a/configure.ac +++ b/configure.ac @@ -62,12 +62,12 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.12.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.12.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.12.0) +PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 0.12.0) +PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 0.12.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 0.5.0) diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 4bac235..fa3aed2 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -1434,68 +1434,6 @@ ts->tv_nsec = ts->tv_nsec % 1000000000; } -/*! disable the osmocom-wrapped timerfd */ -/* FIXME: Use libosmocore after release with Ibeffba7c997252c003723bcd5d14122c4ded2fe7 was made */ -static int timer_ofd_disable(struct osmo_fd *ofd) -{ - const struct itimerspec its_null = { - .it_value = { 0, 0 }, - .it_interval = { 0, 0 }, - }; - return timerfd_settime(ofd->fd, 0, &its_null, NULL); -} - -/*! schedule the osmcoom-wrapped timerfd to occur first at \a first, then periodically at \a interval - * \param[in] ofd Osmocom wrapped timerfd - * \param[in] first Relative time at which the timer should first execute (NULL = \a interval) - * \param[in] interval Time interval at which subsequent timer shall fire - * \returns 0 on success; negative on error */ -/* FIXME: Use libosmocore after release with Ibeffba7c997252c003723bcd5d14122c4ded2fe7 was made */ -static int timer_ofd_schedule(struct osmo_fd *ofd, const struct timespec *first, - const struct timespec *interval) -{ - struct itimerspec its; - - if (ofd->fd < 0) - return -EINVAL; - - /* first expiration */ - if (first) - its.it_value = *first; - else - its.it_value = *interval; - /* repeating interval */ - its.it_interval = *interval; - - return timerfd_settime(ofd->fd, 0, &its, NULL); -} - -/*! setup osmocom-wrapped timerfd - * \param[inout] ofd Osmocom-wrapped timerfd on which to operate - * \param[in] cb Call-back function called when timerfd becomes readable - * \param[in] data Opaque data to be passed on to call-back - * \returns 0 on success; negative on error - * - * We simply initialize the data structures here, but do not yet - * schedule the timer. - */ -/* FIXME: Use libosmocore after release with Ibeffba7c997252c003723bcd5d14122c4ded2fe7 was made */ -static int timer_ofd_setup(struct osmo_fd *ofd, int (*cb)(struct osmo_fd *, unsigned int), void *data) -{ - ofd->cb = cb; - ofd->data = data; - ofd->when = BSC_FD_READ; - - if (ofd->fd < 0) { - ofd->fd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK); - if (ofd->fd < 0) - return ofd->fd; - - osmo_fd_register(ofd); - } - return 0; -} - /*! Increment a GSM frame number modulo GSM_HYPERFRAME */ #define INCREMENT_FN(fn) (fn) = (((fn) + 1) % GSM_HYPERFRAME) @@ -1557,7 +1495,7 @@ return 0; no_clock: - timer_ofd_disable(&tcs->fn_timer_ofd); + osmo_timerfd_disable(&tcs->fn_timer_ofd); transceiver_available = 0; bts_shutdown(bts, "No clock from osmo-trx"); @@ -1575,8 +1513,8 @@ trx_sched_fn(bts, tcs->last_fn_timer.fn); /* schedule first FN clock timer */ - timer_ofd_setup(&tcs->fn_timer_ofd, trx_fn_timer_cb, bts); - timer_ofd_schedule(&tcs->fn_timer_ofd, NULL, interval); + osmo_timerfd_setup(&tcs->fn_timer_ofd, trx_fn_timer_cb, bts); + osmo_timerfd_schedule(&tcs->fn_timer_ofd, NULL, interval); tcs->last_fn_timer.tv = *tv_now; tcs->last_clk_ind.tv = *tv_now; @@ -1666,7 +1604,7 @@ normalize_timespec(&first); LOGP(DL1C, LOGL_NOTICE, "We were %d FN faster than TRX, compensating\n", -elapsed_fn); /* set time to the time our next FN has to be transmitted */ - timer_ofd_schedule(&tcs->fn_timer_ofd, &first, &interval); + osmo_timerfd_schedule(&tcs->fn_timer_ofd, &first, &interval); return 0; } -- To view, visit https://gerrit.osmocom.org/11415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I721d493659fde57eca1543b2e63171df1be1279d Gerrit-Change-Number: 11415 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:48:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:48:00 +0000 Subject: Change in osmo-trx[master]: SocketsTest.testReaderIP(): Zero terminate received buffer In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11405 ) Change subject: SocketsTest.testReaderIP(): Zero terminate received buffer ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icd144e672ab15cfb0955897dd6eb529c56908eba Gerrit-Change-Number: 11405 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 11:48:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:48:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:48:03 +0000 Subject: Change in osmo-trx[master]: SocketsTest.testReaderIP(): Zero terminate received buffer In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11405 ) Change subject: SocketsTest.testReaderIP(): Zero terminate received buffer ...................................................................... SocketsTest.testReaderIP(): Zero terminate received buffer Change-Id: Icd144e672ab15cfb0955897dd6eb529c56908eba --- M tests/CommonLibs/SocketsTest.cpp 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/CommonLibs/SocketsTest.cpp b/tests/CommonLibs/SocketsTest.cpp index eb92e25..e4eef54 100644 --- a/tests/CommonLibs/SocketsTest.cpp +++ b/tests/CommonLibs/SocketsTest.cpp @@ -47,9 +47,10 @@ readSocket->nonblocking(); int rc = 0; while (rcread(buf, MAX_UDP_LENGTH); if (count>0) { + buf[count] = 0; CERR("read: " << buf); rc++; } else { -- To view, visit https://gerrit.osmocom.org/11405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icd144e672ab15cfb0955897dd6eb529c56908eba Gerrit-Change-Number: 11405 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:48:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:48:36 +0000 Subject: Change in osmo-trx[master]: trx_validate_config(): Fix validation of rx_sps In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11406 to look at the new patch set (#2). Change subject: trx_validate_config(): Fix validation of rx_sps ...................................................................... trx_validate_config(): Fix validation of rx_sps Change-Id: I7e932cff59335add09c76caba6f9ac1e7cf69022 Fixes: Coverity CID#188871 --- M Transceiver52M/osmo-trx.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/06/11406/2 -- To view, visit https://gerrit.osmocom.org/11406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7e932cff59335add09c76caba6f9ac1e7cf69022 Gerrit-Change-Number: 11406 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:49:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:49:00 +0000 Subject: Change in osmo-trx[master]: trx_validate_config(): Fix validation of rx_sps In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11406 ) Change subject: trx_validate_config(): Fix validation of rx_sps ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7e932cff59335add09c76caba6f9ac1e7cf69022 Gerrit-Change-Number: 11406 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Assignee: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 21 Oct 2018 11:49:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:49:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:49:16 +0000 Subject: Change in osmo-msc[master]: gsm0407_is_duplicate(): Handle error ret of gsm0407_pdisc_ctr_bin() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11414 ) Change subject: gsm0407_is_duplicate(): Handle error ret of gsm0407_pdisc_ctr_bin() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If9525694bcbc5c6c0e622e899dd634dc11ed61c4 Gerrit-Change-Number: 11414 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 11:49:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 11:49:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 11:49:29 +0000 Subject: Change in osmo-pcu[master]: gprs_rlcmac_received_lost(): Fix regression / uninitialized now_tv In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11401 ) Change subject: gprs_rlcmac_received_lost(): Fix regression / uninitialized now_tv ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieced0c62700b2fe4ab0208258183154cc701490b Gerrit-Change-Number: 11401 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Assignee: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Sun, 21 Oct 2018 11:49:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:10:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:10:57 +0000 Subject: Change in libosmocore[master]: timerfd_create(): Fix error handling of osmo_fd_register() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11413 ) Change subject: timerfd_create(): Fix error handling of osmo_fd_register() ...................................................................... timerfd_create(): Fix error handling of osmo_fd_register() Change-Id: Ia2528cc3e3155bbc9cb32dee0e3af99cc6e1c654 Closes: Coverity CID#188853 --- M src/select.c 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/select.c b/src/select.c index 0b115c6..b594ca5 100644 --- a/src/select.c +++ b/src/select.c @@ -324,11 +324,18 @@ ofd->when = BSC_FD_READ; if (ofd->fd < 0) { + int rc; + ofd->fd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK); if (ofd->fd < 0) return ofd->fd; - osmo_fd_register(ofd); + rc = osmo_fd_register(ofd); + if (rc < 0) { + close(ofd->fd); + ofd->fd = -1; + return rc; + } } return 0; } -- To view, visit https://gerrit.osmocom.org/11413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia2528cc3e3155bbc9cb32dee0e3af99cc6e1c654 Gerrit-Change-Number: 11413 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:11:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:11:00 +0000 Subject: Change in libosmocore[master]: telnet_interface: avoid double-close of fd() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11416 ) Change subject: telnet_interface: avoid double-close of fd() ...................................................................... telnet_interface: avoid double-close of fd() Change-Id: Ibd81f29fa22d53553bd73c055d6a1f5255a69bad Fixes: Coverity CID#135238 --- M src/vty/telnet_interface.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/vty/telnet_interface.c b/src/vty/telnet_interface.c index 0ccf8dc..fdd88c1 100644 --- a/src/vty/telnet_interface.c +++ b/src/vty/telnet_interface.c @@ -177,7 +177,7 @@ connection->vty = vty_create(new_connection, connection); if (!connection->vty) { LOGP(0, LOGL_ERROR, "couldn't create VTY\n"); - close(new_connection); + /* vty_create() is already closing the fd if it returns NULL */ talloc_free(connection); return -1; } -- To view, visit https://gerrit.osmocom.org/11416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibd81f29fa22d53553bd73c055d6a1f5255a69bad Gerrit-Change-Number: 11416 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:11:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:11:03 +0000 Subject: Change in libosmocore[master]: vty.c: Set vty->fd to -1 after closing the FD In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11417 ) Change subject: vty.c: Set vty->fd to -1 after closing the FD ...................................................................... vty.c: Set vty->fd to -1 after closing the FD Change-Id: I07d105f4a810dd809fbf6feb5c04e7410020c887 --- M src/vty/vty.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/vty/vty.c b/src/vty/vty.c index ad53537..70f6811 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -221,8 +221,10 @@ vector_unset(vtyvec, vty->fd); /* Close socket. */ - if (vty->fd > 0) + if (vty->fd > 0) { close(vty->fd); + vty->fd = -1; + } if (vty->buf) { talloc_free(vty->buf); -- To view, visit https://gerrit.osmocom.org/11417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I07d105f4a810dd809fbf6feb5c04e7410020c887 Gerrit-Change-Number: 11417 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:11:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:11:08 +0000 Subject: Change in osmo-trx[master]: trx_validate_config(): Fix validation of rx_sps In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11406 ) Change subject: trx_validate_config(): Fix validation of rx_sps ...................................................................... trx_validate_config(): Fix validation of rx_sps Change-Id: I7e932cff59335add09c76caba6f9ac1e7cf69022 Fixes: Coverity CID#188871 --- M Transceiver52M/osmo-trx.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index d01a4cf..7f72c47 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -376,7 +376,7 @@ /* Force 4 SPS for EDGE or multi-ARFCN configurations */ if ((trx->cfg.egprs || trx->cfg.multi_arfcn) && - (trx->cfg.tx_sps!=4 || trx->cfg.tx_sps!=4)) { + (trx->cfg.tx_sps!=4 || trx->cfg.rx_sps!=4)) { LOG(ERROR) << "EDGE and Multi-Carrier options require 4 tx and rx sps. Check you config."; return -1; } -- To view, visit https://gerrit.osmocom.org/11406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7e932cff59335add09c76caba6f9ac1e7cf69022 Gerrit-Change-Number: 11406 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Assignee: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:11:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:11:18 +0000 Subject: Change in osmo-pcu[master]: gprs_rlcmac_received_lost(): Fix regression / uninitialized now_tv In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11401 ) Change subject: gprs_rlcmac_received_lost(): Fix regression / uninitialized now_tv ...................................................................... gprs_rlcmac_received_lost(): Fix regression / uninitialized now_tv In Change-Id I7d22e7b5902c230efeae66eb20c17026a4037887 we introduced the use of timespecsub(). Unfortuantely, we also accidentially removed the call to osmo_clock_gettime() along with it, leaving now_tv completely uninitialized. Change-Id: Ieced0c62700b2fe4ab0208258183154cc701490b Related: OS#3225 Fixes: Coverity CID#188872 --- M src/gprs_rlcmac_meas.cpp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/gprs_rlcmac_meas.cpp b/src/gprs_rlcmac_meas.cpp index f6448d5..9ff06db 100644 --- a/src/gprs_rlcmac_meas.cpp +++ b/src/gprs_rlcmac_meas.cpp @@ -131,6 +131,7 @@ tbf->m_bw.dl_loss_received += received; tbf->m_bw.dl_loss_lost += lost; + osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv); timespecsub(&now_tv, loss_tv, &elapsed); if (elapsed.tv_sec < 1) return 0; -- To view, visit https://gerrit.osmocom.org/11401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ieced0c62700b2fe4ab0208258183154cc701490b Gerrit-Change-Number: 11401 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Assignee: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:11:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:11:28 +0000 Subject: Change in osmo-msc[master]: gsm0407_is_duplicate(): Handle error ret of gsm0407_pdisc_ctr_bin() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11414 ) Change subject: gsm0407_is_duplicate(): Handle error ret of gsm0407_pdisc_ctr_bin() ...................................................................... gsm0407_is_duplicate(): Handle error ret of gsm0407_pdisc_ctr_bin() Change-Id: If9525694bcbc5c6c0e622e899dd634dc11ed61c4 Fixes: Coverity CID#182702 --- M src/libmsc/gsm_04_08.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 0f52d09..d5cc212 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1397,7 +1397,8 @@ { struct gsm48_hdr *gh; uint8_t pdisc; - uint8_t n_sd, modulo, bin; + uint8_t n_sd, modulo; + int bin; gh = msgb_l3(msg); pdisc = gsm48_hdr_pdisc(gh); -- To view, visit https://gerrit.osmocom.org/11414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If9525694bcbc5c6c0e622e899dd634dc11ed61c4 Gerrit-Change-Number: 11414 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:11:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:11:43 +0000 Subject: Change in osmo-bsc[master]: handover_start_inter_bsc_in(): Uninitialized variable In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11398 ) Change subject: handover_start_inter_bsc_in(): Uninitialized variable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e5b164194855f78a266c1a4441730cc6c378d11 Gerrit-Change-Number: 11398 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Sun, 21 Oct 2018 12:11:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:11:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:11:54 +0000 Subject: Change in osmo-bsc[master]: range_enc_determine_range(): Don't dereference array on size=0 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11397 ) Change subject: range_enc_determine_range(): Don't dereference array on size=0 ...................................................................... range_enc_determine_range(): Don't dereference array on size=0 Change-Id: I5bbb10af8b8e8ebc22bf79f5468e71a41b5e74b3 Fixes: Coverity CID#182710 --- M src/osmo-bsc/arfcn_range_encode.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/arfcn_range_encode.c b/src/osmo-bsc/arfcn_range_encode.c index 84f9f63..54d98a9 100644 --- a/src/osmo-bsc/arfcn_range_encode.c +++ b/src/osmo-bsc/arfcn_range_encode.c @@ -168,6 +168,10 @@ { int max = 0; + /* don't dereference arfcns[] array if size is 0 */ + if (size == 0) + return ARFCN_RANGE_128; + /* * Go for the easiest. And pick arfcns[0] == f0. */ -- To view, visit https://gerrit.osmocom.org/11397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5bbb10af8b8e8ebc22bf79f5468e71a41b5e74b3 Gerrit-Change-Number: 11397 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:11:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:11:54 +0000 Subject: Change in osmo-bsc[master]: handover_start_inter_bsc_in(): Uninitialized variable In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11398 ) Change subject: handover_start_inter_bsc_in(): Uninitialized variable ...................................................................... handover_start_inter_bsc_in(): Uninitialized variable This only afffects a log statement, so not really an issue. Change-Id: I8e5b164194855f78a266c1a4441730cc6c378d11 Fixes: Coverity CID#188829 --- M src/osmo-bsc/handover_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 4286084..68230e1 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -522,7 +522,7 @@ struct handover_in_req *req = &ho->inter_bsc_in; int match_idx; enum gsm48_chan_mode mode; - bool full_rate; + bool full_rate = false; uint16_t s15_s0; struct osmo_fsm_inst *fi; -- To view, visit https://gerrit.osmocom.org/11398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8e5b164194855f78a266c1a4441730cc6c378d11 Gerrit-Change-Number: 11398 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:15:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:15:04 +0000 Subject: Change in osmo-bsc[master]: gsm_08_08: do not include zero length speech codec list. In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11388 ) Change subject: gsm_08_08: do not include zero length speech codec list. ...................................................................... gsm_08_08: do not include zero length speech codec list. When COMPLETE LAYER 3 INFORMATION is generated, it may include a speech codec list that contains 0 elements (which is legal). The specification requires the speech to be include if the network supports an IP based user plane interface. It could be argumented that if no codecs are available, the ip based user plane interface is not supported and therefore the spec does not require the speech codec list IE to be included for those cases. Lets check if the speech codec list has 0 elements and if its zero length, lets omit it completely. - check for zero length speech codec list. - omit speech codec list if it has zero elements Change-Id: I07339322a71376e986a2d75b7bc1f552eafd02b5 Related: OS#3657 --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 807eb8c..19c2598 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -495,7 +495,17 @@ if (gscon_is_aoip(conn)) { gen_bss_supported_codec_list(&scl, msc, conn_get_bts(conn)); - resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), &scl); + if (scl.len > 0) + resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), &scl); + else { + /* Note: 3GPP TS 48.008 3.2.1.32, COMPLETE LAYER 3 INFORMATION clearly states that + * Codec List (BSS Supported) shall be included, if the radio access network + * supports an IP based user plane interface. It may be intentional that the + * current configuration does not support any voice codecs, in those cases the + * network does not support an IP based user plane interface, and therefore the + * Codec List (BSS Supported) IE can be left out in those situations. */ + resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), NULL); + } } else resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), NULL); -- To view, visit https://gerrit.osmocom.org/11388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I07339322a71376e986a2d75b7bc1f552eafd02b5 Gerrit-Change-Number: 11388 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:15:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:15:23 +0000 Subject: Change in docker-playground[master]: Remove top-level Makefile In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11369 ) Change subject: Remove top-level Makefile ...................................................................... Patch Set 4: Verified+1 -- To view, visit https://gerrit.osmocom.org/11369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff Gerrit-Change-Number: 11369 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Sun, 21 Oct 2018 12:15:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:16:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:16:26 +0000 Subject: Change in docker-playground[master]: osmo-*-latest: s/nightly/latest/g in Dockerfile In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11364 ) Change subject: osmo-*-latest: s/nightly/latest/g in Dockerfile ...................................................................... Patch Set 1: this repository has no job that can set the "verified" flag. So you have to set V+1 manually, if you have tested the patch. As it already has review +2, you can then merge it yourself. -- To view, visit https://gerrit.osmocom.org/11364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1eab031038927043faf6ed8ed30bdf4d4d1624d5 Gerrit-Change-Number: 11364 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Sun, 21 Oct 2018 12:16:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:18:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:18:47 +0000 Subject: Change in libosmocore[master]: libosmogsm/gsup.c: assert message type in osmo_gsup_encode() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11325 ) Change subject: libosmogsm/gsup.c: assert message type in osmo_gsup_encode() ...................................................................... Patch Set 1: It's debatable. -ENOMEM for sure is an odd return code for an invalid input value. but yes, since any caller needs to check for the return value anyway, the OSMO_ASSERT() solution isn't the best option either. Why not simply return -EINVAL? -- To view, visit https://gerrit.osmocom.org/11325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibbac18e2b68b765c17c2bc959c4c085037953a7f Gerrit-Change-Number: 11325 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sun, 21 Oct 2018 12:18:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:19:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:19:36 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Fix open() return value checking In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11421 ) Change subject: ipaccess-config: Fix open() return value checking ...................................................................... ipaccess-config: Fix open() return value checking open() returning 0 is valid, but negative values indicate errors. Change-Id: Id7e62116bfee550ef9906e78a0fce6f28af27a97 Fixes: Coverity CID#57865 --- M src/ipaccess/ipaccess-config.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 079bae2..5491700 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -634,7 +634,7 @@ INIT_LLIST_HEAD(entry); fd = open(filename, O_RDONLY); - if (!fd) { + if (fd < 0) { perror("nada"); return -1; } @@ -729,7 +729,7 @@ printf("Opening possible firmware '%s'\n", filename); fd = open(filename, O_RDONLY); - if (!fd) { + if (fd < 0) { perror("nada"); return; } -- To view, visit https://gerrit.osmocom.org/11421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id7e62116bfee550ef9906e78a0fce6f28af27a97 Gerrit-Change-Number: 11421 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:19:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:19:45 +0000 Subject: Change in osmo-bsc[master]: bssmap_handle_cipher_mode(): Don't sent reject if !conn In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11420 ) Change subject: bssmap_handle_cipher_mode(): Don't sent reject if !conn ...................................................................... bssmap_handle_cipher_mode(): Don't sent reject if !conn We can only send a reject response if we have a valid conn. Change-Id: I0ea535f494173ad4996c70dc82d7f69455e4e15e Fixes: Coverity CID#188824 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 537b851..a20d5d0 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -439,7 +439,7 @@ if (!conn) { LOGP(DMSC, LOGL_ERROR, "No lchan/msc_data in cipher mode command.\n"); - goto reject; + return -1; } if (conn->ciphering_handled) { -- To view, visit https://gerrit.osmocom.org/11420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0ea535f494173ad4996c70dc82d7f69455e4e15e Gerrit-Change-Number: 11420 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:19:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:19:50 +0000 Subject: Change in osmo-bsc[master]: subscr_conn_fsm: Fix null-pointer deref / N-CONNECT.ind from unknown MSC In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11409 ) Change subject: subscr_conn_fsm: Fix null-pointer deref / N-CONNECT.ind from unknown MSC ...................................................................... subscr_conn_fsm: Fix null-pointer deref / N-CONNECT.ind from unknown MSC Change-Id: Id0eca3dd729d2e4c8c6ff83f05efde00b42c16f1 Fixes: Coverity CID#188860 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 52afd54..bca9e1f 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -276,8 +276,9 @@ if (!conn->sccp.msc) { LOGPFSML(fi, LOGL_NOTICE, "N-CONNECT.ind from unknown MSC %s\n", osmo_sccp_addr_dump(&scu_prim->u.connect.calling_addr)); - osmo_sccp_tx_disconn(conn->sccp.msc->a.sccp_user, scu_prim->u.connect.conn_id, - &scu_prim->u.connect.called_addr, 0); + /* We cannot find a way to the sccp_user without the MSC, so we cannot + * use osmo_sccp_tx_disconn() :( */ + //osmo_sccp_tx_disconn(conn->sccp.msc->a.sccp_user, scu_prim->u.connect.conn_id, &scu_prim->u.connect.called_addr, 0); osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); return; } -- To view, visit https://gerrit.osmocom.org/11409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id0eca3dd729d2e4c8c6ff83f05efde00b42c16f1 Gerrit-Change-Number: 11409 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:19:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:19:56 +0000 Subject: Change in osmo-bsc[master]: acc_ramp: An unsigned int is always >= 0 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11408 ) Change subject: acc_ramp: An unsigned int is always >= 0 ...................................................................... acc_ramp: An unsigned int is always >= 0 Change-Id: I653ae9ede578370b4d7b1a150e9ec3c0702bbb31 Fixes: Coverity CID#188862 --- M src/osmo-bsc/acc_ramp.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/acc_ramp.c b/src/osmo-bsc/acc_ramp.c index ac9f02d..bc2e3fb 100644 --- a/src/osmo-bsc/acc_ramp.c +++ b/src/osmo-bsc/acc_ramp.c @@ -36,7 +36,7 @@ */ static bool acc_is_permanently_barred(struct gsm_bts *bts, unsigned int acc) { - OSMO_ASSERT(acc >= 0 && acc <= 9); + OSMO_ASSERT(acc <= 9); if (acc == 8 || acc == 9) return (bts->si_common.rach_control.t2 & (1 << (acc - 8))); return (bts->si_common.rach_control.t3 & (1 << (acc))); @@ -44,7 +44,7 @@ static void allow_one_acc(struct acc_ramp *acc_ramp, unsigned int acc) { - OSMO_ASSERT(acc >= 0 && acc <= 9); + OSMO_ASSERT(acc <= 9); if (acc_ramp->barred_accs & (1 << acc)) LOGP(DRSL, LOGL_NOTICE, "(bts=%d) ACC RAMP: allowing Access Control Class %u\n", acc_ramp->bts->nr, acc); acc_ramp->barred_accs &= ~(1 << acc); @@ -52,7 +52,7 @@ static void barr_one_acc(struct acc_ramp *acc_ramp, unsigned int acc) { - OSMO_ASSERT(acc >= 0 && acc <= 9); + OSMO_ASSERT(acc <= 9); if ((acc_ramp->barred_accs & (1 << acc)) == 0) LOGP(DRSL, LOGL_NOTICE, "(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/11408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I653ae9ede578370b4d7b1a150e9ec3c0702bbb31 Gerrit-Change-Number: 11408 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:20:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:20:03 +0000 Subject: Change in osmo-bsc[master]: ipaccess-proxy: Add error handling to IAP CCM ID RESP parsing In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11407 ) Change subject: ipaccess-proxy: Add error handling to IAP CCM ID RESP parsing ...................................................................... ipaccess-proxy: Add error handling to IAP CCM ID RESP parsing Change-Id: I56ec149979572486b904fc1409cf3cd096b6eb34 Fixes: Coverity CID#188867 --- M src/ipaccess/ipaccess-proxy.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c index a2ce633..26c5bcd 100644 --- a/src/ipaccess/ipaccess-proxy.c +++ b/src/ipaccess/ipaccess-proxy.c @@ -458,7 +458,11 @@ case IPAC_MSGT_ID_RESP: DEBUGP(DLMI, "ID_RESP "); /* parse tags, search for Unit ID */ - ipa_ccm_id_resp_parse(&tlvp, (uint8_t *)msg->l2h+1, msgb_l2len(msg)-1); + ret = ipa_ccm_id_resp_parse(&tlvp, (uint8_t *)msg->l2h+1, msgb_l2len(msg)-1); + if (ret < 0) { + LOGP(DLINP, LOGL_ERROR, "Error parsing CCM ID RESP !?!\n"); + return -EIO; + } DEBUGP(DLMI, "\n"); if (!TLVP_PRESENT(&tlvp, IPAC_IDTAG_UNIT)) { -- To view, visit https://gerrit.osmocom.org/11407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I56ec149979572486b904fc1409cf3cd096b6eb34 Gerrit-Change-Number: 11407 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:21:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:21:07 +0000 Subject: Change in libosmocore[master]: SGsAP protocol definitions (header + C file) In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11412 ) Change subject: SGsAP protocol definitions (header + C file) ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idddfc9b851eb4c2fa7dd661a9ce1b03a04883109 Gerrit-Change-Number: 11412 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 12:21:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:21:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:21:09 +0000 Subject: Change in libosmocore[master]: SGsAP protocol definitions (header + C file) In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11412 ) Change subject: SGsAP protocol definitions (header + C file) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idddfc9b851eb4c2fa7dd661a9ce1b03a04883109 Gerrit-Change-Number: 11412 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 12:21:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:22:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:22:19 +0000 Subject: Change in osmo-trx[master]: sigProcLib: also detect both TS1 and TS2 RACH synch. sequences In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11390 ) Change subject: sigProcLib: also detect both TS1 and TS2 RACH synch. sequences ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I838c21db29c54f1924dd478c2b34b46b70aab2cd Gerrit-Change-Number: 11390 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Tom Tsou Gerrit-Comment-Date: Sun, 21 Oct 2018 12:22:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:24:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:24:21 +0000 Subject: Change in osmo-trx[master]: sigProcLib: also detect both TS1 and TS2 RACH synch. sequences In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11390 ) Change subject: sigProcLib: also detect both TS1 and TS2 RACH synch. sequences ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11390/1/Transceiver52M/sigProcLib.cpp File Transceiver52M/sigProcLib.cpp: https://gerrit.osmocom.org/#/c/11390/1/Transceiver52M/sigProcLib.cpp at 1615 PS1, Line 1615: sync = gRACHSequences[i]; this will have a signifinant impact on performance, at last that's what I would expect. There's now three rather long correclations for the short RACH burst, rather than one. I guess this requires some benchmarks/comparisons and should then possibly have some flag/switch whether or not we really want to enable it. After all, there's no point in paying the performance penalty unless upper levels (BTS, PCU) actually make use of it. -- To view, visit https://gerrit.osmocom.org/11390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I838c21db29c54f1924dd478c2b34b46b70aab2cd Gerrit-Change-Number: 11390 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Tom Tsou Gerrit-Comment-Date: Sun, 21 Oct 2018 12:24:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:25:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:25:13 +0000 Subject: Change in libosmocore[master]: gsm_08_58.h: Introduce struct abis_rsl_chan_nr In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11303 ) Change subject: gsm_08_58.h: Introduce struct abis_rsl_chan_nr ...................................................................... gsm_08_58.h: Introduce struct abis_rsl_chan_nr It will allow to make code handling chan_nr values more easier to read and less prone to errors. union is used to be able to get the full octet in case we need to pass it somewhere else or encode it. An extra union is used in struct abis_rsl_common_hdr and others to allow using fields directly while keeping API compatibility. Change-Id: Icd6822021207270a00106c50f8ca6b93c1250df9 --- M include/osmocom/gsm/protocol/gsm_08_58.h 1 file changed, 32 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h index c7a7d8a..cd28caf 100644 --- a/include/osmocom/gsm/protocol/gsm_08_58.h +++ b/include/osmocom/gsm/protocol/gsm_08_58.h @@ -31,6 +31,26 @@ * @{ * \file gsm_08_58.h */ +/* Channel Number 9.3.1 */ +union abis_rsl_chan_nr { +#if OSMO_IS_BIG_ENDIAN + uint8_t cbits:5, + tn:3; +#elif OSMO_IS_LITTLE_ENDIAN + uint8_t tn:3, + cbits:5; +#endif + uint8_t chan_nr; +} __attribute__ ((packed)); +#define ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs 0x01 +#define ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(ss) (0x02 + (ss)) +#define ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(ss) (0x04 + (ss)) +#define ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(ss) (0x08 + (ss)) +#define ABIS_RSL_CHAN_NR_CBITS_BCCH 0x10 +#define ABIS_RSL_CHAN_NR_CBITS_RACH 0x11 +#define ABIS_RSL_CHAN_NR_CBITS_PCH_AGCH 0x12 +#define ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH 0x18 /*< non-standard, for dyn TS */ + /* Link Identifier 9.3.2 */ union abis_rsl_link_id { #if OSMO_IS_BIG_ENDIAN @@ -60,7 +80,10 @@ struct abis_rsl_rll_hdr { struct abis_rsl_common_hdr c; uint8_t ie_chan; /*!< \ref RSL_IE_CHAN_NR (tag) */ - uint8_t chan_nr; /*!< RSL channel number (value) */ + union { + uint8_t chan_nr; /* API backward compat */ + union abis_rsl_chan_nr chan_nr_fields; /*!< RSL channel number (value) */ + }; uint8_t ie_link_id; /*!< \ref RSL_IE_LINK_IDENT (tag) */ union { uint8_t link_id; /* API backward compat */ @@ -73,7 +96,10 @@ struct abis_rsl_dchan_hdr { struct abis_rsl_common_hdr c; uint8_t ie_chan; /*!< \ref RSL_IE_CHAN_NR (tag) */ - uint8_t chan_nr; /*!< RSL channel number (value) */ + union { + uint8_t chan_nr; /* API backward compat */ + union abis_rsl_chan_nr chan_nr_fields; /*!< RSL channel number (value) */ + }; uint8_t data[0]; /*!< message payload data */ } __attribute__ ((packed)); @@ -81,7 +107,10 @@ struct abis_rsl_cchan_hdr { struct abis_rsl_common_hdr c; uint8_t ie_chan; /*!< \ref RSL_IE_CHAN_NR (tag) */ - uint8_t chan_nr; /*!< RSL channel number (value) */ + union { + uint8_t chan_nr; /* API backward compat */ + union abis_rsl_chan_nr chan_nr_fields; /*!< RSL channel number (value) */ + }; uint8_t data[0]; /*!< message payload data */ } __attribute__ ((packed)); -- To view, visit https://gerrit.osmocom.org/11303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icd6822021207270a00106c50f8ca6b93c1250df9 Gerrit-Change-Number: 11303 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:25:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:25:52 +0000 Subject: Change in docker-playground[master]: rename m3ua-test, sua-test to nplab-*-test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11368 ) Change subject: rename m3ua-test, sua-test to nplab-*-test ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de Gerrit-Change-Number: 11368 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Sun, 21 Oct 2018 12:25:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:27:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:27:01 +0000 Subject: Change in osmo-sip-connector[master]: Add --version cmdline option In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11384 ) Change subject: Add --version cmdline option ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibdda54acddde0ac03e202286736d56b6fa51a365 Gerrit-Change-Number: 11384 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 12:27:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:27:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:27:06 +0000 Subject: Change in osmo-sip-connector[master]: Add --version cmdline option In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11384 ) Change subject: Add --version cmdline option ...................................................................... Add --version cmdline option Related: OS#3577 Change-Id: Ibdda54acddde0ac03e202286736d56b6fa51a365 --- M src/main.c 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/main.c b/src/main.c index 560995e..0661498 100644 --- a/src/main.c +++ b/src/main.c @@ -81,6 +81,7 @@ printf("OsmoSIPcon: MNCC to SIP bridge\n"); printf(" -h --help\tthis text\n"); printf(" -c --config-file NAME\tThe config file to use [%s]\n", config_file); + printf(" -V --version\tPrint the version number\n"); } static void handle_options(int argc, char **argv) @@ -90,10 +91,11 @@ static struct option long_options[] = { {"help", 0, 0, 'h'}, {"config-file", 1, 0, 'c'}, + {"version", 0, 0, 'V' }, {NULL, 0, 0, 0} }; - c = getopt_long(argc, argv, "hc:", + c = getopt_long(argc, argv, "hc:V", long_options, &option_index); if (c == -1) break; @@ -105,6 +107,10 @@ case 'c': config_file = optarg; break; + case 'V': + print_version(1); + exit(EXIT_SUCCESS); + break; } } } -- To view, visit https://gerrit.osmocom.org/11384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibdda54acddde0ac03e202286736d56b6fa51a365 Gerrit-Change-Number: 11384 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:28:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:28:02 +0000 Subject: Change in osmo-sgsn[master]: Add --version cmdline option In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11385 ) Change subject: Add --version cmdline option ...................................................................... Patch Set 1: Code-Review+1 the commit log mesage should state to *what* it's adding the --version. After all, gtphub is a rather exotic binary, and not the normal sgsn that one would expect in absence of any explcit mention of the binary. -- To view, visit https://gerrit.osmocom.org/11385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icdb2bd9ec90511b51428800d17f8ce81f6804670 Gerrit-Change-Number: 11385 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 12:28:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:28:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:28:40 +0000 Subject: Change in osmo-hlr[master]: fix and re-enable osmo_hlr_subscriber_update_notify() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11233 ) Change subject: fix and re-enable osmo_hlr_subscriber_update_notify() ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7c317de8329d9a115d072fc61ddb9abc21b7e8d8 Gerrit-Change-Number: 11233 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Sun, 21 Oct 2018 12:28:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:28:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:28:41 +0000 Subject: Change in osmo-hlr[master]: fix and re-enable osmo_hlr_subscriber_update_notify() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11233 ) Change subject: fix and re-enable osmo_hlr_subscriber_update_notify() ...................................................................... fix and re-enable osmo_hlr_subscriber_update_notify() Send updated subscriber data out to exactly those GSUP clients that match the last LU operations (depending on each client sending distinct identification). As this adds logging on DLGSUP, also change adjacent GSUP related logging from DMAIN to DLGSUP. Related: OS#2785 Change-Id: I7c317de8329d9a115d072fc61ddb9abc21b7e8d8 --- M src/hlr.c 1 file changed, 42 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/hlr.c b/src/hlr.c index 26be8d5..78d6c91 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -54,16 +54,15 @@ void osmo_hlr_subscriber_update_notify(struct hlr_subscriber *subscr) { - /* FIXME: the below code can only be re-enabled after we make sure that an ISD - * is only sent tot the currently serving VLR and/or SGSN (if there are any). - * We cannot blindly flood the entire PLMN with this, as it would create subscriber - * state in every VLR/SGSN out there, even those that have never seen the subscriber. - * See https://osmocom.org/issues/3154 for details. */ -#if 0 struct osmo_gsup_conn *co; - if (g_hlr->gs == NULL) + if (g_hlr->gs == NULL) { + LOGP(DLGSUP, LOGL_DEBUG, + "IMSI %s: NOT Notifying peers of subscriber data change," + " there is no GSUP server\n", + subscr->imsi); return; + } llist_for_each_entry(co, &g_hlr->gs->clients, list) { struct osmo_gsup_message gsup = { }; @@ -72,20 +71,50 @@ struct msgb *msg_out; uint8_t *peer; int peer_len; + size_t peer_strlen; + const char *peer_compare; enum osmo_gsup_cn_domain cn_domain; - if (co->supports_ps) + if (co->supports_ps) { cn_domain = OSMO_GSUP_CN_DOMAIN_PS; - else if (co->supports_cs) + peer_compare = subscr->sgsn_number; + } else if (co->supports_cs) { cn_domain = OSMO_GSUP_CN_DOMAIN_CS; - else { - /* We have not yet received a location update from this subscriber .*/ + peer_compare = subscr->vlr_number; + } else { + /* We have not yet received a location update from this GSUP client.*/ continue; } + peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR); + if (peer_len < 0) { + LOGP(DLGSUP, LOGL_ERROR, + "IMSI='%s': cannot get peer name for connection %s:%u\n", subscr->imsi, + co && co->conn && co->conn->server? co->conn->server->addr : "unset", + co && co->conn && co->conn->server? co->conn->server->port : 0); + continue; + } + + peer_strlen = strnlen((const char*)peer, peer_len); + if (strlen(peer_compare) != peer_strlen || strncmp(peer_compare, (const char *)peer, peer_len)) { + /* Mismatch. The subscriber is not subscribed with this GSUP client. */ + /* I hope peer is always nul terminated... */ + if (peer_strlen < peer_len) + LOGP(DLGSUP, LOGL_DEBUG, + "IMSI %s: subscriber change: skipping %s peer %s\n", + subscr->imsi, cn_domain == OSMO_GSUP_CN_DOMAIN_PS ? "PS" : "CS", + osmo_quote_str((char*)peer, -1)); + continue; + } + + LOGP(DLGSUP, LOGL_DEBUG, + "IMSI %s: subscriber change: notifying %s peer %s\n", + subscr->imsi, cn_domain == OSMO_GSUP_CN_DOMAIN_PS ? "PS" : "CS", + osmo_quote_str(peer_compare, -1)); + if (osmo_gsup_create_insert_subscriber_data_msg(&gsup, subscr->imsi, subscr->msisdn, msisdn_enc, sizeof(msisdn_enc), apn, sizeof(apn), cn_domain) != 0) { - LOGP(DMAIN, LOGL_ERROR, + LOGP(DLGSUP, LOGL_ERROR, "IMSI='%s': Cannot notify GSUP client; could not create gsup message " "for %s:%u\n", subscr->imsi, co && co->conn && co->conn->server? co->conn->server->addr : "unset", @@ -96,7 +125,7 @@ /* Send ISD to MSC/SGSN */ msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP ISD UPDATE"); if (msg_out == NULL) { - LOGP(DMAIN, LOGL_ERROR, + LOGP(DLGSUP, LOGL_ERROR, "IMSI='%s': Cannot notify GSUP client; could not allocate msg buffer " "for %s:%u\n", subscr->imsi, co && co->conn && co->conn->server? co->conn->server->addr : "unset", @@ -105,15 +134,6 @@ } osmo_gsup_encode(msg_out, &gsup); - peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR); - if (peer_len < 0) { - LOGP(DMAIN, LOGL_ERROR, - "IMSI='%s': cannot get peer name for connection %s:%u\n", subscr->imsi, - co && co->conn && co->conn->server? co->conn->server->addr : "unset", - co && co->conn && co->conn->server? co->conn->server->port : 0); - continue; - } - if (osmo_gsup_addr_send(g_hlr->gs, peer, peer_len, msg_out) < 0) { LOGP(DMAIN, LOGL_ERROR, "IMSI='%s': Cannot notify GSUP client; send operation failed " @@ -123,7 +143,6 @@ continue; } } -#endif } /*********************************************************************** -- To view, visit https://gerrit.osmocom.org/11233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7c317de8329d9a115d072fc61ddb9abc21b7e8d8 Gerrit-Change-Number: 11233 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:28:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:28:53 +0000 Subject: Change in osmo-hlr[master]: Store identity of VLR/SGSN in UpdateLocation In-Reply-To: References: Message-ID: Harald Welte has abandoned this change. ( https://gerrit.osmocom.org/9723 ) Change subject: Store identity of VLR/SGSN in UpdateLocation ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/9723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ib2611421f3638eadc361787af801fffe9a34bd8a Gerrit-Change-Number: 9723 Gerrit-PatchSet: 15 Gerrit-Owner: Harald Welte Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:29:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:29:10 +0000 Subject: Change in simtrace2[master]: remsim: add already parsed USB path argument info In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11359 ) Change subject: remsim: add already parsed USB path argument info ...................................................................... remsim: add already parsed USB path argument info Change-Id: I03de93ebb92b1d1b5004cbe865cdf1fa0b2b23ac --- M host/simtrace2-remsim.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/host/simtrace2-remsim.c b/host/simtrace2-remsim.c index 9a681b4..5b8204e 100644 --- a/host/simtrace2-remsim.c +++ b/host/simtrace2-remsim.c @@ -501,6 +501,7 @@ "\t-I\t--usb-interface\tINTERFACE_ID\n" "\t-S\t--usb-altsetting ALTSETTING_ID\n" "\t-A\t--usb-address\tADDRESS\n" + "\t-H\t--usb-path\tPATH\n" "\n" ); } -- To view, visit https://gerrit.osmocom.org/11359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I03de93ebb92b1d1b5004cbe865cdf1fa0b2b23ac Gerrit-Change-Number: 11359 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:29:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:29:10 +0000 Subject: Change in simtrace2[master]: remsim: update copyright In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11360 ) Change subject: remsim: update copyright ...................................................................... remsim: update copyright Change-Id: Ibcf093877ee53f8446c97bfa50c8370ceda24c53 --- M host/simtrace2-remsim.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/host/simtrace2-remsim.c b/host/simtrace2-remsim.c index 5b8204e..d0bbb8c 100644 --- a/host/simtrace2-remsim.c +++ b/host/simtrace2-remsim.c @@ -1,7 +1,8 @@ /* simtrace2-remsim - main program for the host PC to provide a remote SIM * using the SIMtrace 2 firmware in card emulation mode * - * (C) 2016 by Harald Welte + * (C) 2016-2017 by Harald Welte + * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -484,7 +485,8 @@ static void print_welcome(void) { printf("simtrace2-remsim - Remote SIM card forwarding\n" - "(C) 2010-2017 by Harald Welte \n\n"); + "(C) 2010-2017, Harald Welte \n" + "(C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon \n\n"); } static void print_help(void) -- To view, visit https://gerrit.osmocom.org/11360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibcf093877ee53f8446c97bfa50c8370ceda24c53 Gerrit-Change-Number: 11360 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:29:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:29:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix: don't overwrite the expected meas results In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11228 ) Change subject: BTS_Tests.ttcn: fix: don't overwrite the expected meas results ...................................................................... BTS_Tests.ttcn: fix: don't overwrite the expected meas results Since OS#2988 was fixed, we should not overwrite nor ignore the measurement results in f_build_meas_res_tmpl(). Change-Id: Ie902bfc7619181b528eafbce367c87e0b062243a --- M bts/BTS_Tests.ttcn 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index e0470ec..2f48b0f 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1273,11 +1273,6 @@ toa256_std_dev := ? } } - /* HACK HACK HACK FIXME HACK HACK HACK see https://osmocom.org/issues/2988 */ - ul_meas.rxlev_f_u := ?; - ul_meas.rxlev_s_u := ?; - ul_meas.rxq_f_u := ?; - ul_meas.rxq_s_u := ?; var template RSL_IE_BS_Power bs_power := { reserved := 0, epc := false, -- To view, visit https://gerrit.osmocom.org/11228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie902bfc7619181b528eafbce367c87e0b062243a Gerrit-Change-Number: 11228 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:32:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:32:33 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: refactor trigger_*() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11320 ) Change subject: handover_decision_2.c: refactor trigger_*() ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5ba8b556703010c8e232b516285a837c999f87ef Gerrit-Change-Number: 11320 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 12:32:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:33:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:33:12 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: implement HO to remote BSS In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11321 ) Change subject: handover_decision_2.c: implement HO to remote BSS ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id78ac1b2016998a2931a23d62ec7a3f37bb764c6 Gerrit-Change-Number: 11321 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 12:33:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:33:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:33:14 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: refactor trigger_*() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11320 ) Change subject: handover_decision_2.c: refactor trigger_*() ...................................................................... handover_decision_2.c: refactor trigger_*() a) Prepare for triggering handover for any candidate, remote or local. b) drop redundant arguments. Change-Id: I5ba8b556703010c8e232b516285a837c999f87ef --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 18 insertions(+), 17 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index 64fc2dd..457d57a 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -620,8 +620,10 @@ } /* Trigger handover or assignment depending on the target BTS */ -static int trigger_handover_or_assignment(struct gsm_lchan *lchan, struct gsm_bts *new_bts, uint8_t requirements) +static int trigger_local_ho_or_as(struct ho_candidate *c, uint8_t requirements) { + struct gsm_lchan *lchan = c->lchan; + struct gsm_bts *new_bts = c->bts; struct handover_out_req req; struct gsm_bts *current_bts = lchan->ts->trx->bts; int afs_bias = 0; @@ -699,6 +701,14 @@ return 0; } +static int trigger_ho(struct ho_candidate *c, uint8_t requirements) +{ + if (c->bts) + return trigger_local_ho_or_as(c, requirements); + else + return 0; /* TODO: remote candidates */ +} + /* verbosely log about a handover candidate */ static inline void debug_candidate(struct ho_candidate *candidate, int8_t rxlev, int tchf_count, int tchh_count) @@ -1003,8 +1013,7 @@ LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate, RX level %d%s\n", rxlev2dbm(best_cand->avg), best_applied_afs_bias ? " (applied AHS -> AFS rxlev bias)" : ""); - return trigger_handover_or_assignment(lchan, best_cand->bts, - best_cand->requirements & REQUIREMENT_B_MASK); + return trigger_ho(best_cand, best_cand->requirements & REQUIREMENT_B_MASK); } /* select best candidate that fulfills requirement C: less or equal congestion after HO */ @@ -1032,8 +1041,7 @@ LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate, RX level %d%s\n", rxlev2dbm(best_cand->avg), best_applied_afs_bias? " (applied AHS -> AFS rxlev bias)" : ""); - return trigger_handover_or_assignment(lchan, best_cand->bts, - best_cand->requirements & REQUIREMENT_C_MASK); + return trigger_ho(best_cand, best_cand->requirements & REQUIREMENT_C_MASK); } /* we are done in case the MS RXLEV/RXQUAL/TA aren't critical and we're avoiding congestion. */ @@ -1069,8 +1077,7 @@ LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate: RX level %d%s\n", rxlev2dbm(best_cand->avg), best_applied_afs_bias ? " (applied AHS -> AFS rxlev bias)" : ""); - return trigger_handover_or_assignment(lchan, best_cand->bts, - best_cand->requirements & REQUIREMENT_A_MASK); + return trigger_ho(best_cand, best_cand->requirements & REQUIREMENT_A_MASK); } /* Damn, all is congested, has too low RXLEV or cannot service the voice call due to codec @@ -1416,8 +1423,7 @@ LOGPHOCAND(best_cand, LOGL_DEBUG, "Best candidate: RX level %d%s\n", rxlev2dbm(best_cand->avg), is_improved ? " (applied AHS->AFS bias)" : ""); - trigger_handover_or_assignment(best_cand->lchan, best_cand->bts, - best_cand->requirements & REQUIREMENT_B_MASK); + trigger_ho(best_cand, best_cand->requirements & REQUIREMENT_B_MASK); #if 0 /* if there is still congestion, mark lchan as deleted * and redo this process */ @@ -1485,9 +1491,7 @@ LOGPHOCAND(worst_cand, LOGL_INFO, "Worst candidate: RX level %d from TCH/H -> TCH/F%s\n", rxlev2dbm(worst_cand->avg), is_improved ? " (applied AHS -> AFS rxlev bias)" : ""); - trigger_handover_or_assignment(worst_cand->lchan, - worst_cand->bts, - worst_cand->requirements & REQUIREMENT_B_MASK); + trigger_ho(worst_cand, worst_cand->requirements & REQUIREMENT_B_MASK); #if 0 /* if there is still congestion, mark lchan as deleted * and redo this process */ @@ -1556,8 +1560,7 @@ LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate: RX level %d%s\n", rxlev2dbm(best_cand->avg), is_improved ? " (applied AHS -> AFS rxlev bias)" : ""); - trigger_handover_or_assignment(best_cand->lchan, best_cand->bts, - best_cand->requirements & REQUIREMENT_C_MASK); + trigger_ho(best_cand, best_cand->requirements & REQUIREMENT_C_MASK); #if 0 /* if there is still congestion, mark lchan as deleted * and redo this process */ @@ -1630,9 +1633,7 @@ LOGPHOCAND(worst_cand, LOGL_INFO, "Worst candidate: RX level %d from TCH/H -> TCH/F%s\n", rxlev2dbm(worst_cand->avg), is_improved ? " (applied AHS -> AFS rxlev bias)" : ""); - trigger_handover_or_assignment(worst_cand->lchan, - worst_cand->bts, - worst_cand->requirements & REQUIREMENT_C_MASK); + trigger_ho(worst_cand, worst_cand->requirements & REQUIREMENT_C_MASK); #if 0 /* if there is still congestion, mark lchan as deleted * and redo this process */ -- To view, visit https://gerrit.osmocom.org/11320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5ba8b556703010c8e232b516285a837c999f87ef Gerrit-Change-Number: 11320 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:33:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:33:14 +0000 Subject: Change in osmo-bsc[master]: handover_decision_2.c: implement HO to remote BSS In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11321 ) Change subject: handover_decision_2.c: implement HO to remote BSS ...................................................................... handover_decision_2.c: implement HO to remote BSS Implement basic support for inter-BSC HO from handover_decision_2: do inter-BSC handover only when rxlev / rxqual / ta drop below the minimum requirements. I considered adding a vty config flag to disable/enable remote-BSS handover, but to avoid inter-BSC HO the user can simply refrain from configuring neighbors for a particular cell. In collect_assignment_candidate(), it is important to clear out any new candidate entry. Hence adopt the same pattern as below: first compose a new (cleared) candidate, then write the entry into the list. Related: OS#3638 Change-Id: Id78ac1b2016998a2931a23d62ec7a3f37bb764c6 --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 185 insertions(+), 28 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index 457d57a..a8fff63 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -98,8 +98,9 @@ struct ho_candidate { struct gsm_lchan *lchan; /* candidate for whom */ + struct neighbor_ident_key nik; /* neighbor ARFCN+BSIC */ struct gsm_bts *bts; /* target BTS in local BSS */ - struct gsm0808_cell_id_list2 *cil; /* target cells in remote BSS */ + const struct gsm0808_cell_id_list2 *cil; /* target cells in remote BSS */ uint8_t requirements; /* what is fulfilled */ int avg; /* average RX level */ }; @@ -619,6 +620,75 @@ return requirement; } +static uint8_t check_requirements_remote_bss(struct gsm_lchan *lchan, + const struct gsm0808_cell_id_list2 *cil) +{ + uint8_t requirement = 0; + unsigned int penalty_time; + + /* Requirement A */ + + /* the handover penalty timer must not run for this bts */ + penalty_time = conn_penalty_time_remaining(lchan->conn, cil); + if (penalty_time) { + LOGPHOLCHANTOREMOTE(lchan, cil, LOGL_DEBUG, + "not a candidate, target BSS still in penalty time" + " (%u seconds left)\n", penalty_time); + return 0; + } + + /* compatibility check for codecs -- we have no notion of what the remote BSS supports. We can + * only assume that a handover would work, and use only the local requirements. */ + switch (lchan->tch_mode) { + case GSM48_CMODE_SPEECH_V1: + switch (lchan->type) { + case GSM_LCHAN_TCH_F: /* mandatory */ + requirement |= REQUIREMENT_A_TCHF; + break; + case GSM_LCHAN_TCH_H: + if (codec_type_is_supported(lchan->conn, GSM0808_SCT_HR1)) + requirement |= REQUIREMENT_A_TCHH; + break; + default: + LOGPHOLCHAN(lchan, LOGL_ERROR, "Unexpected channel type: neither TCH/F nor TCH/H for %s\n", + get_value_string(gsm48_chan_mode_names, lchan->tch_mode)); + return 0; + } + break; + case GSM48_CMODE_SPEECH_EFR: + if (codec_type_is_supported(lchan->conn, GSM0808_SCT_FR2)) + requirement |= REQUIREMENT_A_TCHF; + break; + case GSM48_CMODE_SPEECH_AMR: + if (codec_type_is_supported(lchan->conn, GSM0808_SCT_FR3)) + requirement |= REQUIREMENT_A_TCHF; + if (codec_type_is_supported(lchan->conn, GSM0808_SCT_HR3)) + requirement |= REQUIREMENT_A_TCHH; + break; + default: + LOGPHOLCHAN(lchan, LOGL_DEBUG, "Not even considering: src is not a SPEECH mode lchan\n"); + /* FIXME: should allow handover of non-speech lchans */ + return 0; + } + + if (!requirement) { + LOGPHOLCHAN(lchan, LOGL_ERROR, "lchan doesn't fit its own requirements??\n"); + return 0; + } + + /* Requirement B and C */ + + /* We don't know how many timeslots are free in the remote BSS. We can only indicate that it + * would work out and hope for the best. */ + if (requirement & REQUIREMENT_A_TCHF) + requirement |= REQUIREMENT_B_TCHF | REQUIREMENT_C_TCHF; + if (requirement & REQUIREMENT_A_TCHH) + requirement |= REQUIREMENT_B_TCHH | REQUIREMENT_C_TCHH; + + /* return mask of fulfilled requirements */ + return requirement; +} + /* Trigger handover or assignment depending on the target BTS */ static int trigger_local_ho_or_as(struct ho_candidate *c, uint8_t requirements) { @@ -701,12 +771,29 @@ return 0; } +static int trigger_remote_bss_ho(struct ho_candidate *c, uint8_t requirements) +{ + struct handover_out_req req; + + LOGPHOLCHANTOREMOTE(c->lchan, c->cil, LOGL_INFO, + "Triggering inter-BSC handover, due to %s\n", + ho_reason_name(global_ho_reason)); + + req = (struct handover_out_req){ + .from_hodec_id = HODEC2, + .old_lchan = c->lchan, + .target_nik = c->nik, + }; + handover_request(&req); + return 0; +} + static int trigger_ho(struct ho_candidate *c, uint8_t requirements) { if (c->bts) return trigger_local_ho_or_as(c, requirements); else - return 0; /* TODO: remote candidates */ + return trigger_remote_bss_ho(c, requirements); } /* verbosely log about a handover candidate */ @@ -730,6 +817,16 @@ /* now has to be candidate->requirements & REQUIREMENT_C_TCHX != 0: */ \ " less-or-equal congestion")) + if (!candidate->bts && !candidate->cil) + LOGPHOLCHAN(lchan, LOGL_DEBUG, "Empty candidate\n"); + if (candidate->bts && candidate->cil) + LOGPHOLCHAN(lchan, LOGL_ERROR, "Invalid candidate: both local- and remote-BSS target\n"); + + if (candidate->cil) + LOGPHOLCHANTOREMOTE(lchan, candidate->cil, LOGL_DEBUG, + "RX level %d -> %d\n", + rxlev2dbm(rxlev), rxlev2dbm(candidate->avg)); + if (candidate->bts == lchan->ts->trx->bts) LOGPHOLCHANTOBTS(lchan, candidate->bts, LOGL_DEBUG, "RX level %d; " @@ -750,17 +847,20 @@ { struct gsm_bts *bts = lchan->ts->trx->bts; int tchf_count, tchh_count; - struct ho_candidate *c; + struct ho_candidate c; tchf_count = bts_count_free_ts(bts, GSM_PCHAN_TCH_F); tchh_count = bts_count_free_ts(bts, GSM_PCHAN_TCH_H); - c = &clist[*candidates]; - c->lchan = lchan; - c->bts = bts; - c->requirements = check_requirements(lchan, bts, tchf_count, tchh_count); - c->avg = av_rxlev; - debug_candidate(c, 0, tchf_count, tchh_count); + c = (struct ho_candidate){ + .lchan = lchan, + .bts = bts, + .requirements = check_requirements(lchan, bts, tchf_count, tchh_count), + .avg = av_rxlev, + }; + + debug_candidate(&c, 0, tchf_count, tchh_count); + clist[*candidates] = c; (*candidates)++; } @@ -771,7 +871,8 @@ int *neighbors_count) { struct gsm_bts *bts = lchan->ts->trx->bts; - int tchf_count, tchh_count; + int tchf_count = 0; + int tchh_count = 0; struct gsm_bts *neighbor_bts; const struct gsm0808_cell_id_list2 *neighbor_cil; struct neighbor_ident_key ni = { @@ -782,6 +883,7 @@ int avg; struct ho_candidate c; int min_rxlev; + struct handover_cfg *neigh_cfg; /* skip empty slots */ if (nmp->arfcn == 0) @@ -799,15 +901,19 @@ } neighbor_bts = bts_by_neighbor_ident(bts->network, &ni); - if (!neighbor_bts) { - neighbor_cil = neighbor_ident_get(bts->network->neighbor_bss_cells, &ni); - if (neighbor_cil) { - LOGPHOBTS(bts, LOGL_ERROR, "would inter-BSC handover to ARFCN %u BSIC %u," - " but inter-BSC handover not implemented for ho decision 2\n", - nmp->arfcn, nmp->bsic); - return; - } + neighbor_cil = neighbor_ident_get(bts->network->neighbor_bss_cells, &ni); + + if (neighbor_bts && neighbor_cil) { + LOGPHOBTS(bts, LOGL_ERROR, "Configuration error: %s exists as both local" + " neighbor (bts %u) and remote-BSS neighbor (%s). Will consider only" + " the local-BSS neighbor.\n", + neighbor_ident_key_name(&ni), + neighbor_bts->nr, gsm0808_cell_id_list_name(neighbor_cil)); + neighbor_cil = NULL; + } + + if (!neighbor_bts && !neighbor_cil) { LOGPHOBTS(bts, LOGL_DEBUG, "no neighbor ARFCN %u BSIC %u configured for this cell\n", nmp->arfcn, nmp->bsic); return; @@ -819,13 +925,19 @@ return; } + /* For cells in a remote BSS, we cannot query the target cell's handover config, and hence + * instead assume the local BTS' config to apply. */ + neigh_cfg = (neighbor_bts ? : bts)->ho; + /* calculate average rxlev for this cell over the window */ avg = neigh_meas_avg(nmp, ho_get_hodec2_rxlev_neigh_avg_win(bts->ho)); c = (struct ho_candidate){ .lchan = lchan, .avg = avg, + .nik = ni, .bts = neighbor_bts, + .cil = neighbor_cil, }; /* Heed rxlev hysteresis only if the RXLEV/RXQUAL/TA levels of the MS aren't critically bad and @@ -842,8 +954,9 @@ } } - /* if the minimum level is not reached */ - min_rxlev = ho_get_hodec2_min_rxlev(neighbor_bts->ho); + /* if the minimum level is not reached. + * In case of a remote-BSS, use the current BTS' configuration. */ + min_rxlev = ho_get_hodec2_min_rxlev(neigh_cfg); if (rxlev2dbm(avg) < min_rxlev) { LOGPHOCAND(&c, LOGL_DEBUG, "Not a candidate, because RX level (%d) is lower" @@ -852,9 +965,13 @@ return; } - tchf_count = bts_count_free_ts(neighbor_bts, GSM_PCHAN_TCH_F); - tchh_count = bts_count_free_ts(neighbor_bts, GSM_PCHAN_TCH_H); - c.requirements = check_requirements(lchan, neighbor_bts, tchf_count, tchh_count); + if (neighbor_bts) { + tchf_count = bts_count_free_ts(neighbor_bts, GSM_PCHAN_TCH_F); + tchh_count = bts_count_free_ts(neighbor_bts, GSM_PCHAN_TCH_H); + c.requirements = check_requirements(lchan, neighbor_bts, tchf_count, + tchh_count); + } else + c.requirements = check_requirements_remote_bss(lchan, neighbor_cil); debug_candidate(&c, av_rxlev, tchf_count, tchh_count); @@ -988,13 +1105,19 @@ return 0; } - /* select best candidate that fulfills requirement B: no congestion after HO */ + /* select best candidate that fulfills requirement B: no congestion after HO. + * Exclude remote-BSS neighbors: to avoid oscillation between neighboring BSS, + * rather keep subscribers in the local BSS unless there is critical RXLEV/TA. */ best_better_db = 0; for (i = 0; i < candidates; i++) { int afs_bias; if (!(clist[i].requirements & REQUIREMENT_B_MASK)) continue; + /* Only consider Local-BSS cells */ + if (!clist[i].bts) + continue; + better = clist[i].avg - av_rxlev; /* Apply AFS bias? */ afs_bias = 0; @@ -1016,13 +1139,18 @@ return trigger_ho(best_cand, best_cand->requirements & REQUIREMENT_B_MASK); } - /* select best candidate that fulfills requirement C: less or equal congestion after HO */ + /* select best candidate that fulfills requirement C: less or equal congestion after HO, + * again excluding remote-BSS neighbors. */ best_better_db = 0; for (i = 0; i < candidates; i++) { int afs_bias; if (!(clist[i].requirements & REQUIREMENT_C_MASK)) continue; + /* Only consider Local-BSS cells */ + if (!clist[i].bts) + continue; + better = clist[i].avg - av_rxlev; /* Apply AFS bias? */ afs_bias = 0; @@ -1052,7 +1180,8 @@ /* Select best candidate that fulfills requirement A: can service the call. * From above we know that there are no options that avoid congestion. Here we're trying to find - * *any* free lchan that has no critically low RXLEV and is able to handle the MS. */ + * *any* free lchan that has no critically low RXLEV and is able to handle the MS. + * We're also prepared to handover to remote BSS. */ best_better_db = 0; for (i = 0; i < candidates; i++) { int afs_bias; @@ -1060,9 +1189,11 @@ continue; better = clist[i].avg - av_rxlev; - /* Apply AFS bias? */ + /* Apply AFS bias? + * (never to remote-BSS neighbors, since we will not change the lchan type for those.) */ afs_bias = 0; - if (ahs && (clist[i].requirements & REQUIREMENT_A_TCHF)) + if (ahs && (clist[i].requirements & REQUIREMENT_A_TCHF) + && clist[i].bts) afs_bias = ho_get_hodec2_afs_bias_rxlev(clist[i].bts->ho); better += afs_bias; if (better > best_better_db) { @@ -1385,6 +1516,14 @@ if (!clist[i].lchan) continue; + /* Do not resolve congestion towards remote BSS, which would cause oscillation if the + * remote BSS is also congested. */ + /* TODO: attempt inter-BSC HO if no local cells qualify, and rely on the remote BSS to + * deny receiving the handover if it also considers itself congested. Maybe do that only + * when the cell is absolutely full, i.e. not only min-free-slots. (x) */ + if (!clist[i].bts) + continue; + if (!(clist[i].requirements & REQUIREMENT_B_MASK)) continue; /* omit assignment from AHS to AFS */ @@ -1462,6 +1601,12 @@ if (!clist[i].lchan) continue; + /* Do not resolve congestion towards remote BSS, which would cause oscillation if + * the remote BSS is also congested. */ + /* TODO: see (x) above */ + if (!clist[i].bts) + continue; + if (!(clist[i].requirements & REQUIREMENT_B_MASK)) continue; /* omit all but assignment from AHS to AFS */ @@ -1524,6 +1669,12 @@ if (!clist[i].lchan) continue; + /* Do not resolve congestion towards remote BSS, which would cause oscillation if + * the remote BSS is also congested. */ + /* TODO: see (x) above */ + if (!clist[i].bts) + continue; + if (!(clist[i].requirements & REQUIREMENT_C_MASK)) continue; /* omit assignment from AHS to AFS */ @@ -1602,6 +1753,12 @@ if (!clist[i].lchan) continue; + /* Do not resolve congestion towards remote BSS, which would cause oscillation if + * the remote BSS is also congested. */ + /* TODO: see (x) above */ + if (!clist[i].bts) + continue; + if (!(clist[i].requirements & REQUIREMENT_C_MASK)) continue; /* omit all but assignment from AHS to AFS */ -- To view, visit https://gerrit.osmocom.org/11321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id78ac1b2016998a2931a23d62ec7a3f37bb764c6 Gerrit-Change-Number: 11321 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:34:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:34:35 +0000 Subject: Change in libosmo-sccp[master]: build: move include/{mtp, sccp} to include/osmocom/ In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11120 ) Change subject: build: move include/{mtp,sccp} to include/osmocom/ ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1209a4ecf9f692a8030b5c93cd281fc9dd58d105 Gerrit-Change-Number: 11120 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Sun, 21 Oct 2018 12:34:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:35:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:35:28 +0000 Subject: Change in simtrace2[master]: remsim: fix TPDU response size transmission In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11362 ) Change subject: remsim: fix TPDU response size transmission ...................................................................... remsim: fix TPDU response size transmission the TDPU response data size can be up to 256. this length cannot be stored in a uint8_t, which would cause the length to become 0, no data being send, and the reader reset the card because of misbehaviour of the card (i.e. no/malformed response leading to the timeout of the waiting time). Change-Id: Iae7671085aaa3115a02d82530dd7a0e7e2d4155e --- M host/simtrace2-remsim.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/host/simtrace2-remsim.c b/host/simtrace2-remsim.c index d0bbb8c..73a7272 100644 --- a/host/simtrace2-remsim.c +++ b/host/simtrace2-remsim.c @@ -218,7 +218,7 @@ /*! \brief Request the SIMtrace2 to transmit a Procedure Byte, then Tx */ static int cardem_request_pb_and_tx(struct cardem_inst *ci, uint8_t pb, - const uint8_t *data, uint8_t data_len_in) + const uint8_t *data, uint16_t data_len_in) { struct msgb *msg = st_msgb_alloc(); struct cardemu_usb_msg_tx_data *txd; -- To view, visit https://gerrit.osmocom.org/11362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iae7671085aaa3115a02d82530dd7a0e7e2d4155e Gerrit-Change-Number: 11362 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:35:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:35:35 +0000 Subject: Change in libosmocore[master]: SGsAP protocol definitions (header + C file) In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11412 ) Change subject: SGsAP protocol definitions (header + C file) ...................................................................... SGsAP protocol definitions (header + C file) Change-Id: Idddfc9b851eb4c2fa7dd661a9ce1b03a04883109 --- M include/Makefile.am A include/osmocom/gsm/protocol/gsm_29_118.h M src/gsm/Makefile.am A src/gsm/gsm29118.c M src/gsm/libosmogsm.map 5 files changed, 304 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/Makefile.am b/include/Makefile.am index 19695d1..59a5fed 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -114,6 +114,7 @@ osmocom/gsm/protocol/gsm_09_02.h \ osmocom/gsm/protocol/gsm_12_21.h \ osmocom/gsm/protocol/gsm_23_003.h \ + osmocom/gsm/protocol/gsm_29_118.h \ osmocom/gsm/protocol/gsm_44_318.h \ osmocom/gsm/protocol/ipaccess.h \ osmocom/gsm/protocol/smpp34_osmocom.h \ diff --git a/include/osmocom/gsm/protocol/gsm_29_118.h b/include/osmocom/gsm/protocol/gsm_29_118.h new file mode 100644 index 0000000..24e9de2 --- /dev/null +++ b/include/osmocom/gsm/protocol/gsm_29_118.h @@ -0,0 +1,169 @@ +#pragma once + + +/* TS 29.118 Section 9.2 */ +enum sgsap_msg_type { + /* unassigned */ + SGSAP_MSGT_PAGING_REQ = 0x01, + SGSAP_MSGT_PAGING_REJ = 0x02, + /* unassigned */ + SGSAP_MSGT_SERVICE_REQ = 0x06, + SGSAP_MSGT_DL_UD = 0x07, + SGSAP_MSGT_UL_UD = 0x08, + SGSAP_MSGT_LOC_UPD_REQ = 0x09, + SGSAP_MSGT_LOC_UPD_ACK = 0x0a, + SGSAP_MSGT_LOC_UPD_REJ = 0x0b, + SGSAP_MSGT_TMSI_REALL_CMPL = 0x0c, + SGSAP_MSGT_ALERT_REQ = 0x0d, + SGSAP_MSGT_ALERT_ACK = 0x0e, + SGSAP_MSGT_ALERT_REJ = 0x0f, + SGSAP_MSGT_UE_ACT_IND = 0x10, + SGSAP_MSGT_EPS_DET_IND = 0x11, + SGSAP_MSGT_EPS_DET_ACK = 0x12, + SGSAP_MSGT_IMSI_DET_IND = 0x13, + SGSAP_MSGT_IMSI_DET_ACK = 0x14, + SGSAP_MSGT_RESET_IND = 0x15, + SGSAP_MSGT_RESET_ACK = 0x16, + SGSAP_MSGT_SERVICE_ABORT_REQ = 0x17, + SGSAP_MSGT_MO_CSFB_IND = 0x18, + /* unassigned */ + SGSAP_MSGT_MM_INFO_REQ = 0x1a, + SGSAP_MSGT_RELEASE_REQ = 0x1b, + /* unassigned */ + SGSAP_MSGT_STATUS = 0x1d, + /* unassigned */ + SGSAP_MSGT_UE_UNREACHABLE = 0x1f, +}; +const struct value_string sgsap_msg_type_names[]; +static inline const char *sgsap_msg_type_name(enum sgsap_msg_type msgt) { + return get_value_string(sgsap_msg_type_names, msgt); +} + +/* TS 29.118 Section 9.3 */ +enum sgsap_iei { + SGSAP_IE_IMSI = 0x01, + SGSAP_IE_VLR_NAME = 0x02, + SGSAP_IE_TMSI = 0x03, + SGSAP_IE_LAI = 0x04, + SGSAP_IE_CHAN_NEEDED = 0x05, + SGSAP_IE_EMLPP_PRIORITY = 0x06, + SGSAP_IE_TMSI_STATUS = 0x07, + SGSAP_IE_SGS_CAUSE = 0x08, + SGSAP_IE_MME_NAME = 0x09, + SGSAP_IE_EPS_LU_TYPE = 0x0a, + SGSAP_IE_GLOBAL_CN_ID = 0x0b, + SGSAP_IE_MOBILE_ID = 0x0e, + SGSAP_IE_REJECT_CAUSE = 0x0f, + SGSAP_IE_IMSI_DET_EPS_TYPE = 0x10, + SGSAP_IE_IMSI_DET_NONEPS_TYPE = 0x11, + SGSAP_IE_IMEISV = 0x15, + SGSAP_IE_NAS_MSG_CONTAINER = 0x16, + SGSAP_IE_MM_INFO = 0x17, + SGSAP_IE_ERR_MSG = 0x1b, + SGSAP_IE_CLI = 0x1c, + SGSAP_IE_LCS_CLIENT_ID = 0x1d, + SGSAP_IE_LCS_INDICATOR = 0x1e, + SGSAP_IE_SS_CODE = 0x1f, + SGSAP_IE_SERVICE_INDICATOR = 0x20, + SGSAP_IE_UE_TIMEZONE = 0x21, + SGSAP_IE_MS_CLASSMARK2 = 0x22, + SGSAP_IE_TAI = 0x23, + SGSAP_IE_EUTRAN_CGI = 0x24, + SGSAP_IE_UE_EMM_MODE = 0x25, + SGSAP_IE_ADDL_PAGING_INDICATORS = 0x26, + SGSAP_IE_TMSI_BASED_NRI_CONT = 0x27, +}; + + +/* TS 29.118 Section 9.4.2 */ +enum sgsap_eps_lu_type { + SGSAP_EPS_LUT_IMSI_ATTACH = 0x01, + SGSAP_EPS_LUT_NORMAL = 0x02, +}; +const struct value_string sgsap_eps_lu_type_names[]; +static inline const char *sgsap_eps_lu_type_name(enum sgsap_eps_lu_type lut) { + return get_value_string(sgsap_eps_lu_type_names, lut); +} + +/* TS 29.118 Section 9.4.7 */ +enum sgsap_imsi_det_eps_type { + SGSAP_ID_EPS_T_NETWORK_INITIATED = 0x01, + SGSAP_ID_EPS_T_UE_INITIATED = 0x02, + SGSAP_ID_EPS_T_EPS_NOT_ALLOWED = 0x03, +}; +const struct value_string sgsap_ismi_det_eps_type_names[]; +static inline const char *sgsap_imsi_det_eps_type_name(enum sgsap_imsi_det_eps_type idt) { + return get_value_string(sgsap_ismi_det_eps_type_names, idt); +} + +/* TS 29.118 Section 9.4.8 */ +enum sgsap_imsi_det_noneps_type { + SGSAP_ID_NONEPS_T_EXPLICIT_UE_NONEPS = 0x01, + SGSAP_ID_NONEPS_T_COMBINED_UE_EPS_NONEPS = 0x02, + SGSAP_ID_NONEPS_T_IMPLICIT_UE_EPS_NONEPS = 0x03, +}; +const struct value_string sgsap_ismi_det_noneps_type_names[]; +static inline const char *sgsap_imsi_det_noneps_type_name(enum sgsap_imsi_det_noneps_type idt) { + return get_value_string(sgsap_ismi_det_noneps_type_names, idt); +} + +/* TS 29.118 Section 9.4.17 */ +enum sgsap_service_ind { + SGSAP_SERV_IND_CS_CALL = 0x01, + SGSAP_SERV_IND_SMS = 0x02, +}; +const struct value_string sgsap_service_ind_names[]; +static inline const char *sgsap_service_ind_name(enum sgsap_service_ind si) { + return get_value_string(sgsap_service_ind_names, si); +} + +/* TS 29.118 Section 9.4.18 */ +enum sgsap_sgs_cause { + SGSAP_SGS_CAUSE_IMSI_DET_EPS = 0x01, + SGSAP_SGS_CAUSE_IMSI_DET_EPS_NONEPS = 0x02, + SGSAP_SGS_CAUSE_IMSI_UNKNOWN = 0x03, + SGSAP_SGS_CAUSE_IMSI_DET_NON_EPS = 0x04, + SGSAP_SGS_CAUSE_IMSI_IMPL_DET_NON_EPS = 0x05, + SGSAP_SGS_CAUSE_UE_UNREACHABLE = 0x06, + SGSAP_SGS_CAUSE_MSG_INCOMP_STATE = 0x07, + SGSAP_SGS_CAUSE_MISSING_MAND_IE = 0x08, + SGSAP_SGS_CAUSE_INVALID_MAND_IE = 0x09, + SGSAP_SGS_CAUSE_COND_IE_ERROR = 0x0a, + SGSAP_SGS_CAUSE_SEMANT_INCORR_MSG = 0x0b, + SGSAP_SGS_CAUSE_MSG_UNKNOWN = 0x0c, + SGSAP_SGS_CAUSE_MT_CSFB_REJ_USER = 0x0d, + SGSAP_SGS_CAUSE_UE_TEMP_UNREACHABLE = 0x0e, +}; +const struct value_string sgsap_sgs_cause_names[]; +static inline const char *sgsap_sgs_cause_name(enum sgsap_sgs_cause cause) { + return get_value_string(sgsap_sgs_cause_names, cause); +} + +/* TS 29.118 Section 9.4.21c */ +enum sgsap_ue_emm_mode { + SGSAP_UE_EMM_MODE_IDLE = 0x00, + SGSAP_UE_EMM_MODE_CONNECTED = 0x01, +}; +const struct value_string sgsap_ue_emm_mode_names[]; +static inline const char *sgsap_ue_emm_mode_name(enum sgsap_ue_emm_mode mode) { + return get_value_string(sgsap_ue_emm_mode_names, mode); +} + +/* TS 29.118 Section 10.1 Table 10.1.2 */ +#define SGS_TS5_DEFAULT 10 /* Guards the Paging Procedure at the VLR */ +#define SGS_TS6_2_DEFAULT 40 /* Guards the TMSI reallocation procedure */ +#define SGS_TS7_DEFAULT 4 /* Guards the non-EPS alert procedure */ +#define SGS_TS11_DEFAULT 4 /* Guards the VLR reset procedure */ +#define SGS_TS14_DEFAULT 10 /* Guards the UE fallback to UTRAN/GERAN */ +#define SGS_TS15_DEFAULT 10 /* Guards the MO UE fallback to UTRAN/GERAN */ + +/* TS 29.118 Section 10.2 Table 10.2.1 */ +#define SGS_NS7_DEFAULT 2 +#define SGS_NS11_DEFAULT 2 +/* TS 29.118 Section 10.2 Table 10.2.2 */ +#define SGS_NS8_DEFAULT 2 +#define SGS_NS9_DEFAULT 2 +#define SGS_NS10_DEFAULT 2 +#define SGS_NS12_DEFAULT 2 + +const struct tlv_definition sgsap_ie_tlvdef; diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 29299a6..e28ea33 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -30,7 +30,8 @@ milenage/aes-internal.c milenage/aes-internal-enc.c \ milenage/milenage.c gan.c ipa.c gsm0341.c apn.c \ gsup.c gprs_gea.c gsm0503_conv.c oap.c gsm0808_utils.c \ - gsm23003.c mncc.c bts_features.c oap_client.c + gsm23003.c mncc.c bts_features.c oap_client.c \ + gsm29118.c libgsmint_la_LDFLAGS = -no-undefined libgsmint_la_LIBADD = $(top_builddir)/src/libosmocore.la diff --git a/src/gsm/gsm29118.c b/src/gsm/gsm29118.c new file mode 100644 index 0000000..de625a9 --- /dev/null +++ b/src/gsm/gsm29118.c @@ -0,0 +1,123 @@ +#include +#include + +#include + +const struct value_string sgsap_msg_type_names[] = { + { SGSAP_MSGT_PAGING_REQ, "PAGING-REQUEST" }, + { SGSAP_MSGT_PAGING_REJ, "PAGING-REJECT" }, + { SGSAP_MSGT_SERVICE_REQ, "SERVICE-REQUEST" }, + { SGSAP_MSGT_DL_UD, "DOWNLINK-UNITDATA" }, + { SGSAP_MSGT_UL_UD, "UPLINK-UNITDATA" }, + { SGSAP_MSGT_LOC_UPD_REQ, "LOCATION-UPDATE-REQUEST" }, + { SGSAP_MSGT_LOC_UPD_ACK, "LOCATION-UPDATE-ACCEPT" }, + { SGSAP_MSGT_LOC_UPD_REJ, "LOCATION-UPDATE-REJECT" }, + { SGSAP_MSGT_TMSI_REALL_CMPL, "TMSI-REALLOCATION-COMPLETE" }, + { SGSAP_MSGT_ALERT_REQ, "ALERT-REQQUEST" }, + { SGSAP_MSGT_ALERT_ACK, "ALERT-ACK" }, + { SGSAP_MSGT_ALERT_REJ, "ALERT-REJECT" }, + { SGSAP_MSGT_UE_ACT_IND, "UE-ACTIVITY-INDICATION" }, + { SGSAP_MSGT_EPS_DET_IND, "EPS-DETACH-INDICATION" }, + { SGSAP_MSGT_EPS_DET_ACK, "EPS-DETACH-ACK" }, + { SGSAP_MSGT_IMSI_DET_IND, "IMSI-DETACH-INDICATION" }, + { SGSAP_MSGT_IMSI_DET_ACK, "IMSI-DETACH-ACK" }, + { SGSAP_MSGT_RESET_IND, "RESET-INDICATION" }, + { SGSAP_MSGT_RESET_ACK, "RESET-ACK" }, + { SGSAP_MSGT_SERVICE_ABORT_REQ, "SERVICE-ABORT-REQUEST" }, + { SGSAP_MSGT_MO_CSFB_IND, "MO-CSFB-INDICATION" }, + { SGSAP_MSGT_MM_INFO_REQ, "MM-INFO-REQUEST" }, + { SGSAP_MSGT_RELEASE_REQ, "RELEASE-REQUEST" }, + { SGSAP_MSGT_STATUS, "STATUS" }, + { SGSAP_MSGT_UE_UNREACHABLE, "UE-UNREACHABLE" }, + { 0, NULL } +}; + +const struct value_string sgsap_eps_lu_type_names[] = { + { SGSAP_EPS_LUT_IMSI_ATTACH, "IMSI Attach" }, + { SGSAP_EPS_LUT_NORMAL, "Normal" }, + { 0, NULL } +}; + +const struct value_string sgsap_ismi_det_eps_type_names[] = { + { SGSAP_ID_EPS_T_NETWORK_INITIATED, "Network initiated IMSI detach from EPS" }, + { SGSAP_ID_EPS_T_UE_INITIATED, "UE initiated IMSI detach from EPS" }, + { SGSAP_ID_EPS_T_EPS_NOT_ALLOWED, "EPS not allowed" }, + { 0, NULL } +}; + +const struct value_string sgsap_ismi_det_noneps_type_names[] = { + { SGSAP_ID_NONEPS_T_EXPLICIT_UE_NONEPS, + "Explicit UE initiated IMSI detach from non-EPS" }, + { SGSAP_ID_NONEPS_T_COMBINED_UE_EPS_NONEPS, + "Combined UE initiated IMSI detach from EPS and non-EPS" }, + { SGSAP_ID_NONEPS_T_IMPLICIT_UE_EPS_NONEPS, + "Implicit network initiated IMSI detach from EPS and non-EPS" }, + { 0, NULL } +}; + +const struct value_string sgsap_service_ind_names[] = { + { SGSAP_SERV_IND_CS_CALL, "CS Call" }, + { SGSAP_SERV_IND_SMS, "SMS" }, + { 0, NULL } +}; + +const struct value_string sgsap_sgs_cause_names[] = { + { SGSAP_SGS_CAUSE_IMSI_DET_EPS, "IMSI detached for EPS" }, + { SGSAP_SGS_CAUSE_IMSI_DET_EPS_NONEPS, "IMSI detached for EPS and non-EPS" }, + { SGSAP_SGS_CAUSE_IMSI_UNKNOWN, "IMSI unknown" }, + { SGSAP_SGS_CAUSE_IMSI_DET_NON_EPS, "IMSI detached for non-EPS" }, + { SGSAP_SGS_CAUSE_IMSI_IMPL_DET_NON_EPS,"IMSI implicitly detached for non-EPS" }, + { SGSAP_SGS_CAUSE_UE_UNREACHABLE, "UE unreachable" }, + { SGSAP_SGS_CAUSE_MSG_INCOMP_STATE, "Message not compatible with protocol state" }, + { SGSAP_SGS_CAUSE_MISSING_MAND_IE, "Missing mandatory IE" }, + { SGSAP_SGS_CAUSE_INVALID_MAND_IE, "Invalid mandatory IE" }, + { SGSAP_SGS_CAUSE_COND_IE_ERROR, "Conditional IE error" }, + { SGSAP_SGS_CAUSE_SEMANT_INCORR_MSG, "Semantically incorrect message" }, + { SGSAP_SGS_CAUSE_MSG_UNKNOWN, "Message unknown" }, + { SGSAP_SGS_CAUSE_MT_CSFB_REJ_USER, "MT CSFB call rejected by user" }, + { SGSAP_SGS_CAUSE_UE_TEMP_UNREACHABLE, "UE temporarily unreachable" }, + { 0, NULL } +}; + + +const struct value_string sgsap_ue_emm_mode_names[] = { + { SGSAP_UE_EMM_MODE_IDLE, "EMM-IDLE" }, + { SGSAP_UE_EMM_MODE_CONNECTED, "EMM-CONNECTED" }, + { 0, NULL } +}; + +const struct tlv_definition sgsap_ie_tlvdef = { + .def = { + [SGSAP_IE_IMSI] = { TLV_TYPE_TLV }, + [SGSAP_IE_VLR_NAME] = { TLV_TYPE_TLV }, + [SGSAP_IE_TMSI] = { TLV_TYPE_TLV }, + [SGSAP_IE_LAI] = { TLV_TYPE_TLV }, + [SGSAP_IE_CHAN_NEEDED] = { TLV_TYPE_TLV }, + [SGSAP_IE_EMLPP_PRIORITY] = { TLV_TYPE_TLV }, + [SGSAP_IE_TMSI_STATUS] = { TLV_TYPE_TLV }, + [SGSAP_IE_SGS_CAUSE] = { TLV_TYPE_TLV }, + [SGSAP_IE_MME_NAME] = { TLV_TYPE_TLV }, + [SGSAP_IE_EPS_LU_TYPE] = { TLV_TYPE_TLV }, + [SGSAP_IE_GLOBAL_CN_ID] = { TLV_TYPE_TLV }, + [SGSAP_IE_MOBILE_ID] = { TLV_TYPE_TLV }, + [SGSAP_IE_REJECT_CAUSE] = { TLV_TYPE_TLV }, + [SGSAP_IE_IMSI_DET_EPS_TYPE] = { TLV_TYPE_TLV }, + [SGSAP_IE_IMSI_DET_NONEPS_TYPE] = { TLV_TYPE_TLV }, + [SGSAP_IE_IMEISV] = { TLV_TYPE_TLV }, + [SGSAP_IE_NAS_MSG_CONTAINER] = { TLV_TYPE_TLV }, + [SGSAP_IE_MM_INFO] = { TLV_TYPE_TLV }, + [SGSAP_IE_ERR_MSG] = { TLV_TYPE_TLV }, + [SGSAP_IE_CLI] = { TLV_TYPE_TLV }, + [SGSAP_IE_LCS_CLIENT_ID] = { TLV_TYPE_TLV }, + [SGSAP_IE_LCS_INDICATOR] = { TLV_TYPE_TLV }, + [SGSAP_IE_SS_CODE] = { TLV_TYPE_TLV }, + [SGSAP_IE_SERVICE_INDICATOR] = { TLV_TYPE_TLV }, + [SGSAP_IE_UE_TIMEZONE] = { TLV_TYPE_TLV }, + [SGSAP_IE_MS_CLASSMARK2] = { TLV_TYPE_TLV }, + [SGSAP_IE_TAI] = { TLV_TYPE_TLV }, + [SGSAP_IE_EUTRAN_CGI] = { TLV_TYPE_TLV }, + [SGSAP_IE_UE_EMM_MODE] = { TLV_TYPE_TLV }, + [SGSAP_IE_ADDL_PAGING_INDICATORS]={ TLV_TYPE_TLV }, + [SGSAP_IE_TMSI_BASED_NRI_CONT] = { TLV_TYPE_TLV }, + }, +}; diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index dcc491d..3cc2ec5 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -505,5 +505,14 @@ osmo_oap_client_init; osmo_oap_client_register; +sgsap_msg_type_names; +sgsap_eps_lu_type_names; +sgsap_ismi_det_eps_type_names; +sgsap_ismi_det_noneps_type_names; +sgsap_service_ind_names; +sgsap_sgs_cause_names; +sgsap_ue_emm_mode_names; +sgsap_ie_tlvdef; + local: *; }; -- To view, visit https://gerrit.osmocom.org/11412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idddfc9b851eb4c2fa7dd661a9ce1b03a04883109 Gerrit-Change-Number: 11412 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:35:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:35:55 +0000 Subject: Change in osmo-sgsn[master]: gtphub: Add --version cmdline option In-Reply-To: References: Message-ID: Harald Welte has uploaded a new patch set (#2) to the change originally created by osmith. ( https://gerrit.osmocom.org/11385 ) Change subject: gtphub: Add --version cmdline option ...................................................................... gtphub: Add --version cmdline option Related: OS#3576 Change-Id: Icdb2bd9ec90511b51428800d17f8ce81f6804670 --- M src/gprs/gtphub_main.c 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/85/11385/2 -- To view, visit https://gerrit.osmocom.org/11385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icdb2bd9ec90511b51428800d17f8ce81f6804670 Gerrit-Change-Number: 11385 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:36:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:36:00 +0000 Subject: Change in osmo-sgsn[master]: gtphub: Add --version cmdline option In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11385 ) Change subject: gtphub: Add --version cmdline option ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icdb2bd9ec90511b51428800d17f8ce81f6804670 Gerrit-Change-Number: 11385 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 21 Oct 2018 12:36:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:36:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:36:05 +0000 Subject: Change in osmo-sgsn[master]: gtphub: Add --version cmdline option In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11385 ) Change subject: gtphub: Add --version cmdline option ...................................................................... gtphub: Add --version cmdline option Related: OS#3576 Change-Id: Icdb2bd9ec90511b51428800d17f8ce81f6804670 --- M src/gprs/gtphub_main.c 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/gtphub_main.c b/src/gprs/gtphub_main.c index a1a2c1d..f824016 100644 --- a/src/gprs/gtphub_main.c +++ b/src/gprs/gtphub_main.c @@ -238,6 +238,7 @@ printf(" -e,--log-level Set a global log level.\n"); printf(" -r,--restart-file File for counting restarts [%s].\n", ccfg->restart_counter_file); + printf(" -V,--version Print the version number.\n"); } static void list_categories(void) @@ -265,10 +266,11 @@ {"timestamp", 0, 0, 'T'}, {"log-level", 1, 0, 'e'}, {"restart-file", 1, 0, 'r'}, + { "version", 0, 0, 'V' }, {NULL, 0, 0, 0} }; - c = getopt_long(argc, argv, "hd:Dc:sTe:r:", + c = getopt_long(argc, argv, "hd:Dc:sTe:r:V", long_options, &option_index); if (c == -1) { if (optind < argc) { @@ -310,6 +312,10 @@ case 'r': ccfg->restart_counter_file = optarg; break; + case 'V': + print_version(1); + exit(EXIT_SUCCESS); + break; default: LOGP(DGTPHUB, LOGL_FATAL, "Invalid command line argument, abort.\n"); exit(1); -- To view, visit https://gerrit.osmocom.org/11385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icdb2bd9ec90511b51428800d17f8ce81f6804670 Gerrit-Change-Number: 11385 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:41:52 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 21 Oct 2018 12:41:52 +0000 Subject: Change in libosmocore[master]: libosmogsm/gsup.c: fix error code in osmo_gsup_encode() In-Reply-To: References: Message-ID: Hello Max, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11325 to look at the new patch set (#2). Change subject: libosmogsm/gsup.c: fix error code in osmo_gsup_encode() ...................................................................... libosmogsm/gsup.c: fix error code in osmo_gsup_encode() Missing (unset) type of to be encoded message is not a memory allocation failure (-ENOMEM), this is definitely a mistake. Change-Id: Ibbac18e2b68b765c17c2bc959c4c085037953a7f --- M src/gsm/gsup.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/11325/2 -- To view, visit https://gerrit.osmocom.org/11325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibbac18e2b68b765c17c2bc959c4c085037953a7f Gerrit-Change-Number: 11325 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:43:48 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 21 Oct 2018 12:43:48 +0000 Subject: Change in libosmocore[master]: libosmogsm/gsup.c: fix error code in osmo_gsup_encode() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11325 ) Change subject: libosmogsm/gsup.c: fix error code in osmo_gsup_encode() ...................................................................... Patch Set 2: We can use __attribute__((warn_unused_result)) to force caller to check for return value. -- To view, visit https://gerrit.osmocom.org/11325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibbac18e2b68b765c17c2bc959c4c085037953a7f Gerrit-Change-Number: 11325 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sun, 21 Oct 2018 12:43:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:56:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:56:53 +0000 Subject: Change in libosmocore[master]: libosmogsm/gsup.c: fix error code in osmo_gsup_encode() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11325 ) Change subject: libosmogsm/gsup.c: fix error code in osmo_gsup_encode() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibbac18e2b68b765c17c2bc959c4c085037953a7f Gerrit-Change-Number: 11325 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Sun, 21 Oct 2018 12:56:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:56:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:56:54 +0000 Subject: Change in libosmocore[master]: libosmogsm/gsup.c: fix error code in osmo_gsup_encode() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11325 ) Change subject: libosmogsm/gsup.c: fix error code in osmo_gsup_encode() ...................................................................... libosmogsm/gsup.c: fix error code in osmo_gsup_encode() Missing (unset) type of to be encoded message is not a memory allocation failure (-ENOMEM), this is definitely a mistake. Change-Id: Ibbac18e2b68b765c17c2bc959c4c085037953a7f --- M src/gsm/gsup.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index 9c2f817..18b3580 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -535,7 +535,7 @@ /* generic part */ if(!gsup_msg->message_type) - return -ENOMEM; + return -EINVAL; msgb_v_put(msg, gsup_msg->message_type); -- To view, visit https://gerrit.osmocom.org/11325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibbac18e2b68b765c17c2bc959c4c085037953a7f Gerrit-Change-Number: 11325 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 21 12:57:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 21 Oct 2018 12:57:02 +0000 Subject: Change in libosmo-sccp[master]: build: move include/{mtp, sccp} to include/osmocom/ In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11120 ) Change subject: build: move include/{mtp,sccp} to include/osmocom/ ...................................................................... build: move include/{mtp,sccp} to include/osmocom/ Anywhere else in the Osmocom code base, we arrange headers in include/osmocom/foo/ and pass -I ${root_srcdir}/include/. This way including an osmocom header always has the format #include whether we are including from the local source tree or from $prefix. For some reason not clear to me, the mtp and sccp folders, even though they are being installed to $prefix/include/osmocom/, were kept *next* to the osmocom/ dir, instead of inside it. Fix that weird situation. The motivation is that I wanted to use a definition from sccp_types.h in a public-API header. That is impossible if it requires #include in a local build, but #include for any other source tree using libosmo-sccp. After this patch, both are identical and including works without quirks. (The other patch that needed this has changed in the meantime on and no longer needs this, but this still makes sense for future hacking.) The installed result does not change, since both mtp/*.h and sccp/*.h have always been installed to $prefix/include/osmocom/{mtp,sccp}/. This merely changes their position in the source tree. The most curious situation before this is that any patch #including might not get a notice that the header didn't exist, but might instead include an older system-installed file. Change-Id: I1209a4ecf9f692a8030b5c93cd281fc9dd58d105 --- M configure.ac M include/Makefile.am M include/osmocom/Makefile.am R include/osmocom/mtp/Makefile.am R include/osmocom/mtp/mtp_level3.h R include/osmocom/mtp/mtp_pcap.h R include/osmocom/sccp/Makefile.am R include/osmocom/sccp/sccp.h R include/osmocom/sccp/sccp_types.h M src/mtp_pcap.c M src/sccp.c M src/sccp2sua.c M src/sccp_sclc.c M src/sccp_scoc.c M src/sccp_scrc.c M tests/mtp/mtp_parse_test.c M tests/sccp/sccp_test.c 17 files changed, 12 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 7dfb266..acef6f6 100644 --- a/configure.ac +++ b/configure.ac @@ -136,9 +136,9 @@ libosmo-sccp.pc libosmo-mtp.pc libosmo-xua.pc - include/sccp/Makefile - include/mtp/Makefile include/osmocom/Makefile + include/osmocom/sccp/Makefile + include/osmocom/mtp/Makefile include/osmocom/sigtran/Makefile include/Makefile src/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index 7cd4b57..3578a80 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1 +1 @@ -SUBDIRS = sccp mtp osmocom +SUBDIRS = osmocom diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am index 7e86a4b..c4535f3 100644 --- a/include/osmocom/Makefile.am +++ b/include/osmocom/Makefile.am @@ -1 +1 @@ -SUBDIRS = sigtran +SUBDIRS = mtp sccp sigtran diff --git a/include/mtp/Makefile.am b/include/osmocom/mtp/Makefile.am similarity index 100% rename from include/mtp/Makefile.am rename to include/osmocom/mtp/Makefile.am diff --git a/include/mtp/mtp_level3.h b/include/osmocom/mtp/mtp_level3.h similarity index 100% rename from include/mtp/mtp_level3.h rename to include/osmocom/mtp/mtp_level3.h diff --git a/include/mtp/mtp_pcap.h b/include/osmocom/mtp/mtp_pcap.h similarity index 100% rename from include/mtp/mtp_pcap.h rename to include/osmocom/mtp/mtp_pcap.h diff --git a/include/sccp/Makefile.am b/include/osmocom/sccp/Makefile.am similarity index 100% rename from include/sccp/Makefile.am rename to include/osmocom/sccp/Makefile.am diff --git a/include/sccp/sccp.h b/include/osmocom/sccp/sccp.h similarity index 100% rename from include/sccp/sccp.h rename to include/osmocom/sccp/sccp.h diff --git a/include/sccp/sccp_types.h b/include/osmocom/sccp/sccp_types.h similarity index 100% rename from include/sccp/sccp_types.h rename to include/osmocom/sccp/sccp_types.h diff --git a/src/mtp_pcap.c b/src/mtp_pcap.c index e83e6f7..a59efc5 100644 --- a/src/mtp_pcap.c +++ b/src/mtp_pcap.c @@ -22,7 +22,7 @@ * */ -#include +#include #include diff --git a/src/sccp.c b/src/sccp.c index a15a84b..8c3641c 100644 --- a/src/sccp.c +++ b/src/sccp.c @@ -31,7 +31,7 @@ #include #include -#include +#include // Unassigned debug area static int DSCCP = 0; diff --git a/src/sccp2sua.c b/src/sccp2sua.c index 2f5b687..f68f9a9 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/sccp_sclc.c b/src/sccp_sclc.c index e4dbae6..db67660 100644 --- a/src/sccp_sclc.c +++ b/src/sccp_sclc.c @@ -56,7 +56,7 @@ #include #include -#include +#include #include "xua_internal.h" #include "sccp_internal.h" diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 8138e43..fbbad49 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -56,7 +56,7 @@ #include #include -#include +#include #include "xua_internal.h" #include "sccp_internal.h" diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index 9005dc7..db49299 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/tests/mtp/mtp_parse_test.c b/tests/mtp/mtp_parse_test.c index 75650a3..92c34ca 100644 --- a/tests/mtp/mtp_parse_test.c +++ b/tests/mtp/mtp_parse_test.c @@ -1,5 +1,5 @@ /* MTP Layer3 parsing tests */ -#include +#include #include diff --git a/tests/sccp/sccp_test.c b/tests/sccp/sccp_test.c index ed485bc..ba9ff7a 100644 --- a/tests/sccp/sccp_test.c +++ b/tests/sccp/sccp_test.c @@ -31,7 +31,7 @@ #include #include -#include +#include #define MIN(x, y) ((x) < (y) ? (x) : (y)) -- To view, visit https://gerrit.osmocom.org/11120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1209a4ecf9f692a8030b5c93cd281fc9dd58d105 Gerrit-Change-Number: 11120 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Oct 21 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 21 Oct 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#283?= In-Reply-To: <755436845.130.1540048207391.JavaMail.jenkins@jenkins.osmocom.org> References: <755436845.130.1540048207391.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2011143351.141.1540134607332.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Oct 22 01:06:07 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 22 Oct 2018 01:06:07 +0000 Subject: Change in osmo-trx[master]: sigProcLib: add a CorrType for extended (11-bit) RACH Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11422 Change subject: sigProcLib: add a CorrType for extended (11-bit) RACH ...................................................................... sigProcLib: add a CorrType for extended (11-bit) RACH This is a preparatory change that enables a possibility to choose the amount of synch. sequences to be used for Access Burst (RACH) detection. The VTY flag will be introduced in further changes. There are two correlation types now: - RACH (default) - TS0 only; - EXT_RACH - all TS0, TS1, and TS2 together. Change-Id: Ia4f20524350bb8c380d7e10360758eddae8b03e9 Related: OS#3054 --- M Transceiver52M/sigProcLib.cpp M Transceiver52M/sigProcLib.h 2 files changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/22/11422/1 diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp index 072fb3b..28c4ded 100644 --- a/Transceiver52M/sigProcLib.cpp +++ b/Transceiver52M/sigProcLib.cpp @@ -1602,18 +1602,22 @@ * tail: Search 8 symbols + maximum expected delay */ static int detectRACHBurst(const signalVector &burst, float threshold, int sps, - complex &litude, float &toa, unsigned max_toa) + complex &litude, float &toa, unsigned max_toa, bool ext) { int rc, target, head, tail; - CorrelationSequence *sync; + int i, num_seq; target = 8 + 40; head = 8; tail = 8 + max_toa; - sync = gRACHSequences[0]; + num_seq = ext ? 3 : 1; - rc = detectGeneralBurst(burst, threshold, sps, amplitude, toa, - target, head, tail, sync); + for (i = 0; i < num_seq; i++) { + rc = detectGeneralBurst(burst, threshold, sps, amplitude, toa, + target, head, tail, gRACHSequences[i]); + if (rc > 0) + break; + } return rc; } @@ -1682,9 +1686,10 @@ rc = analyzeTrafficBurst(burst, tsc, threshold, sps, amp, toa, max_toa); break; + case EXT_RACH: case RACH: rc = detectRACHBurst(burst, threshold, sps, amp, toa, - max_toa); + max_toa, type == EXT_RACH); break; default: LOG(ERR) << "Invalid correlation type"; diff --git a/Transceiver52M/sigProcLib.h b/Transceiver52M/sigProcLib.h index 9bc7e10..79a5c3f 100644 --- a/Transceiver52M/sigProcLib.h +++ b/Transceiver52M/sigProcLib.h @@ -29,6 +29,7 @@ enum CorrType{ OFF, ///< timeslot is off TSC, ///< timeslot should contain a normal burst + EXT_RACH, ///< timeslot should contain an extended access burst RACH, ///< timeslot should contain an access burst EDGE, ///< timeslot should contain an EDGE burst IDLE ///< timeslot is an idle (or dummy) burst -- To view, visit https://gerrit.osmocom.org/11422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia4f20524350bb8c380d7e10360758eddae8b03e9 Gerrit-Change-Number: 11422 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 01:06:07 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 22 Oct 2018 01:06:07 +0000 Subject: Change in osmo-trx[master]: VTY: add extended (11-bit) RACH detection toggle Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11423 Change subject: VTY: add extended (11-bit) RACH detection toggle ...................................................................... VTY: add extended (11-bit) RACH detection toggle Since I838c21db29c54f1924dd478c2b34b46b70aab2cd we have both TS1 and TS2 synch. sequences, in addition to "default" TS0. Let's finally introduce the VTY configuration parameter, that can be used to toggle optional detection of both TS1 and TS2. Note: we keep this optional because of potentially bad impact on performance. There's no point in paying the performance penalty unless upper levels (BTS, PCU) actually make use of it. Change-Id: I1aee998d83b06692d76a83f79748f9129a2547e8 Related: OS#3054 --- M CommonLibs/trx_vty.c M CommonLibs/trx_vty.h M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h M Transceiver52M/osmo-trx.cpp M doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg M doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg M doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg M doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg 9 files changed, 40 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/23/11423/1 diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index 45b58eb..1bece1e 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -304,6 +304,22 @@ return CMD_SUCCESS; } +DEFUN(cfg_ext_rach, cfg_ext_rach_cmd, + "ext-rach (disable|enable)", + "Enable extended (11-bit) RACH (default=disable)\n") +{ + struct trx_ctx *trx = trx_from_vty(vty); + + if (strcmp("disable", argv[0]) == 0) + trx->cfg.ext_rach = false; + else if (strcmp("enable", argv[0]) == 0) + trx->cfg.ext_rach = true; + else + return CMD_WARNING; + + return CMD_SUCCESS; +} + DEFUN(cfg_rt_prio, cfg_rt_prio_cmd, "rt-prio <1-32>", "Set the SCHED_RR real-time priority\n" @@ -417,6 +433,7 @@ vty_out(vty, " rssi-offset %f%s", trx->cfg.rssi_offset, VTY_NEWLINE); vty_out(vty, " swap-channels %s%s", trx->cfg.swap_channels ? "enable" : "disable", VTY_NEWLINE); vty_out(vty, " egprs %s%s", trx->cfg.egprs ? "enable" : "disable", VTY_NEWLINE); + vty_out(vty, " ext-rach %s%s", trx->cfg.ext_rach ? "enable" : "disable", VTY_NEWLINE); if (trx->cfg.sched_rr != 0) vty_out(vty, " rt-prio %u%s", trx->cfg.sched_rr, VTY_NEWLINE); @@ -454,6 +471,7 @@ vty_out(vty, " RSSI to dBm offset: %f%s", trx->cfg.rssi_offset, VTY_NEWLINE); vty_out(vty, " Swap channels: %s%s", trx->cfg.swap_channels ? "Enabled" : "Disabled", VTY_NEWLINE); vty_out(vty, " EDGE support: %s%s", trx->cfg.egprs ? "Enabled" : "Disabled", VTY_NEWLINE); + vty_out(vty, " Extended RACH support: %s%s", trx->cfg.ext_rach ? "Enabled" : "Disabled", VTY_NEWLINE); vty_out(vty, " Real Time Priority: %u (%s)%s", trx->cfg.sched_rr, trx->cfg.sched_rr ? "Enabled" : "Disabled", VTY_NEWLINE); vty_out(vty, " Channels: %u%s", trx->cfg.num_chans, VTY_NEWLINE); @@ -564,6 +582,7 @@ install_element(TRX_NODE, &cfg_rssi_offset_cmd); install_element(TRX_NODE, &cfg_swap_channels_cmd); install_element(TRX_NODE, &cfg_egprs_cmd); + install_element(TRX_NODE, &cfg_ext_rach_cmd); install_element(TRX_NODE, &cfg_rt_prio_cmd); install_element(TRX_NODE, &cfg_filler_cmd); diff --git a/CommonLibs/trx_vty.h b/CommonLibs/trx_vty.h index c921722..8d251ee 100644 --- a/CommonLibs/trx_vty.h +++ b/CommonLibs/trx_vty.h @@ -57,6 +57,7 @@ double offset; double rssi_offset; bool swap_channels; + bool ext_rach; bool egprs; unsigned int sched_rr; unsigned int num_chans; diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index d6ddce8..28d1a30 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -159,7 +159,8 @@ * are still expected to report clock indications through control channel * activity. */ -bool Transceiver::init(FillerType filler, size_t rtsc, unsigned rach_delay, bool edge) +bool Transceiver::init(FillerType filler, size_t rtsc, unsigned rach_delay, + bool edge, bool ext_rach) { int d_srcport, d_dstport, c_srcport, c_dstport; @@ -173,6 +174,7 @@ return false; } + mExtRACH = ext_rach; mEdge = edge; mDataSockets.resize(mChans); @@ -583,6 +585,10 @@ if (mEdge && (type == TSC)) type = EDGE; + /* Enable extended (11-bit) RACH detection if required */ + if (mExtRACH && (type == RACH)) + type = EXT_RACH; + /* Debug: dump bursts to disk */ /* bits 0-7 - chan 0 timeslots * bits 8-15 - chan 1 timeslots */ @@ -635,9 +641,11 @@ noise = 20.0 * log10(rxFullScale / state->mNoiseLev); } + unsigned max_toa = (type == RACH || type == EXT_RACH) ? + mMaxExpectedDelayAB : mMaxExpectedDelayNB; + /* Detect normal or RACH bursts */ - rc = detectAnyBurst(*burst, mTSC, BURST_THRESH, mSPSRx, type, amp, toa, - (type==RACH)?mMaxExpectedDelayAB:mMaxExpectedDelayNB); + rc = detectAnyBurst(*burst, mTSC, BURST_THRESH, mSPSRx, type, amp, toa, max_toa); if (rc > 0) { type = (CorrType) rc; diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h index e250adc..432e3b4 100644 --- a/Transceiver52M/Transceiver.h +++ b/Transceiver52M/Transceiver.h @@ -114,7 +114,8 @@ ~Transceiver(); /** Start the control loop */ - bool init(FillerType filler, size_t rtsc, unsigned rach_delay, bool edge); + bool init(FillerType filler, size_t rtsc, unsigned rach_delay, + bool edge, bool ext_rach); /** attach the radioInterface receive FIFO */ bool receiveFIFO(VectorFIFO *wFIFO, size_t chan) @@ -210,6 +211,7 @@ int mSPSRx; ///< number of samples per Rx symbol size_t mChans; + bool mExtRACH; bool mEdge; bool mOn; ///< flag to indicate that transceiver is powered on bool mForceClockInterface; ///< flag to indicate whether IND CLOCK shall be sent unconditionally after transceiver is started diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index 7f72c47..ca889c1 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -142,7 +142,7 @@ trx->cfg.rx_sps, trx->cfg.num_chans, GSM::Time(3,0), radio, trx->cfg.rssi_offset); if (!transceiver->init(trx->cfg.filler, trx->cfg.rtsc, - trx->cfg.rach_delay, trx->cfg.egprs)) { + trx->cfg.rach_delay, trx->cfg.egprs, trx->cfg.ext_rach)) { LOG(ALERT) << "Failed to initialize transceiver"; return -1; } @@ -414,6 +414,7 @@ ost << " Tx Samples-per-Symbol... " << trx->cfg.tx_sps << std::endl; ost << " Rx Samples-per-Symbol... " << trx->cfg.rx_sps << std::endl; ost << " EDGE support............ " << trx->cfg.egprs << std::endl; + ost << " Extended RACH support... " << trx->cfg.ext_rach << std::endl; ost << " Reference............... " << trx->cfg.clock_ref << std::endl; ost << " C0 Filler Table......... " << trx->cfg.filler << std::endl; ost << " Multi-Carrier........... " << trx->cfg.multi_arfcn << std::endl; diff --git a/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg b/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg index e2c67d6..b4e4f08 100644 --- a/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg +++ b/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg @@ -14,6 +14,7 @@ remote-ip 127.0.0.1 base-port 5700 egprs disable + ext-rach disable tx-sps 4 rx-sps 4 rt-prio 18 diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg index e2c67d6..b4e4f08 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg @@ -14,6 +14,7 @@ remote-ip 127.0.0.1 base-port 5700 egprs disable + ext-rach disable tx-sps 4 rx-sps 4 rt-prio 18 diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg index 1b15b47..1cdce85 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg @@ -15,6 +15,7 @@ base-port 5700 dev-args addr=192.168.10.2,pa=NONE,pa_power_max_dbm=23,fifo_ctrl_window=0,status_port=12345 egprs disable + ext-rach disable tx-sps 4 rx-sps 4 rssi-offset 38 diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg index 7d02506..3dc28ba 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg @@ -14,6 +14,7 @@ remote-ip 127.0.0.1 base-port 5700 egprs disable + ext-rach disable tx-sps 4 rx-sps 4 clock-ref external -- To view, visit https://gerrit.osmocom.org/11423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1aee998d83b06692d76a83f79748f9129a2547e8 Gerrit-Change-Number: 11423 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 01:08:31 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 22 Oct 2018 01:08:31 +0000 Subject: Change in osmo-trx[master]: sigProcLib: introduce both TS1 and TS2 RACH synch. sequences In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11390 ) Change subject: sigProcLib: introduce both TS1 and TS2 RACH synch. sequences ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I838c21db29c54f1924dd478c2b34b46b70aab2cd Gerrit-Change-Number: 11390 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Tom Tsou Gerrit-Comment-Date: Mon, 22 Oct 2018 01:08:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 06:47:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 22 Oct 2018 06:47:48 +0000 Subject: Change in osmo-trx[master]: sigProcLib: introduce both TS1 and TS2 RACH synch. sequences In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11390 ) Change subject: sigProcLib: introduce both TS1 and TS2 RACH synch. sequences ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I838c21db29c54f1924dd478c2b34b46b70aab2cd Gerrit-Change-Number: 11390 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Tom Tsou Gerrit-Comment-Date: Mon, 22 Oct 2018 06:47:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 06:48:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 22 Oct 2018 06:48:21 +0000 Subject: Change in osmo-trx[master]: sigProcLib: add a CorrType for extended (11-bit) RACH In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11422 ) Change subject: sigProcLib: add a CorrType for extended (11-bit) RACH ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia4f20524350bb8c380d7e10360758eddae8b03e9 Gerrit-Change-Number: 11422 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 22 Oct 2018 06:48:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 06:50:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 22 Oct 2018 06:50:40 +0000 Subject: Change in osmo-trx[master]: VTY: add extended (11-bit) RACH detection toggle In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11423 ) Change subject: VTY: add extended (11-bit) RACH detection toggle ...................................................................... Patch Set 1: * did you actually do some benchmarking to see if my suspicion about performance impact was correct? * it would be great if we could somehow do this automatically without having yet another config option at OsmoTRX. Maybe some addition to the TRXCTRL protocol? A separate verb, or something that can be stated during activation of the timeslot? btw: As far as I know, the 11bit RACH (and hence TS1/TS2) is ever only used on RACH. So when RACH Detection is enabled on TCH during handover, we never need TS1/TS2 and hence can optimize that case. -- To view, visit https://gerrit.osmocom.org/11423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1aee998d83b06692d76a83f79748f9129a2547e8 Gerrit-Change-Number: 11423 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 22 Oct 2018 06:50:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 08:00:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 22 Oct 2018 08:00:36 +0000 Subject: Change in osmocom-bb[master]: firmware: set corret shebang in solve_envs.py python2 script Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11424 Change subject: firmware: set corret shebang in solve_envs.py python2 script ...................................................................... firmware: set corret shebang in solve_envs.py python2 script Change-Id: I64582568f7390b7f4e3253508209a59eb78ee4dd --- M src/target/firmware/solve_envs.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/24/11424/1 diff --git a/src/target/firmware/solve_envs.py b/src/target/firmware/solve_envs.py index d6414d6..0e5f5e8 100755 --- a/src/target/firmware/solve_envs.py +++ b/src/target/firmware/solve_envs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 import sys -- To view, visit https://gerrit.osmocom.org/11424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I64582568f7390b7f4e3253508209a59eb78ee4dd Gerrit-Change-Number: 11424 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 09:01:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 22 Oct 2018 09:01:18 +0000 Subject: Change in osmo-gsm-tester[master]: ttcn3: Support running tests without PCU socket avail In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11322 ) Change subject: ttcn3: Support running tests without PCU socket avail ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I902af460b798ffdba09d77d457bac672db606368 Gerrit-Change-Number: 11322 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 22 Oct 2018 09:01:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 09:01:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 22 Oct 2018 09:01:21 +0000 Subject: Change in osmo-gsm-tester[master]: ttcn3: Allow remote hosts (sysmobts) to access RSL srv inside TTCN3 d... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11358 ) Change subject: ttcn3: Allow remote hosts (sysmobts) to access RSL srv inside TTCN3 docker ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I734fba91db535d7b183ddc7f51d324a6cd2eaf6f Gerrit-Change-Number: 11358 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 22 Oct 2018 09:01:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 09:01:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 22 Oct 2018 09:01:22 +0000 Subject: Change in osmo-gsm-tester[master]: ttcn3: Support running tests without PCU socket avail In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11322 ) Change subject: ttcn3: Support running tests without PCU socket avail ...................................................................... ttcn3: Support running tests without PCU socket avail Change-Id: I902af460b798ffdba09d77d457bac672db606368 --- M src/osmo_gsm_tester/bts.py A ttcn3/scenarios/sysmo.conf M ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl M ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh M ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py 5 files changed, 23 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py index 041b2bc..f05a1ba 100644 --- a/src/osmo_gsm_tester/bts.py +++ b/src/osmo_gsm_tester/bts.py @@ -157,6 +157,10 @@ 'Get the Pcu object associated with the BTS' pass + def bts_type(self): + 'Get the type of BTS' + return self.conf.get('type') + def set_bsc(self, bsc): self.bsc = bsc diff --git a/ttcn3/scenarios/sysmo.conf b/ttcn3/scenarios/sysmo.conf new file mode 120000 index 0000000..5374081 --- /dev/null +++ b/ttcn3/scenarios/sysmo.conf @@ -0,0 +1 @@ +../../example/scenarios/sysmo.conf \ No newline at end of file diff --git a/ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl b/ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl index 7379528..03d2721 100644 --- a/ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl +++ b/ttcn3/suites/ttcn3_bts_tests/scripts/BTS_Tests.cfg.tmpl @@ -10,7 +10,11 @@ [MODULE_PARAMETERS] BTS_Tests.mp_rsl_ip := "172.18.9.10" BTS_Tests.mp_bb_trxc_ip := "127.0.0.1" +%if pcu_available: BTS_Tests.mp_pcu_socket := "/data/unix_pcu/pcu_bts" +%else: +BTS_Tests.mp_pcu_socket := "" +%endif BTS_Tests.mp_bb_trxc_port := -1 L1CTL_PortType.m_l1ctl_sock_path := "/data/unix_l2/osmocom_l2" BTS_Tests.mp_ctrl_ip := "${btsvty_ctrl_hostname}" diff --git a/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh b/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh index 64987b3..df8dcb2 100755 --- a/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh +++ b/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh @@ -63,12 +63,17 @@ echo Starting container with BTS testsuite docker kill ${DOCKER_NAME} +if [ "x$PCU_SOCKET_PATH" != "x" ]; then + MOUNT_PCU_SOCKET_OPT="--mount type=bind,source=$(dirname "$PCU_SOCKET_PATH"),destination=/data/unix_pcu" +else + MOUNT_PCU_SOCKET_OPT="" +fi docker run --rm \ --network $NET_NAME --ip 172.18.9.10 \ -e "TTCN3_PCAP_PATH=/data" \ --mount type=bind,source=$VOL_BASE_DIR/bts-tester,destination=/data \ --mount type=bind,source="$(dirname "$L2_SOCKET_PATH")",destination=/data/unix_l2 \ - --mount type=bind,source="$(dirname "$PCU_SOCKET_PATH")",destination=/data/unix_pcu \ + $MOUNT_PCU_SOCKET_OPT \ --name ${DOCKER_NAME} \ $REPO_USER/${SUITE_NAME} & child_ps=$! diff --git a/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py b/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py index b3ca946..f36b023 100755 --- a/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py +++ b/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py @@ -46,11 +46,17 @@ script_run_dir = test.get_run_dir().new_dir('ttcn3') bts_cfg_file = os.path.join(str(script_run_dir), 'BTS_Tests.cfg') junit_ttcn3_dst_file = os.path.join(str(suite.trial.get_run_dir()), 'trial-') + suite.name() + '.xml' -docker_cmd = (script_file, str(script_run_dir), junit_ttcn3_dst_file, osmocon.l2_socket_path(), bts.pcu_socket_path()) +if bts.bts_type() == 'osmo-bts-trx': + pcu_available = True + pcu_sk = bts.pcu_socket_path() +else: # PCU unix socket not available locally + pcu_available = False + pcu_sk = '' +docker_cmd = (script_file, str(script_run_dir), junit_ttcn3_dst_file, osmocon.l2_socket_path(), pcu_sk) print('Creating template') mytemplate = Template(filename=bts_tmpl_file) -r = mytemplate.render(btsvty_ctrl_hostname=bts.remote_addr()) +r = mytemplate.render(btsvty_ctrl_hostname=bts.remote_addr(), pcu_available=pcu_available) with open(bts_cfg_file, 'w') as f: f.write(r) -- To view, visit https://gerrit.osmocom.org/11322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I902af460b798ffdba09d77d457bac672db606368 Gerrit-Change-Number: 11322 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 09:01:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 22 Oct 2018 09:01:23 +0000 Subject: Change in osmo-gsm-tester[master]: ttcn3: Allow remote hosts (sysmobts) to access RSL srv inside TTCN3 d... In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11358 ) Change subject: ttcn3: Allow remote hosts (sysmobts) to access RSL srv inside TTCN3 docker ...................................................................... ttcn3: Allow remote hosts (sysmobts) to access RSL srv inside TTCN3 docker And extra IP address is required/requested on the docker host because the BSC handling the OML instance is binding to it's address, so we cannot ask docker to use that one because it fails binding to it. Change-Id: I734fba91db535d7b183ddc7f51d324a6cd2eaf6f --- M ttcn3/default-suites.conf M ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh M ttcn3/suites/ttcn3_bts_tests/suite.conf M ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py 4 files changed, 10 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/ttcn3/default-suites.conf b/ttcn3/default-suites.conf index 80f14e6..cfa46b4 100644 --- a/ttcn3/default-suites.conf +++ b/ttcn3/default-suites.conf @@ -1 +1,2 @@ - ttcn3_bts_tests:trx +- ttcn3_bts_tests:sysmo diff --git a/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh b/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh index df8dcb2..daac3e0 100755 --- a/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh +++ b/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh @@ -3,8 +3,9 @@ RUNDIR="$1" JUNIT_TTCN3_DST_FILE="$2" -L2_SOCKET_PATH="$3" -PCU_SOCKET_PATH="$4" +BSC_RSL_ADDR="$3" +L2_SOCKET_PATH="$4" +PCU_SOCKET_PATH="$5" # Absolute path to this script SCRIPT=$(readlink -f "$0") @@ -27,7 +28,7 @@ network_create() { NET=$1 echo Creating network $NET_NAME - docker network create --internal --subnet $NET $NET_NAME + docker network create --subnet $NET $NET_NAME } network_remove() { @@ -70,6 +71,7 @@ fi docker run --rm \ --network $NET_NAME --ip 172.18.9.10 \ + -p ${BSC_RSL_ADDR}:3003:3003 \ -e "TTCN3_PCAP_PATH=/data" \ --mount type=bind,source=$VOL_BASE_DIR/bts-tester,destination=/data \ --mount type=bind,source="$(dirname "$L2_SOCKET_PATH")",destination=/data/unix_l2 \ diff --git a/ttcn3/suites/ttcn3_bts_tests/suite.conf b/ttcn3/suites/ttcn3_bts_tests/suite.conf index 1eb0a02..2bb0cac 100644 --- a/ttcn3/suites/ttcn3_bts_tests/suite.conf +++ b/ttcn3/suites/ttcn3_bts_tests/suite.conf @@ -1,6 +1,6 @@ resources: ip_address: - - times: 7 # msc, bsc, hlr, stp, mgw, sgsn, ggsn + - times: 8 # msc, bsc, hlr, stp, mgw, sgsn, ggsn bts: - times: 1 osmocon_phone: diff --git a/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py b/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py index f36b023..2684bf7 100755 --- a/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py +++ b/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py @@ -30,7 +30,8 @@ msc_dummy.start() mgw_dummy.start() -bsc.set_rsl_ip('172.18.9.10') +nat_rsl_ip = suite.ip_address().get('addr') +bsc.set_rsl_ip(nat_rsl_ip) bsc.bts_add(bts) sgsn_dummy.bts_add(bts) @@ -52,7 +53,7 @@ else: # PCU unix socket not available locally pcu_available = False pcu_sk = '' -docker_cmd = (script_file, str(script_run_dir), junit_ttcn3_dst_file, osmocon.l2_socket_path(), pcu_sk) +docker_cmd = (script_file, str(script_run_dir), junit_ttcn3_dst_file, nat_rsl_ip, osmocon.l2_socket_path(), pcu_sk) print('Creating template') mytemplate = Template(filename=bts_tmpl_file) -- To view, visit https://gerrit.osmocom.org/11358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I734fba91db535d7b183ddc7f51d324a6cd2eaf6f Gerrit-Change-Number: 11358 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 10:54:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 22 Oct 2018 10:54:23 +0000 Subject: Change in osmo-bts[master]: gsm_pchan2chan_nr: Fix conversion of CCCH_LCHAN Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11425 Change subject: gsm_pchan2chan_nr: Fix conversion of CCCH_LCHAN ...................................................................... gsm_pchan2chan_nr: Fix conversion of CCCH_LCHAN Previous implementation made no sense, since chan_nr is never read before being set below from lchan_nr. Furthemore, if lcahn_nr=CCH_LCHAN=4, then: cbits = 0x4 + lchan_nr = 0x8 = b1000 which then becomes SDCCH8 according to GSM 08.58 9.3.1, so it's totally wrong: SDCCH/8 + ACCH 0 1 T T T Change-Id: Id1dee716991e6faa406f02c029e998af5780162a --- M src/common/gsm_data_shared.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/25/11425/1 diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c index 2a1f9c8..8c3229c 100644 --- a/src/common/gsm_data_shared.c +++ b/src/common/gsm_data_shared.c @@ -622,7 +622,7 @@ * See osmo-bts-xxx/oml.c:opstart_compl(). */ if (lchan_nr == CCCH_LCHAN) - chan_nr = 0; + lchan_nr = 0; else OSMO_ASSERT(lchan_nr < 4); cbits = 0x04; -- To view, visit https://gerrit.osmocom.org/11425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id1dee716991e6faa406f02c029e998af5780162a Gerrit-Change-Number: 11425 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 11:19:11 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 11:19:11 +0000 Subject: Change in osmo-dev[master]: support osmo-sip-connector with kamailio In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11144 to look at the new patch set (#8). Change subject: support osmo-sip-connector with kamailio ...................................................................... support osmo-sip-connector with kamailio Kamailio is a SIP server, that is relatively easy to configure, in contrary to asterisk it only has one config file. The config file here is based on the example config provided in the wiki: To enable the osmo-sip-connector, build it, install kamailio and then set SIPCON_ENABLE=true in your copy of config_2g_3g. Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 --- M net/config_2g3g A net/tmpl_std/kamailio.cfg A net/tmpl_std/osmo-sip-connector.cfg M net/tmpl_std/run.sh 4 files changed, 462 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/44/11144/8 -- To view, visit https://gerrit.osmocom.org/11144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 Gerrit-Change-Number: 11144 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 11:19:11 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 11:19:11 +0000 Subject: Change in osmo-dev[master]: fill_config.py: add NET_DIR variable Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11426 Change subject: fill_config.py: add NET_DIR variable ...................................................................... fill_config.py: add NET_DIR variable Allow all config files to use a new NET_DIR variable, which always points to the network folder with the generated configs. We can use this to place all temporary files (sockets, pid files, ...) there. Change-Id: Idbdf478ebb9f0b2fcd860e5eff3c414a0a459561 --- M net/README M net/fill_config.py 2 files changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/26/11426/1 diff --git a/net/README b/net/README index 352bc56..1d07775 100644 --- a/net/README +++ b/net/README @@ -71,7 +71,8 @@ The fill_config.py script helps to fill the templates with the config values. Simply invoke fill_config.py with a dir argument (templates dir) and a file argument (specific -config values). +config values). The dir argument can be used in the templates with ${NET_DIR}, +temporary files (sockets etc.) should be placed inside this folder. If one or both are omitted, the script tries to re-use the most recent paths, they were stored in local files '.last_config' and '.last_templates'. diff --git a/net/fill_config.py b/net/fill_config.py index d0e2e04..c33e6b7 100755 --- a/net/fill_config.py +++ b/net/fill_config.py @@ -50,8 +50,9 @@ local_config_file = os.path.realpath(local_config_file) tmpl_dir = os.path.realpath(tmpl_dir) +net_dir = os.path.realpath(".") -print('using config file %r\non templates %r' % (local_config_file, tmpl_dir)) +print('using config file %r\non templates %r\nwith NET_DIR %r' % (local_config_file, tmpl_dir, net_dir)) with open(LAST_LOCAL_CONFIG_FILE, 'w') as last_file: last_file.write(local_config_file) @@ -59,7 +60,8 @@ last_file.write(tmpl_dir) # read in variable values from config file -local_config = {} +# NET_DIR is the folder where fill_config.py was started +local_config = {"NET_DIR": net_dir} line_nr = 0 for line in open(local_config_file): -- To view, visit https://gerrit.osmocom.org/11426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idbdf478ebb9f0b2fcd860e5eff3c414a0a459561 Gerrit-Change-Number: 11426 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 11:25:23 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 11:25:23 +0000 Subject: Change in osmo-dev[master]: support osmo-sip-connector with kamailio In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11144 ) Change subject: support osmo-sip-connector with kamailio ...................................................................... Patch Set 8: > But even nicer would be to just place both socket and rundir in the same dir where the run.sh sits by default. No need to configure. Done. Both use ${NET_DIR} now which is introduced here: https://gerrit.osmocom.org/#/c/osmo-dev/+/11426/ -- To view, visit https://gerrit.osmocom.org/11144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 Gerrit-Change-Number: 11144 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: daniel Gerrit-Comment-Date: Mon, 22 Oct 2018 11:25:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 11:26:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 22 Oct 2018 11:26:56 +0000 Subject: Change in osmo-bts[master]: Convert lchan CCCH_LCHAN to chan_nr BCCH and viceversa Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11427 Change subject: Convert lchan CCCH_LCHAN to chan_nr BCCH and viceversa ...................................................................... Convert lchan CCCH_LCHAN to chan_nr BCCH and viceversa Before this patch it was being coded as SDCCH4 TS0 SS 0, and as a result the state LCHAN_REL_ACT_OML applied in opstart_compl in abused SDCCH4 TS0 SS 4 was not being checked when deciding whether to send a Chan Act ACK in rsl_tx_chan_act_acknack. Fixes: OS#3513 Change-Id: I1641960c9ffbb3ed0de74ab5b53e24e5b4ff3397 --- M include/osmo-bts/l1sap.h M src/common/gsm_data_shared.c 2 files changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/27/11427/1 diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index e2c92fa..3cf0ea5 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -12,6 +12,7 @@ #define L1SAP_CHAN2SS_TCHH(chan_nr) ((chan_nr >> 3) & 1) #define L1SAP_CHAN2SS_SDCCH4(chan_nr) ((chan_nr >> 3) & 3) #define L1SAP_CHAN2SS_SDCCH8(chan_nr) ((chan_nr >> 3) & 7) +#define L1SAP_CHAN2SS_BCCH(chan_nr) (CCCH_LCHAN) /* logical channel from chan_nr + link_id */ #define L1SAP_IS_LINK_SACCH(link_id) ((link_id & 0xC0) == LID_SACCH) @@ -48,6 +49,8 @@ /* subslot from any chan_nr */ static inline uint8_t l1sap_chan2ss(uint8_t chan_nr) { + if (L1SAP_IS_CHAN_BCCH(chan_nr)) + return L1SAP_CHAN2SS_BCCH(chan_nr); if (L1SAP_IS_CHAN_SDCCH8(chan_nr)) return L1SAP_CHAN2SS_SDCCH8(chan_nr); if (L1SAP_IS_CHAN_SDCCH4(chan_nr)) diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c index 8c3229c..588d0fd 100644 --- a/src/common/gsm_data_shared.c +++ b/src/common/gsm_data_shared.c @@ -622,11 +622,12 @@ * See osmo-bts-xxx/oml.c:opstart_compl(). */ if (lchan_nr == CCCH_LCHAN) - lchan_nr = 0; - else + cbits = 0x10; /* BCCH */ + else { OSMO_ASSERT(lchan_nr < 4); - cbits = 0x04; - cbits += lchan_nr; + cbits = 0x04; + cbits += lchan_nr; + } break; case GSM_PCHAN_SDCCH8_SACCH8C: case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: -- To view, visit https://gerrit.osmocom.org/11427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1641960c9ffbb3ed0de74ab5b53e24e5b4ff3397 Gerrit-Change-Number: 11427 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 11:43:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 11:43:40 +0000 Subject: Change in docker-playground[master]: osmo-*-latest: s/nightly/latest/g in Dockerfile In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11364 ) Change subject: osmo-*-latest: s/nightly/latest/g in Dockerfile ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1eab031038927043faf6ed8ed30bdf4d4d1624d5 Gerrit-Change-Number: 11364 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 22 Oct 2018 11:43:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 11:43:43 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 11:43:43 +0000 Subject: Change in docker-playground[master]: osmo-*-latest: s/nightly/latest/g in Dockerfile In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11364 ) Change subject: osmo-*-latest: s/nightly/latest/g in Dockerfile ...................................................................... osmo-*-latest: s/nightly/latest/g in Dockerfile Follow up to I6a564206dd81743deb1eb27eca7081bc333d7434 where the "*-latest" Dockerfiles were introduced. msc, sgsn, sip, stp had references to "nightly" instead of "latest" in their Dockerfiles. Related: OS#3268 Change-Id: I1eab031038927043faf6ed8ed30bdf4d4d1624d5 --- M osmo-msc-latest/Dockerfile M osmo-sgsn-latest/Dockerfile M osmo-sip-latest/Dockerfile M osmo-stp-latest/Dockerfile 4 files changed, 7 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved osmith: Verified diff --git a/osmo-msc-latest/Dockerfile b/osmo-msc-latest/Dockerfile index 02298e7..a8cc3ba 100644 --- a/osmo-msc-latest/Dockerfile +++ b/osmo-msc-latest/Dockerfile @@ -2,7 +2,7 @@ MAINTAINER Harald Welte -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/" COPY Release.key /tmp/Release.key @@ -12,7 +12,7 @@ RUN apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ - echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ diff --git a/osmo-sgsn-latest/Dockerfile b/osmo-sgsn-latest/Dockerfile index 56b5fda..87dbca2 100644 --- a/osmo-sgsn-latest/Dockerfile +++ b/osmo-sgsn-latest/Dockerfile @@ -2,7 +2,7 @@ MAINTAINER Harald Welte -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/" COPY Release.key /tmp/Release.key @@ -12,7 +12,7 @@ RUN apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ - echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ diff --git a/osmo-sip-latest/Dockerfile b/osmo-sip-latest/Dockerfile index 9f978d8..a468c9f 100644 --- a/osmo-sip-latest/Dockerfile +++ b/osmo-sip-latest/Dockerfile @@ -2,7 +2,7 @@ MAINTAINER Harald Welte -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/" COPY Release.key /tmp/Release.key diff --git a/osmo-stp-latest/Dockerfile b/osmo-stp-latest/Dockerfile index f5920a5..053e2ab 100644 --- a/osmo-stp-latest/Dockerfile +++ b/osmo-stp-latest/Dockerfile @@ -2,7 +2,7 @@ MAINTAINER Harald Welte -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/" COPY Release.key /tmp/Release.key @@ -12,7 +12,7 @@ RUN apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ - echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ -- To view, visit https://gerrit.osmocom.org/11364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1eab031038927043faf6ed8ed30bdf4d4d1624d5 Gerrit-Change-Number: 11364 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 12:30:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 22 Oct 2018 12:30:29 +0000 Subject: Change in osmo-bts[master]: Convert lchan CCCH_LCHAN to chan_nr BCCH and viceversa In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11427 ) Change subject: Convert lchan CCCH_LCHAN to chan_nr BCCH and viceversa ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1641960c9ffbb3ed0de74ab5b53e24e5b4ff3397 Gerrit-Change-Number: 11427 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 22 Oct 2018 12:30:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 12:31:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 22 Oct 2018 12:31:15 +0000 Subject: Change in osmo-bts[master]: gsm_pchan2chan_nr: Fix conversion of CCCH_LCHAN In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11425 ) Change subject: gsm_pchan2chan_nr: Fix conversion of CCCH_LCHAN ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id1dee716991e6faa406f02c029e998af5780162a Gerrit-Change-Number: 11425 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 22 Oct 2018 12:31:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 12:31:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 22 Oct 2018 12:31:17 +0000 Subject: Change in osmo-bts[master]: gsm_pchan2chan_nr: Fix conversion of CCCH_LCHAN In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11425 ) Change subject: gsm_pchan2chan_nr: Fix conversion of CCCH_LCHAN ...................................................................... gsm_pchan2chan_nr: Fix conversion of CCCH_LCHAN Previous implementation made no sense, since chan_nr is never read before being set below from lchan_nr. Furthemore, if lcahn_nr=CCH_LCHAN=4, then: cbits = 0x4 + lchan_nr = 0x8 = b1000 which then becomes SDCCH8 according to GSM 08.58 9.3.1, so it's totally wrong: SDCCH/8 + ACCH 0 1 T T T Change-Id: Id1dee716991e6faa406f02c029e998af5780162a --- M src/common/gsm_data_shared.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c index 2a1f9c8..8c3229c 100644 --- a/src/common/gsm_data_shared.c +++ b/src/common/gsm_data_shared.c @@ -622,7 +622,7 @@ * See osmo-bts-xxx/oml.c:opstart_compl(). */ if (lchan_nr == CCCH_LCHAN) - chan_nr = 0; + lchan_nr = 0; else OSMO_ASSERT(lchan_nr < 4); cbits = 0x04; -- To view, visit https://gerrit.osmocom.org/11425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id1dee716991e6faa406f02c029e998af5780162a Gerrit-Change-Number: 11425 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 12:31:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 22 Oct 2018 12:31:19 +0000 Subject: Change in osmo-bts[master]: Convert lchan CCCH_LCHAN to chan_nr BCCH and viceversa In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11427 ) Change subject: Convert lchan CCCH_LCHAN to chan_nr BCCH and viceversa ...................................................................... Convert lchan CCCH_LCHAN to chan_nr BCCH and viceversa Before this patch it was being coded as SDCCH4 TS0 SS 0, and as a result the state LCHAN_REL_ACT_OML applied in opstart_compl in abused SDCCH4 TS0 SS 4 was not being checked when deciding whether to send a Chan Act ACK in rsl_tx_chan_act_acknack. Fixes: OS#3513 Change-Id: I1641960c9ffbb3ed0de74ab5b53e24e5b4ff3397 --- M include/osmo-bts/l1sap.h M src/common/gsm_data_shared.c 2 files changed, 8 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index e2c92fa..3cf0ea5 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -12,6 +12,7 @@ #define L1SAP_CHAN2SS_TCHH(chan_nr) ((chan_nr >> 3) & 1) #define L1SAP_CHAN2SS_SDCCH4(chan_nr) ((chan_nr >> 3) & 3) #define L1SAP_CHAN2SS_SDCCH8(chan_nr) ((chan_nr >> 3) & 7) +#define L1SAP_CHAN2SS_BCCH(chan_nr) (CCCH_LCHAN) /* logical channel from chan_nr + link_id */ #define L1SAP_IS_LINK_SACCH(link_id) ((link_id & 0xC0) == LID_SACCH) @@ -48,6 +49,8 @@ /* subslot from any chan_nr */ static inline uint8_t l1sap_chan2ss(uint8_t chan_nr) { + if (L1SAP_IS_CHAN_BCCH(chan_nr)) + return L1SAP_CHAN2SS_BCCH(chan_nr); if (L1SAP_IS_CHAN_SDCCH8(chan_nr)) return L1SAP_CHAN2SS_SDCCH8(chan_nr); if (L1SAP_IS_CHAN_SDCCH4(chan_nr)) diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c index 8c3229c..588d0fd 100644 --- a/src/common/gsm_data_shared.c +++ b/src/common/gsm_data_shared.c @@ -622,11 +622,12 @@ * See osmo-bts-xxx/oml.c:opstart_compl(). */ if (lchan_nr == CCCH_LCHAN) - lchan_nr = 0; - else + cbits = 0x10; /* BCCH */ + else { OSMO_ASSERT(lchan_nr < 4); - cbits = 0x04; - cbits += lchan_nr; + cbits = 0x04; + cbits += lchan_nr; + } break; case GSM_PCHAN_SDCCH8_SACCH8C: case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: -- To view, visit https://gerrit.osmocom.org/11427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1641960c9ffbb3ed0de74ab5b53e24e5b4ff3397 Gerrit-Change-Number: 11427 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 12:31:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 22 Oct 2018 12:31:57 +0000 Subject: Change in osmocom-bb[master]: firmware: set corret shebang in solve_envs.py python2 script In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11424 ) Change subject: firmware: set corret shebang in solve_envs.py python2 script ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I64582568f7390b7f4e3253508209a59eb78ee4dd Gerrit-Change-Number: 11424 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 22 Oct 2018 12:31:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 12:31:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 22 Oct 2018 12:31:58 +0000 Subject: Change in osmocom-bb[master]: firmware: set corret shebang in solve_envs.py python2 script In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11424 ) Change subject: firmware: set corret shebang in solve_envs.py python2 script ...................................................................... firmware: set corret shebang in solve_envs.py python2 script Change-Id: I64582568f7390b7f4e3253508209a59eb78ee4dd --- M src/target/firmware/solve_envs.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/target/firmware/solve_envs.py b/src/target/firmware/solve_envs.py index d6414d6..0e5f5e8 100755 --- a/src/target/firmware/solve_envs.py +++ b/src/target/firmware/solve_envs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 import sys -- To view, visit https://gerrit.osmocom.org/11424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I64582568f7390b7f4e3253508209a59eb78ee4dd Gerrit-Change-Number: 11424 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 12:55:26 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 12:55:26 +0000 Subject: Change in osmo-ci[master]: jobs: testsuite.yml for all ttcn3/nplab jobs In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11370 ) Change subject: jobs: testsuite.yml for all ttcn3/nplab jobs ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11370/1/jobs/testsuite.yml File jobs/testsuite.yml: https://gerrit.osmocom.org/#/c/11370/1/jobs/testsuite.yml at 26 PS1, Line 26: # nightly (overwrites the existing, manually created jobs!) > ideally this would migrate the manual jobs to being created by this file instead, which we want anyw [?] I've realized that in order to do that, I'll need to rewrite the file a bit - right now it can only set properties like "disabled" for both latest and master at once. So if we rolled this out for the master jobs too, then ttcn3-bsc-test-sccplite would be disabled because tcn3-bsc-test-sccplite-latest needs to be disabled right now. (Also we are missing the trigger timers from the current jobs, they have specific times instead of "midnight".) After reading a lot of JJB documentation, the easiest way seems to be to duplicate all testsuites in the "testsuite-name" variable above instead of using the "job-suffix" variable here. That's what I'm working on now. -- To view, visit https://gerrit.osmocom.org/11370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie433925ee81a61c5788b4a6f2bc5b89c2689d251 Gerrit-Change-Number: 11370 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 22 Oct 2018 12:55:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 14:06:27 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 14:06:27 +0000 Subject: Change in docker-playground[master]: rename m3ua-test, sua-test to nplab-*-test In-Reply-To: References: Message-ID: Hello Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11368 to look at the new patch set (#5). Change subject: rename m3ua-test, sua-test to nplab-*-test ...................................................................... rename m3ua-test, sua-test to nplab-*-test Allows writing a generic Jenkins Job Builder config. Related: OS#3268 Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de --- R nplab-m3ua-test/.release R nplab-m3ua-test/Dockerfile R nplab-m3ua-test/Makefile R nplab-m3ua-test/all-sgp-tests.txt R nplab-m3ua-test/dotguile R nplab-m3ua-test/jenkins.sh R nplab-m3ua-test/m3ua-param-testtool.scm R nplab-m3ua-test/osmo-stp.cfg R nplab-sua-test/.release R nplab-sua-test/Dockerfile R nplab-sua-test/Makefile R nplab-sua-test/dotguile R nplab-sua-test/jenkins.sh R nplab-sua-test/osmo-stp.cfg R nplab-sua-test/some-sua-sgp-tests.txt R nplab-sua-test/sua-param-testtool-sgp.scm 16 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/68/11368/5 -- To view, visit https://gerrit.osmocom.org/11368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de Gerrit-Change-Number: 11368 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 14:09:50 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 14:09:50 +0000 Subject: Change in docker-playground[master]: rename m3ua-test, sua-test to nplab-*-test In-Reply-To: References: Message-ID: Hello Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11368 to look at the new patch set (#6). Change subject: rename m3ua-test, sua-test to nplab-*-test ...................................................................... rename m3ua-test, sua-test to nplab-*-test Allows writing a generic Jenkins Job Builder config by renaming the container folders to match the job names. This needs changes in the Jenkins jobs, as done in Ie433925ee81a61c5788b4a6f2bc5b89c2689d251. Related: OS#3268 Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de --- R nplab-m3ua-test/.release R nplab-m3ua-test/Dockerfile R nplab-m3ua-test/Makefile R nplab-m3ua-test/all-sgp-tests.txt R nplab-m3ua-test/dotguile R nplab-m3ua-test/jenkins.sh R nplab-m3ua-test/m3ua-param-testtool.scm R nplab-m3ua-test/osmo-stp.cfg R nplab-sua-test/.release R nplab-sua-test/Dockerfile R nplab-sua-test/Makefile R nplab-sua-test/dotguile R nplab-sua-test/jenkins.sh R nplab-sua-test/osmo-stp.cfg R nplab-sua-test/some-sua-sgp-tests.txt R nplab-sua-test/sua-param-testtool-sgp.scm 16 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/68/11368/6 -- To view, visit https://gerrit.osmocom.org/11368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de Gerrit-Change-Number: 11368 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 14:09:50 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 14:09:50 +0000 Subject: Change in docker-playground[master]: Remove top-level Makefile In-Reply-To: References: Message-ID: Hello Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11369 to look at the new patch set (#6). Change subject: Remove top-level Makefile ...................................................................... Remove top-level Makefile Obsoleted by docker_images_require(). The top-level Makefile had the following drawbacks: * it was not maintained: many targets were missing, and some of the existing ones did not build anymore * make targets have the same names as the folders, so if they are not listed in the Makefile, it will assume that the target has been built already (prone to making mistakes) Related: OS#3268 Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff --- D Makefile 1 file changed, 0 insertions(+), 82 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/69/11369/6 -- To view, visit https://gerrit.osmocom.org/11369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff Gerrit-Change-Number: 11369 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 14:11:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 14:11:39 +0000 Subject: Change in docker-playground[master]: rename m3ua-test, sua-test to nplab-*-test In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11368 ) Change subject: rename m3ua-test, sua-test to nplab-*-test ...................................................................... Patch Set 6: I have realized that we also need to update the reference to the image names inside jenkins.sh when renaming the folders. This is done with the current patchset. Neels wrote: >> NOTE: we need to modify the existing jobs to use the renamed folders after this is merged. > > (If that is done by a yml file patch you have submitted, then indicate its change-id in the commit log) Done. -- To view, visit https://gerrit.osmocom.org/11368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de Gerrit-Change-Number: 11368 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Mon, 22 Oct 2018 14:11:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 14:16:50 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 14:16:50 +0000 Subject: Change in osmo-ci[master]: jobs: testsuite.yml for all ttcn3/nplab jobs In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11370 to look at the new patch set (#2). Change subject: jobs: testsuite.yml for all ttcn3/nplab jobs ...................................................................... jobs: testsuite.yml for all ttcn3/nplab jobs New JJB config, that is able to generate all jobs in the TTCN3 tab at Jenkins: The new *-latest jobs test against the latest stable releases. Existing jobs are not overwritten (this is commented out). ttcn3-bsc-test-sccplite-latest is disabled for now, because it hangs forever. Related: OS#3268 Change-Id: Ie433925ee81a61c5788b4a6f2bc5b89c2689d251 --- A jobs/ttcn3-testsuites.yml 1 file changed, 106 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/70/11370/2 -- To view, visit https://gerrit.osmocom.org/11370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie433925ee81a61c5788b4a6f2bc5b89c2689d251 Gerrit-Change-Number: 11370 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 14:17:26 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 14:17:26 +0000 Subject: Change in osmo-ci[master]: jobs: ttcn3-testsuites.yml for ttcn3/nplab jobs In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11370 to look at the new patch set (#3). Change subject: jobs: ttcn3-testsuites.yml for ttcn3/nplab jobs ...................................................................... jobs: ttcn3-testsuites.yml for ttcn3/nplab jobs New JJB config, that is able to generate all jobs in the TTCN3 tab at Jenkins: The new *-latest jobs test against the latest stable releases. Existing jobs are not overwritten (this is commented out). ttcn3-bsc-test-sccplite-latest is disabled for now, because it hangs forever. Related: OS#3268 Change-Id: Ie433925ee81a61c5788b4a6f2bc5b89c2689d251 --- A jobs/ttcn3-testsuites.yml 1 file changed, 106 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/70/11370/3 -- To view, visit https://gerrit.osmocom.org/11370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie433925ee81a61c5788b4a6f2bc5b89c2689d251 Gerrit-Change-Number: 11370 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 14:21:49 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 14:21:49 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add docker_images_require() In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11365 to look at the new patch set (#4). Change subject: jenkins-common.sh: add docker_images_require() ...................................................................... jenkins-common.sh: add docker_images_require() This new function can be used on top of each *-test/jenkins.sh to automatically build the required Docker images before starting a testsuite. The top-level Makefile should also be able to build all Docker images on which a job depends. But in that Makefile the list of dependencies can not be specified dynamically, as it will be necessary for OS#3268: ttcn3-mgw-test may depend on osmo-mgw-latest or on osmo-mgw-master. This will be used by Idbb708ab16cb71bab5069127945b63388222369e. Related: OS#3268 Change-Id: I0afdf3400282634fca9b31d57eaeedd6b5c28aa1 --- M jenkins-common.sh 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/65/11365/4 -- To view, visit https://gerrit.osmocom.org/11365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0afdf3400282634fca9b31d57eaeedd6b5c28aa1 Gerrit-Change-Number: 11365 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 14:21:49 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 14:21:49 +0000 Subject: Change in docker-playground[master]: jenkins.sh: IMAGE_SUFFIX, docker_images_require() In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11366 to look at the new patch set (#5). Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require() ...................................................................... jenkins.sh: IMAGE_SUFFIX, docker_images_require() Default value "master" of the IMAGE_SUFFIX environment variable can be changed to "latest" to test the latest stable builds instead of the nightly ones. Use docker_images_require() to make sure that the required images are existing and up-to-date before running the tests. Related: OS#3268 Change-Id: Idbb708ab16cb71bab5069127945b63388222369e --- M m3ua-test/jenkins.sh M sua-test/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh 11 files changed, 97 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/66/11366/5 -- To view, visit https://gerrit.osmocom.org/11366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e Gerrit-Change-Number: 11366 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 14:21:49 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 14:21:49 +0000 Subject: Change in docker-playground[master]: symlinks: ttcn3-bsc-test-sccplite In-Reply-To: References: Message-ID: Hello Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11367 to look at the new patch set (#5). Change subject: symlinks: ttcn3-bsc-test-sccplite ...................................................................... symlinks: ttcn3-bsc-test-sccplite Create the ttcn3-bsc-test-sccplite folder, with symlinks to ttcn3-bsc-test/jenkins-sccplite.sh and ttcn3-bsc-test/sccplite. This allows writing the jenkins job builder config files in a generic way. Related: OS#3268 Change-Id: I1d1d277475090cd615a0e2d07a42b2032cdefb9c --- A ttcn3-bsc-test-sccplite/jenkins.sh A ttcn3-bsc-test-sccplite/sccplite 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/67/11367/5 -- To view, visit https://gerrit.osmocom.org/11367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1d1d277475090cd615a0e2d07a42b2032cdefb9c Gerrit-Change-Number: 11367 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 14:21:49 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 14:21:49 +0000 Subject: Change in docker-playground[master]: rename m3ua-test, sua-test to nplab-*-test In-Reply-To: References: Message-ID: Hello Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11368 to look at the new patch set (#7). Change subject: rename m3ua-test, sua-test to nplab-*-test ...................................................................... rename m3ua-test, sua-test to nplab-*-test Allows writing a generic Jenkins Job Builder config by renaming the container folders to match the job names. This needs changes in the Jenkins jobs, as done in Ie433925ee81a61c5788b4a6f2bc5b89c2689d251. Related: OS#3268 Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de --- R nplab-m3ua-test/.release R nplab-m3ua-test/Dockerfile R nplab-m3ua-test/Makefile R nplab-m3ua-test/all-sgp-tests.txt R nplab-m3ua-test/dotguile R nplab-m3ua-test/jenkins.sh R nplab-m3ua-test/m3ua-param-testtool.scm R nplab-m3ua-test/osmo-stp.cfg R nplab-sua-test/.release R nplab-sua-test/Dockerfile R nplab-sua-test/Makefile R nplab-sua-test/dotguile R nplab-sua-test/jenkins.sh R nplab-sua-test/osmo-stp.cfg R nplab-sua-test/some-sua-sgp-tests.txt R nplab-sua-test/sua-param-testtool-sgp.scm 16 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/68/11368/7 -- To view, visit https://gerrit.osmocom.org/11368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de Gerrit-Change-Number: 11368 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 14:21:49 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 14:21:49 +0000 Subject: Change in docker-playground[master]: Remove top-level Makefile In-Reply-To: References: Message-ID: Hello Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11369 to look at the new patch set (#7). Change subject: Remove top-level Makefile ...................................................................... Remove top-level Makefile Obsoleted by docker_images_require(). The top-level Makefile had the following drawbacks: * it was not maintained: many targets were missing, and some of the existing ones did not build anymore * make targets have the same names as the folders, so if they are not listed in the Makefile, it will assume that the target has been built already (prone to making mistakes) Related: OS#3268 Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff --- D Makefile 1 file changed, 0 insertions(+), 82 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/69/11369/7 -- To view, visit https://gerrit.osmocom.org/11369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff Gerrit-Change-Number: 11369 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 14:25:17 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 14:25:17 +0000 Subject: Change in docker-playground[master]: jenkins.sh: IMAGE_SUFFIX, docker_images_require() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11366 ) Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require() ...................................................................... Patch Set 5: Verified+1 -- To view, visit https://gerrit.osmocom.org/11366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e Gerrit-Change-Number: 11366 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 22 Oct 2018 14:25:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 14:35:20 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 14:35:20 +0000 Subject: Change in osmo-ci[master]: jobs: ttcn3-testsuites.yml for ttcn3/nplab jobs In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11370 to look at the new patch set (#4). Change subject: jobs: ttcn3-testsuites.yml for ttcn3/nplab jobs ...................................................................... jobs: ttcn3-testsuites.yml for ttcn3/nplab jobs New JJB config, that is able to generate all jobs in the TTCN3 tab at Jenkins: The new *-latest jobs test against the latest stable releases. Existing jobs are not overwritten (this is commented out). ttcn3-bsc-test-sccplite-latest is disabled for now, because it hangs forever. Related: OS#3268 Change-Id: Ie433925ee81a61c5788b4a6f2bc5b89c2689d251 --- A jobs/ttcn3-testsuites.yml 1 file changed, 106 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/70/11370/4 -- To view, visit https://gerrit.osmocom.org/11370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie433925ee81a61c5788b4a6f2bc5b89c2689d251 Gerrit-Change-Number: 11370 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 14:36:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 22 Oct 2018 14:36:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Disable testing FACCH/H with real HW Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11428 Change subject: bts: Disable testing FACCH/H with real HW ...................................................................... bts: Disable testing FACCH/H with real HW Related: OS#3653 Change-Id: I078cdfbf8d27e543a723eab90f66b2fcda016b5d --- M bts/BTS_Tests.ttcn 1 file changed, 22 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/11428/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 2f48b0f..3debb62 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -312,17 +312,29 @@ valueof(ts_RslChanNr_SDCCH8(6,4)), valueof(ts_RslChanNr_SDCCH8(6,5)), valueof(ts_RslChanNr_SDCCH8(6,6)), valueof(ts_RslChanNr_SDCCH8(6,7)) }; - g_AllChanTypes := { - /* TS 1..4: TCH/F */ - valueof(ts_RslChanNr_Bm(1)), - /* TS 5: TCH/H */ - valueof(ts_RslChanNr_Lm(5,1)), - /* TS 0: SDCCH/4 */ - valueof(ts_RslChanNr_SDCCH4(0,2)), - /* TS 6: SDCCH/8 */ - valueof(ts_RslChanNr_SDCCH8(6,4)) - }; + /* FACCH/H is unreliable with calypso firmware, see OS#3653 */ + if (mp_bb_trxc_port != -1) { + g_AllChanTypes := { + /* TS 1..4: TCH/F */ + valueof(ts_RslChanNr_Bm(1)), + /* TS 5: TCH/H */ + valueof(ts_RslChanNr_Lm(5,1)), + /* TS 0: SDCCH/4 */ + valueof(ts_RslChanNr_SDCCH4(0,2)), + /* TS 6: SDCCH/8 */ + valueof(ts_RslChanNr_SDCCH8(6,4)) + }; + } else { + g_AllChanTypes := { + /* TS 1..4: TCH/F */ + valueof(ts_RslChanNr_Bm(1)), + /* TS 0: SDCCH/4 */ + valueof(ts_RslChanNr_SDCCH4(0,2)), + /* TS 6: SDCCH/8 */ + valueof(ts_RslChanNr_SDCCH8(6,4)) + }; + } f_init_rsl(id); T.start; alt { -- To view, visit https://gerrit.osmocom.org/11428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I078cdfbf8d27e543a723eab90f66b2fcda016b5d Gerrit-Change-Number: 11428 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 14:36:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 22 Oct 2018 14:36:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RSL_Emulation: handle ASP_IPA_EVENT_DOWN Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11429 Change subject: RSL_Emulation: handle ASP_IPA_EVENT_DOWN ...................................................................... RSL_Emulation: handle ASP_IPA_EVENT_DOWN Otherwise RSL layer fails this way when this event is received: RSL_Emulation.ttcn:429 Receive operation on port IPA_PT succeeded, message from TC_chan_act_a51-RSL-IPA(3): @IPA_Emulation.ASP_IPA_Event: { up_down := ASP_IPA_EVENT_DOWN (0) } id 9 - Function main_client was stopped. PTC terminates. RSL_Emulation.ttcn:429 Message with id 9 was extracted from the queue of IPA_PT. RSL_Emulation.ttcn:430 setverdict(fail): none -> fail reason: "Received unknown primitive from IPA", new component reason: "Received unknown primitive from IPA" Change-Id: Idc6565c9de72d98015d56a41e5616c46051c8a8d --- M library/RSL_Emulation.ttcn 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/11429/1 diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn index c56c278..57efcc1 100644 --- a/library/RSL_Emulation.ttcn +++ b/library/RSL_Emulation.ttcn @@ -346,6 +346,11 @@ [not bts_role] IPA_PT.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_UP}) -> value evt { CCHAN_PT.send(evt); } + [bts_role] IPA_PT.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_DOWN}) { + } + [not bts_role] IPA_PT.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_DOWN}) -> value evt { + CCHAN_PT.send(evt); + } [bts_role] IPA_PT.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_ID_ACK}) { IPA_PT.send(ts_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0,ts_RSL_PAGING_LOAD_IND(23))); } -- To view, visit https://gerrit.osmocom.org/11429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idc6565c9de72d98015d56a41e5616c46051c8a8d Gerrit-Change-Number: 11429 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 14:43:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 22 Oct 2018 14:43:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Disable testing FACCH/H with real HW In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11428 ) Change subject: bts: Disable testing FACCH/H with real HW ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11428/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11428/1//COMMIT_MSG at 7 PS1, Line 7: bts: Disable testing FACCH/H with real HW Would be great to point out that we *temporary* disable testing on FACCH/H *because* Calypso PHY is not stable. https://gerrit.osmocom.org/#/c/11428/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11428/1/bts/BTS_Tests.ttcn at 316 PS1, Line 316: FACCH/H is unreliable with calypso firmware, see OS#3653 Let's format this comment as "FIXME: ...". -- To view, visit https://gerrit.osmocom.org/11428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I078cdfbf8d27e543a723eab90f66b2fcda016b5d Gerrit-Change-Number: 11428 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 22 Oct 2018 14:43:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 14:45:20 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 14:45:20 +0000 Subject: Change in osmo-ci[master]: jobs: ttcn3-testsuites.yml for ttcn3/nplab jobs In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11370 ) Change subject: jobs: ttcn3-testsuites.yml for ttcn3/nplab jobs ...................................................................... Patch Set 4: (1 comment) > I don't like the file name "testsuite.yml" -- we have so many different test suites, better to indicate which one this is about in the name. Fixed, it's called "ttcn3-testsuites.yml" now. > What's "nplab"? The m3ua and sua jobs are prefixed with that (the existing jobs). It seems to stand for "Network Programming Lab of M?nster University of Applied Sciences", see and . https://gerrit.osmocom.org/#/c/11370/1/jobs/testsuite.yml File jobs/testsuite.yml: https://gerrit.osmocom.org/#/c/11370/1/jobs/testsuite.yml at 26 PS1, Line 26: > I've realized that in order to do that, I'll need to rewrite the file a bit - right now it can only [?] With the latest patchset, it should be possible to safely migrate the existing jobs (they won't be disabled, timers have been added based on existing configs, e-mail notifications for laforge have been enabled just like it was in all existing jobs). It is still commented out though, so it does not happen by accident. So... after you guys have reviewed the patch, we could roll out it as follows: * remove comments * update the jobs * update this patch to remove the comments as well Is that alright? -- To view, visit https://gerrit.osmocom.org/11370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie433925ee81a61c5788b4a6f2bc5b89c2689d251 Gerrit-Change-Number: 11370 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 22 Oct 2018 14:45:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 14:46:04 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 14:46:04 +0000 Subject: Change in docker-playground[master]: symlinks: ttcn3-bsc-test-sccplite In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11367 ) Change subject: symlinks: ttcn3-bsc-test-sccplite ...................................................................... Patch Set 5: Verified+1 -- To view, visit https://gerrit.osmocom.org/11367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1d1d277475090cd615a0e2d07a42b2032cdefb9c Gerrit-Change-Number: 11367 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 22 Oct 2018 14:46:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 14:46:12 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Oct 2018 14:46:12 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add docker_images_require() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11365 ) Change subject: jenkins-common.sh: add docker_images_require() ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11365/1/jenkins-common.sh File jenkins-common.sh: https://gerrit.osmocom.org/#/c/11365/1/jenkins-common.sh at 5 PS1, Line 5: docker_images_require() { > On the one hand we want atomic commits, i.e. as small as makes sense. [?] Thanks for the explanation. For this time I've added the change-id it prepares for to the commit message, and next time I'll submit it together with the first usage unless there's a good reason to do it otherwise. -- To view, visit https://gerrit.osmocom.org/11365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0afdf3400282634fca9b31d57eaeedd6b5c28aa1 Gerrit-Change-Number: 11365 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 22 Oct 2018 14:46:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Oct 22 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 22 Oct 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#284?= In-Reply-To: <2011143351.141.1540134607332.JavaMail.jenkins@jenkins.osmocom.org> References: <2011143351.141.1540134607332.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <982576756.153.1540221007323.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Oct 22 15:33:20 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 22 Oct 2018 15:33:20 +0000 Subject: Change in osmo-trx[master]: VTY: add extended (11-bit) RACH detection toggle In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11423 ) Change subject: VTY: add extended (11-bit) RACH detection toggle ...................................................................... Patch Set 1: Hi Harald, > [...] when RACH Detection is enabled on TCH during handover, > we never need TS1/TS2 and hence can optimize that case. Thanks, good point! I was thinking about that. > did you actually do some benchmarking to see > if my suspicion about performance impact was correct? Not yet, and not sure will I be able to do in short term. Anyway, which tool(s) would you recommend for benchmarking? > it would be great if we could somehow do this automatically, > [...] Maybe some addition to the TRXCTRL protocol? [...] This is also a good idea! But it would require more efforts, and could be done in a separate change I think. -- To view, visit https://gerrit.osmocom.org/11423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1aee998d83b06692d76a83f79748f9129a2547e8 Gerrit-Change-Number: 11423 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 22 Oct 2018 15:33:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 16:04:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 22 Oct 2018 16:04:23 +0000 Subject: Change in osmo-trx[master]: sigProcLib: introduce both TS1 and TS2 RACH synch. sequences In-Reply-To: References: Message-ID: Hello Tom Tsou, Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11390 to look at the new patch set (#3). Change subject: sigProcLib: introduce both TS1 and TS2 RACH synch. sequences ...................................................................... sigProcLib: introduce both TS1 and TS2 RACH synch. sequences According to 3GPP TS 05.02, section 5.2.7, there are three synch. sequences for Access Bursts: - TS0: GSM, GMSK (default), - TS1: EGPRS, 8-PSK, - TS2: EGPRS, GMSK. Let's prepare everythyng to be able to detect all TS0-3 synch. sequences, but keep detection of both TS1 and TS2 disabled until the corresponding VTY option is introduced. Change-Id: I838c21db29c54f1924dd478c2b34b46b70aab2cd Related: OS#3054 --- M GSM/GSMCommon.cpp M GSM/GSMCommon.h M Transceiver52M/radioInterface.cpp M Transceiver52M/sigProcLib.cpp 4 files changed, 31 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/90/11390/3 -- To view, visit https://gerrit.osmocom.org/11390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I838c21db29c54f1924dd478c2b34b46b70aab2cd Gerrit-Change-Number: 11390 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Tom Tsou -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 16:04:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 22 Oct 2018 16:04:23 +0000 Subject: Change in osmo-trx[master]: sigProcLib: add a CorrType for extended (11-bit) RACH In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11422 to look at the new patch set (#2). Change subject: sigProcLib: add a CorrType for extended (11-bit) RACH ...................................................................... sigProcLib: add a CorrType for extended (11-bit) RACH This is a preparatory change that enables a possibility to choose the amount of synch. sequences to be used for Access Burst (RACH) detection. The VTY flag will be introduced in further changes. There are two correlation types now: - RACH (default) - TS0 only; - EXT_RACH - all TS0, TS1, and TS2 together. Change-Id: Ia4f20524350bb8c380d7e10360758eddae8b03e9 Related: OS#3054 --- M Transceiver52M/sigProcLib.cpp M Transceiver52M/sigProcLib.h 2 files changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/22/11422/2 -- To view, visit https://gerrit.osmocom.org/11422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia4f20524350bb8c380d7e10360758eddae8b03e9 Gerrit-Change-Number: 11422 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 16:32:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 22 Oct 2018 16:32:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Disable testing FACCH/H with real HW In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11428 to look at the new patch set (#2). Change subject: bts: Disable testing FACCH/H with real HW ...................................................................... bts: Disable testing FACCH/H with real HW Temporary disable testing on FACCH/H because Calypso PHY is not stable. Otherwise some tests fail half of the time due to this unstability. Related: OS#3653 Change-Id: I078cdfbf8d27e543a723eab90f66b2fcda016b5d --- M bts/BTS_Tests.ttcn 1 file changed, 22 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/11428/2 -- To view, visit https://gerrit.osmocom.org/11428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I078cdfbf8d27e543a723eab90f66b2fcda016b5d Gerrit-Change-Number: 11428 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 16:32:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 22 Oct 2018 16:32:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Introduce mp_ul_rxlev_exp and use mp_rxlev_exp to craft meas rep Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11430 Change subject: bts: Introduce mp_ul_rxlev_exp and use mp_rxlev_exp to craft meas rep ...................................................................... bts: Introduce mp_ul_rxlev_exp and use mp_rxlev_exp to craft meas rep Change-Id: I1c8f05bde6f9dc8e8a649e877209192d829dd923 --- M bts/BTS_Tests.ttcn 1 file changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/11430/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 907a76a..bf85818 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -58,6 +58,7 @@ integer mp_tolerance_rxlev := 3; integer mp_tolerance_timing_offset_256syms := 0; integer mp_rxlev_exp := 57; + integer mp_ul_rxlev_exp := 10; integer mp_ms_power_level_exp := 7; integer mp_ms_actual_ta_exp := 0; integer mp_timing_offset_256syms_exp := 512; @@ -530,11 +531,11 @@ toa256_enabled := false, meas_ul := { full := { - rxlev := dbm2rxlev(-53), + rxlev := mp_ul_rxlev_exp, rxqual := 0 }, sub := { - rxlev := dbm2rxlev(-53), + rxlev := mp_ul_rxlev_exp, rxqual := 0 } }, @@ -1174,7 +1175,7 @@ var L1ctlDlMessage l1_dl; [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { log("SACCH received: ", l1_dl.payload.data_ind.payload); - var GsmRrL3Message meas_rep := valueof(ts_MEAS_REP(true, 23, 23, 0, 0, omit)); + var GsmRrL3Message meas_rep := valueof(ts_MEAS_REP(true, mp_rxlev_exp, mp_rxlev_exp, 0, 0, omit)); var LapdmFrameAB lb := valueof(ts_LAPDm_AB(0, false, false, enc_GsmRrL3Message(meas_rep))); log("LAPDm: ", lb); @@ -1417,10 +1418,8 @@ f_l1_tune(L1CTL); RSL.clear; - g_pars.l1_pars.meas_ul.full.rxlev := dbm2rxlev(-100); - g_pars.l1_pars.meas_ul.sub.rxlev := g_pars.l1_pars.meas_ul.full.rxlev; if (mp_bb_trxc_port != -1) { - f_trxc_fake_rssi(100); + f_trxc_fake_rssi(-1 * rxlev2dbm(mp_ul_rxlev_exp)); f_trx_fake_toffs256(g_pars.l1_pars.timing_offset_256syms); } -- To view, visit https://gerrit.osmocom.org/11430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1c8f05bde6f9dc8e8a649e877209192d829dd923 Gerrit-Change-Number: 11430 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 17:12:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 22 Oct 2018 17:12:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Disable testing FACCH/H with real HW In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11428 ) Change subject: bts: Disable testing FACCH/H with real HW ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I078cdfbf8d27e543a723eab90f66b2fcda016b5d Gerrit-Change-Number: 11428 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 22 Oct 2018 17:12:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 17:24:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 22 Oct 2018 17:24:36 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: Log fake_trx output to file Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11431 Change subject: ttcn3-bts-test: Log fake_trx output to file ...................................................................... ttcn3-bts-test: Log fake_trx output to file Change-Id: I82a80b045e6f298e5254f42f51dbf8c84013f45c --- M ttcn3-bts-test/jenkins.sh 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/31/11431/1 diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 1cd06e7..fe448f5 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -17,6 +17,8 @@ mkdir $VOL_BASE_DIR/unix +mkdir $VOL_BASE_DIR/fake_trx + echo Starting container with BSC docker run --rm \ --network $NET_NAME --ip 172.18.9.11 \ @@ -37,9 +39,10 @@ echo Starting container with fake_trx docker run --rm \ --network $NET_NAME --ip 172.18.9.21 \ + -v $VOL_BASE_DIR/fake_trx:/data \ --name ${BUILD_TAG}-fake_trx -d \ $REPO_USER/osmocom-bb-host-master \ - /tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py -R 172.18.9.20 -r 172.18.9.22 + bash -c "/tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py -R 172.18.9.20 -r 172.18.9.22 >/data/fake_trx.log 2>&1" echo Starting container with trxcon docker run --rm \ -- To view, visit https://gerrit.osmocom.org/11431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I82a80b045e6f298e5254f42f51dbf8c84013f45c Gerrit-Change-Number: 11431 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 18:22:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 22 Oct 2018 18:22:13 +0000 Subject: Change in osmocom-bb[master]: fake_trx: Implement CTRL if for FAKE_RSSI Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11432 Change subject: fake_trx: Implement CTRL if for FAKE_RSSI ...................................................................... fake_trx: Implement CTRL if for FAKE_RSSI Change-Id: Ic01c31fb0304345dd7337c3ee1c7ee3c2d3e8460 --- M src/target/trx_toolkit/ctrl_if_bb.py 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/32/11432/1 diff --git a/src/target/trx_toolkit/ctrl_if_bb.py b/src/target/trx_toolkit/ctrl_if_bb.py index 808c880..85aca15 100644 --- a/src/target/trx_toolkit/ctrl_if_bb.py +++ b/src/target/trx_toolkit/ctrl_if_bb.py @@ -144,6 +144,29 @@ return 0 + # RSSI simulation for Uplink + # Absolute form: CMD FAKE_RSSI + elif self.verify_cmd(request, "FAKE_RSSI", 2): + print("[i] Recv FAKE_RSSI cmd") + + # Parse and apply both base and threshold + self.burst_fwd.randomize_ul_rssi = True + self.burst_fwd.rssi_ul_base = int(request[1]) + self.burst_fwd.rssi_ul_threshold = int(request[2]) + + return 0 + + # Timing of Arrival simulation for Uplink + # Relative form: CMD FAKE_RSSI + elif self.verify_cmd(request, "FAKE_RSSI", 1): + print("[i] Recv FAKE_RSSI cmd") + + # Parse and apply value + self.burst_fwd.randomize_ul_rssi = False + self.burst_fwd.rssi_ul_base = int(request[1]) + + return 0 + # Path loss simulation for UL: burst dropping # Syntax: CMD FAKE_DROP # Dropping pattern: fn % 1 == 0 -- To view, visit https://gerrit.osmocom.org/11432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic01c31fb0304345dd7337c3ee1c7ee3c2d3e8460 Gerrit-Change-Number: 11432 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 18:26:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 22 Oct 2018 18:26:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Introduce mp_ul_rxlev_exp and use mp_rxlev_exp to craft meas rep In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11430 ) Change subject: bts: Introduce mp_ul_rxlev_exp and use mp_rxlev_exp to craft meas rep ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1c8f05bde6f9dc8e8a649e877209192d829dd923 Gerrit-Change-Number: 11430 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 22 Oct 2018 18:26:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Oct 22 20:05:59 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 22 Oct 2018 20:05:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-python-tests in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5bce2dc15bab5_4d134fe688916836@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-python-tests/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-python-tests failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-python-tests Last lines of build log: [ 21s] Processing triggers for libc-bin (2.23-0ubuntu3) ... [ 21s] [86/211] installing libunistring0-0.9.3-5.2ubuntu1 [ 21s] Processing triggers for libc-bin (2.23-0ubuntu3) ... [ 21s] [87/211] installing unzip-6.0-20ubuntu1 [ 21s] Processing triggers for mime-support (3.59ubuntu1) ... [ 21s] [88/211] installing groff-base-1.22.3-7 [ 21s] Processing triggers for mime-support (3.59ubuntu1) ... [ 21s] [89/211] installing less-481-2.1 [ 22s] Processing triggers for mime-support (3.59ubuntu1) ... [ 22s] [90/211] installing libc6-dev-2.23-0ubuntu3 [ 22s] [91/211] installing libicu55-55.1-7 [ 23s] Processing triggers for libc-bin (2.23-0ubuntu3) ... [ 23s] [92/211] installing python2.7-minimal-2.7.11-7ubuntu1 [ 23s] Segmentation fault (core dumped) [ 23s] dpkg: error processing package python2.7-minimal (--install): [ 23s] subprocess installed post-installation script returned error exit status 139 [ 23s] Errors were encountered while processing: [ 23s] python2.7-minimal [ 23s] exit ... [ 23s] [ 23s] sheep83 failed "build osmo-python-tests_0.0.9.20181022.dsc" at Mon Oct 22 20:05:54 UTC 2018. [ 23s] [ 23s] ### VM INTERACTION START ### [ 26s] [ 19.194381] sysrq: SysRq : Power Off [ 26s] [ 19.199261] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] sheep83 failed "build osmo-python-tests_0.0.9.20181022.dsc" at Mon Oct 22 20:05:57 UTC 2018. [ 26s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Oct 22 20:19:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 22 Oct 2018 20:19:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Disable testing FACCH/H with real HW In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11428 ) Change subject: bts: Disable testing FACCH/H with real HW ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11428/2/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/11428/2/bts/BTS_Tests.ttcn at 336 PS2, Line 336: }; rather than copy+pasting the entire array, one could probably have simply used the "append" operator (&) to add the one additional element in case mp_bb_trxc_port==-1. But well, not critical. -- To view, visit https://gerrit.osmocom.org/11428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I078cdfbf8d27e543a723eab90f66b2fcda016b5d Gerrit-Change-Number: 11428 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 22 Oct 2018 20:19:56 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 20:21:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 22 Oct 2018 20:21:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RSL_Emulation: handle ASP_IPA_EVENT_DOWN In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11429 ) Change subject: RSL_Emulation: handle ASP_IPA_EVENT_DOWN ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11429/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11429/2//COMMIT_MSG at 9 PS2, Line 9: Otherwise RSL layer fails this way when this event is received: Why are we expecting the RSL layer to ever receive an ASP_IPA_EVENT_DOWN? I agree the message is a bit cryptic, but I'm not sure if it is the right approach to simply ignore it. Rather than ignoring, we could explicitly fail/stop? -- To view, visit https://gerrit.osmocom.org/11429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idc6565c9de72d98015d56a41e5616c46051c8a8d Gerrit-Change-Number: 11429 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 22 Oct 2018 20:21:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 20:22:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 22 Oct 2018 20:22:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Introduce mp_ul_rxlev_exp and use mp_rxlev_exp to craft meas rep In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11430 ) Change subject: bts: Introduce mp_ul_rxlev_exp and use mp_rxlev_exp to craft meas rep ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1c8f05bde6f9dc8e8a649e877209192d829dd923 Gerrit-Change-Number: 11430 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 22 Oct 2018 20:22:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 20:22:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 22 Oct 2018 20:22:45 +0000 Subject: Change in osmocom-bb[master]: fake_trx: Implement CTRL if for FAKE_RSSI In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11432 ) Change subject: fake_trx: Implement CTRL if for FAKE_RSSI ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic01c31fb0304345dd7337c3ee1c7ee3c2d3e8460 Gerrit-Change-Number: 11432 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 22 Oct 2018 20:22:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 20:23:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 22 Oct 2018 20:23:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: Extend timeout in TC_mo_setup_and_nothing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11391 ) Change subject: MSC_Tests: Extend timeout in TC_mo_setup_and_nothing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f954a8807c0f0513422693ac24c647da0bfafd1 Gerrit-Change-Number: 11391 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 22 Oct 2018 20:23:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 20:23:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 22 Oct 2018 20:23:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: Extend timeout in TC_mo_setup_and_nothing In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11391 ) Change subject: MSC_Tests: Extend timeout in TC_mo_setup_and_nothing ...................................................................... MSC_Tests: Extend timeout in TC_mo_setup_and_nothing The mncc guard timer in osmo-msc expires after 180 sec. This tests terminates early and fails. Lets expand the timeout in order to give the test a chance to pass. Change-Id: I9f954a8807c0f0513422693ac24c647da0bfafd1 Related: OS#3599 --- M msc/MSC_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 93d7c77..c0cd9d3 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1206,7 +1206,7 @@ /* Test MO Call SETUP with no response from MNCC */ private function f_tc_mo_setup_and_nothing(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { - f_init_handler(pars); + f_init_handler(pars, 190.0); var CallParameters cpars := valueof(t_CallParams('12345'H, 0)); @@ -1218,7 +1218,7 @@ BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_SETUP(cpars.transaction_id, cpars.called_party))); - f_expect_clear(30.0); + f_expect_clear(185.0); } testcase TC_mo_setup_and_nothing() runs on MTC_CT { var BSC_ConnHdlr vc_conn; -- To view, visit https://gerrit.osmocom.org/11391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9f954a8807c0f0513422693ac24c647da0bfafd1 Gerrit-Change-Number: 11391 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 20:54:10 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 22 Oct 2018 20:54:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Introduce mp_ul_rxlev_exp and use mp_rxlev_exp to craft meas rep In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11430 ) Change subject: bts: Introduce mp_ul_rxlev_exp and use mp_rxlev_exp to craft meas rep ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1c8f05bde6f9dc8e8a649e877209192d829dd923 Gerrit-Change-Number: 11430 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 22 Oct 2018 20:54:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 21:32:21 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 22 Oct 2018 21:32:21 +0000 Subject: Change in osmocom-bb[master]: fake_trx: Implement CTRL if for FAKE_RSSI In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11432 ) Change subject: fake_trx: Implement CTRL if for FAKE_RSSI ...................................................................... Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/11432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic01c31fb0304345dd7337c3ee1c7ee3c2d3e8460 Gerrit-Change-Number: 11432 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 22 Oct 2018 21:32:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 22:05:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 22 Oct 2018 22:05:00 +0000 Subject: Change in osmocom-bb[master]: fake_trx: introduce CTRL commands for RSSI simulation In-Reply-To: References: Message-ID: Vadim Yanitskiy has uploaded a new patch set (#2) to the change originally created by Pau Espin Pedrol. ( https://gerrit.osmocom.org/11432 ) Change subject: fake_trx: introduce CTRL commands for RSSI simulation ...................................................................... fake_trx: introduce CTRL commands for RSSI simulation Since FakeTRX is a proxy, it basically emulates transceiver for both osmo-bts-trx and trxcon, hence there are two separate and independent control interfaces (usually, ports 6701 and 5701). All simulation commands (see 'FAKE_*') are usually implemented on both interfaces separately: - ctrl_if_bb.py - simulation commands affecting Uplink, - ctrl_if_bts.py - simulation commands affecting Downlink. This change introduces the 'FAKE_RSSI' command for both CTRL interfaces in two variations: - absolute: CMD FAKE_RSSI - relative: CMD FAKE_RSSI <+-BASE_DELTA> where 'THRESH' affects optional value randomization. Change-Id: Ic01c31fb0304345dd7337c3ee1c7ee3c2d3e8460 --- M src/target/trx_toolkit/ctrl_if_bb.py M src/target/trx_toolkit/ctrl_if_bts.py 2 files changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/32/11432/2 -- To view, visit https://gerrit.osmocom.org/11432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic01c31fb0304345dd7337c3ee1c7ee3c2d3e8460 Gerrit-Change-Number: 11432 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 22 22:11:16 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 22 Oct 2018 22:11:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/TRXC_Types.ttcn: correct FAKE_RSSI command template Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11433 Change subject: library/TRXC_Types.ttcn: correct FAKE_RSSI command template ...................................................................... library/TRXC_Types.ttcn: correct FAKE_RSSI command template Absolute form of FAKE_RSSI command shall contain an optional threshold value. Otherwise it's interpreted as relative form. Change-Id: Ief89b2601277488bb1782b981aff1061ddaa6637 --- M library/TRXC_Types.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/11433/1 diff --git a/library/TRXC_Types.ttcn b/library/TRXC_Types.ttcn index 1a37a8c..77666d9 100644 --- a/library/TRXC_Types.ttcn +++ b/library/TRXC_Types.ttcn @@ -58,10 +58,10 @@ external function dec_TrxcMessage(in charstring id) return TrxcMessage with { extension "prototype(convert) decode(TEXT)" }; -template (value) TrxcMessage ts_TRXC_FAKE_RSSI(uint8_t rssi) := { +template (value) TrxcMessage ts_TRXC_FAKE_RSSI(uint8_t rssi, int16_t thresh := 0) := { cmd := { verb := "FAKE_RSSI", - params := { int2str(rssi) } + params := { int2str(rssi), int2str(thresh) } } } -- To view, visit https://gerrit.osmocom.org/11433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ief89b2601277488bb1782b981aff1061ddaa6637 Gerrit-Change-Number: 11433 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 07:58:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 23 Oct 2018 07:58:39 +0000 Subject: Change in osmocom-bb[master]: fake_trx: introduce CTRL commands for RSSI simulation In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11432 ) Change subject: fake_trx: introduce CTRL commands for RSSI simulation ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic01c31fb0304345dd7337c3ee1c7ee3c2d3e8460 Gerrit-Change-Number: 11432 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 23 Oct 2018 07:58:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 07:59:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 23 Oct 2018 07:59:06 +0000 Subject: Change in osmocom-bb[master]: fake_trx: introduce CTRL commands for RSSI simulation In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11432 ) Change subject: fake_trx: introduce CTRL commands for RSSI simulation ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic01c31fb0304345dd7337c3ee1c7ee3c2d3e8460 Gerrit-Change-Number: 11432 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 23 Oct 2018 07:59:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 09:14:39 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 23 Oct 2018 09:14:39 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: Log fake_trx output to file In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11431 ) Change subject: ttcn3-bts-test: Log fake_trx output to file ...................................................................... Patch Set 1: Just wondering, why do we need that? -- To view, visit https://gerrit.osmocom.org/11431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82a80b045e6f298e5254f42f51dbf8c84013f45c Gerrit-Change-Number: 11431 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 23 Oct 2018 09:14:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 10:27:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 23 Oct 2018 10:27:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/TRXC_Types.ttcn: correct FAKE_RSSI command template In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11433 ) Change subject: library/TRXC_Types.ttcn: correct FAKE_RSSI command template ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ief89b2601277488bb1782b981aff1061ddaa6637 Gerrit-Change-Number: 11433 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 23 Oct 2018 10:27:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 10:29:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 23 Oct 2018 10:29:47 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: Log fake_trx output to file In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11431 ) Change subject: ttcn3-bts-test: Log fake_trx output to file ...................................................................... Patch Set 1: > Just wondering, why do we need that? You could extend that to why do we need logging in general in any software component ;) I used it to see log from fake_trx to understand how it behaved and was useful to add some prints during development of the FAKE_RSSI command. This way I don't need to do that next time, or if fake_trx starts failing for whatever reason we can check quickly why it fails. -- To view, visit https://gerrit.osmocom.org/11431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82a80b045e6f298e5254f42f51dbf8c84013f45c Gerrit-Change-Number: 11431 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 23 Oct 2018 10:29:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 10:34:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 23 Oct 2018 10:34:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Introduce mp_ul_rxlev_exp and use mp_rxlev_exp to craft meas rep In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11430 ) Change subject: bts: Introduce mp_ul_rxlev_exp and use mp_rxlev_exp to craft meas rep ...................................................................... bts: Introduce mp_ul_rxlev_exp and use mp_rxlev_exp to craft meas rep Change-Id: I1c8f05bde6f9dc8e8a649e877209192d829dd923 --- M bts/BTS_Tests.ttcn 1 file changed, 5 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 2f48b0f..a2d4ca4 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -58,6 +58,7 @@ integer mp_tolerance_rxlev := 3; integer mp_tolerance_timing_offset_256syms := 0; integer mp_rxlev_exp := 57; + integer mp_ul_rxlev_exp := 10; integer mp_ms_power_level_exp := 7; integer mp_ms_actual_ta_exp := 0; integer mp_timing_offset_256syms_exp := 512; @@ -518,11 +519,11 @@ toa256_enabled := false, meas_ul := { full := { - rxlev := dbm2rxlev(-53), + rxlev := mp_ul_rxlev_exp, rxqual := 0 }, sub := { - rxlev := dbm2rxlev(-53), + rxlev := mp_ul_rxlev_exp, rxqual := 0 } }, @@ -1162,7 +1163,7 @@ var L1ctlDlMessage l1_dl; [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { log("SACCH received: ", l1_dl.payload.data_ind.payload); - var GsmRrL3Message meas_rep := valueof(ts_MEAS_REP(true, 23, 23, 0, 0, omit)); + var GsmRrL3Message meas_rep := valueof(ts_MEAS_REP(true, mp_rxlev_exp, mp_rxlev_exp, 0, 0, omit)); var LapdmFrameAB lb := valueof(ts_LAPDm_AB(0, false, false, enc_GsmRrL3Message(meas_rep))); log("LAPDm: ", lb); @@ -1405,10 +1406,8 @@ f_l1_tune(L1CTL); RSL.clear; - g_pars.l1_pars.meas_ul.full.rxlev := dbm2rxlev(-100); - g_pars.l1_pars.meas_ul.sub.rxlev := g_pars.l1_pars.meas_ul.full.rxlev; if (mp_bb_trxc_port != -1) { - f_trxc_fake_rssi(100); + f_trxc_fake_rssi(rxlev2dbm(mp_ul_rxlev_exp)); f_trx_fake_toffs256(g_pars.l1_pars.timing_offset_256syms); } -- To view, visit https://gerrit.osmocom.org/11430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1c8f05bde6f9dc8e8a649e877209192d829dd923 Gerrit-Change-Number: 11430 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: fixeria -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 10:35:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 23 Oct 2018 10:35:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Disable testing FACCH/H with real HW In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11428 ) Change subject: bts: Disable testing FACCH/H with real HW ...................................................................... bts: Disable testing FACCH/H with real HW Temporary disable testing on FACCH/H because Calypso PHY is not stable. Otherwise some tests fail half of the time due to this unstability. Related: OS#3653 Change-Id: I078cdfbf8d27e543a723eab90f66b2fcda016b5d --- M bts/BTS_Tests.ttcn 1 file changed, 22 insertions(+), 10 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index a2d4ca4..fe0a933 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -313,17 +313,29 @@ valueof(ts_RslChanNr_SDCCH8(6,4)), valueof(ts_RslChanNr_SDCCH8(6,5)), valueof(ts_RslChanNr_SDCCH8(6,6)), valueof(ts_RslChanNr_SDCCH8(6,7)) }; - g_AllChanTypes := { - /* TS 1..4: TCH/F */ - valueof(ts_RslChanNr_Bm(1)), - /* TS 5: TCH/H */ - valueof(ts_RslChanNr_Lm(5,1)), - /* TS 0: SDCCH/4 */ - valueof(ts_RslChanNr_SDCCH4(0,2)), - /* TS 6: SDCCH/8 */ - valueof(ts_RslChanNr_SDCCH8(6,4)) - }; + /* FIXME: FACCH/H is unreliable with calypso firmware, see OS#3653 */ + if (mp_bb_trxc_port != -1) { + g_AllChanTypes := { + /* TS 1..4: TCH/F */ + valueof(ts_RslChanNr_Bm(1)), + /* TS 5: TCH/H */ + valueof(ts_RslChanNr_Lm(5,1)), + /* TS 0: SDCCH/4 */ + valueof(ts_RslChanNr_SDCCH4(0,2)), + /* TS 6: SDCCH/8 */ + valueof(ts_RslChanNr_SDCCH8(6,4)) + }; + } else { + g_AllChanTypes := { + /* TS 1..4: TCH/F */ + valueof(ts_RslChanNr_Bm(1)), + /* TS 0: SDCCH/4 */ + valueof(ts_RslChanNr_SDCCH4(0,2)), + /* TS 6: SDCCH/8 */ + valueof(ts_RslChanNr_SDCCH8(6,4)) + }; + } f_init_rsl(id); T.start; alt { -- To view, visit https://gerrit.osmocom.org/11428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I078cdfbf8d27e543a723eab90f66b2fcda016b5d Gerrit-Change-Number: 11428 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 10:41:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 23 Oct 2018 10:41:15 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: Log fake_trx output to file In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11431 ) Change subject: ttcn3-bts-test: Log fake_trx output to file ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82a80b045e6f298e5254f42f51dbf8c84013f45c Gerrit-Change-Number: 11431 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 23 Oct 2018 10:41:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 10:43:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 23 Oct 2018 10:43:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/TRXC_Types.ttcn: correct FAKE_RSSI command template In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11433 ) Change subject: library/TRXC_Types.ttcn: correct FAKE_RSSI command template ...................................................................... library/TRXC_Types.ttcn: correct FAKE_RSSI command template Absolute form of FAKE_RSSI command shall contain an optional threshold value. Otherwise it's interpreted as relative form. Change-Id: Ief89b2601277488bb1782b981aff1061ddaa6637 --- M library/TRXC_Types.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/TRXC_Types.ttcn b/library/TRXC_Types.ttcn index 1a37a8c..77666d9 100644 --- a/library/TRXC_Types.ttcn +++ b/library/TRXC_Types.ttcn @@ -58,10 +58,10 @@ external function dec_TrxcMessage(in charstring id) return TrxcMessage with { extension "prototype(convert) decode(TEXT)" }; -template (value) TrxcMessage ts_TRXC_FAKE_RSSI(uint8_t rssi) := { +template (value) TrxcMessage ts_TRXC_FAKE_RSSI(uint8_t rssi, int16_t thresh := 0) := { cmd := { verb := "FAKE_RSSI", - params := { int2str(rssi) } + params := { int2str(rssi), int2str(thresh) } } } -- To view, visit https://gerrit.osmocom.org/11433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ief89b2601277488bb1782b981aff1061ddaa6637 Gerrit-Change-Number: 11433 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 10:43:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 23 Oct 2018 10:43:41 +0000 Subject: Change in osmocom-bb[master]: fake_trx: introduce CTRL commands for RSSI simulation In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11432 ) Change subject: fake_trx: introduce CTRL commands for RSSI simulation ...................................................................... fake_trx: introduce CTRL commands for RSSI simulation Since FakeTRX is a proxy, it basically emulates transceiver for both osmo-bts-trx and trxcon, hence there are two separate and independent control interfaces (usually, ports 6701 and 5701). All simulation commands (see 'FAKE_*') are usually implemented on both interfaces separately: - ctrl_if_bb.py - simulation commands affecting Uplink, - ctrl_if_bts.py - simulation commands affecting Downlink. This change introduces the 'FAKE_RSSI' command for both CTRL interfaces in two variations: - absolute: CMD FAKE_RSSI - relative: CMD FAKE_RSSI <+-BASE_DELTA> where 'THRESH' affects optional value randomization. Change-Id: Ic01c31fb0304345dd7337c3ee1c7ee3c2d3e8460 --- M src/target/trx_toolkit/ctrl_if_bb.py M src/target/trx_toolkit/ctrl_if_bts.py 2 files changed, 42 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/target/trx_toolkit/ctrl_if_bb.py b/src/target/trx_toolkit/ctrl_if_bb.py index 808c880..3528c98 100644 --- a/src/target/trx_toolkit/ctrl_if_bb.py +++ b/src/target/trx_toolkit/ctrl_if_bb.py @@ -144,6 +144,27 @@ return 0 + # RSSI simulation for Uplink + # Absolute form: CMD FAKE_RSSI + elif self.verify_cmd(request, "FAKE_RSSI", 2): + print("[i] Recv FAKE_RSSI cmd") + + # Parse and apply both base and threshold + self.burst_fwd.rssi_ul_base = int(request[1]) + self.burst_fwd.rssi_ul_threshold = int(request[2]) + + return 0 + + # RSSI simulation for Uplink + # Relative form: CMD FAKE_RSSI <+-BASE_DELTA> + elif self.verify_cmd(request, "FAKE_RSSI", 1): + print("[i] Recv FAKE_RSSI cmd") + + # Parse and apply delta + self.burst_fwd.rssi_ul_base += int(request[1]) + + return 0 + # Path loss simulation for UL: burst dropping # Syntax: CMD FAKE_DROP # Dropping pattern: fn % 1 == 0 diff --git a/src/target/trx_toolkit/ctrl_if_bts.py b/src/target/trx_toolkit/ctrl_if_bts.py index 72a0371..6ac8ffb 100644 --- a/src/target/trx_toolkit/ctrl_if_bts.py +++ b/src/target/trx_toolkit/ctrl_if_bts.py @@ -118,6 +118,27 @@ return 0 + # RSSI simulation for Downlink + # Absolute form: CMD FAKE_RSSI + elif self.verify_cmd(request, "FAKE_RSSI", 2): + print("[i] Recv FAKE_RSSI cmd") + + # Parse and apply both base and threshold + self.burst_fwd.rssi_dl_base = int(request[1]) + self.burst_fwd.rssi_dl_threshold = int(request[2]) + + return 0 + + # RSSI simulation for Downlink + # Relative form: CMD FAKE_RSSI <+-BASE_DELTA> + elif self.verify_cmd(request, "FAKE_RSSI", 1): + print("[i] Recv FAKE_RSSI cmd") + + # Parse and apply delta + self.burst_fwd.rssi_dl_base += int(request[1]) + + return 0 + # Path loss simulation for DL: burst dropping # Syntax: CMD FAKE_DROP # Dropping pattern: fn % 1 == 0 -- To view, visit https://gerrit.osmocom.org/11432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic01c31fb0304345dd7337c3ee1c7ee3c2d3e8460 Gerrit-Change-Number: 11432 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 11:08:38 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 23 Oct 2018 11:08:38 +0000 Subject: Change in osmo-dev[master]: gen_makefile.py: detect changes in cpp files Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11434 Change subject: gen_makefile.py: detect changes in cpp files ...................................................................... gen_makefile.py: detect changes in cpp files Properly rebuild when cpp files (e.g. from osmo-trx) have been changed. Change-Id: I9382d984fa1988eefbb6be3e45d88b2f1f5b598a --- M gen_makefile.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/34/11434/1 diff --git a/gen_makefile.py b/gen_makefile.py index c2b6128..1ae29f5 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -168,7 +168,7 @@ ### {proj} ### {proj}_configure_files := $(shell find {src_proj} -name "Makefile.am" -or -name "*.in" ) -{proj}_files := $(shell find {src_proj} -name "*.[hc]" -or -name "*.py" ) +{proj}_files := $(shell find {src_proj} -name "*.[hc]" -or -name "*.py" -or -name "*.cpp" ) .make.{proj}.clone: @echo "\n\n\n===== $@\n" -- To view, visit https://gerrit.osmocom.org/11434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9382d984fa1988eefbb6be3e45d88b2f1f5b598a Gerrit-Change-Number: 11434 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 11:25:27 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 23 Oct 2018 11:25:27 +0000 Subject: Change in osmo-trx[master]: Add long parameters (--help, --version, ...) Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11435 Change subject: Add long parameters (--help, --version, ...) ...................................................................... Add long parameters (--help, --version, ...) Makes osmo-trx-* more consistent with other Osmocom programs, and allows an unified test for not having "UNKNOWN" in --version. Related: OS#3578 Change-Id: I90cf01d972aa10b48c59b67a1e7f82a4255ef526 --- M Transceiver52M/osmo-trx.cpp 1 file changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/35/11435/1 diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index d01a4cf..1caa225 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -211,9 +212,9 @@ static void print_help() { fprintf(stdout, "Options:\n" - " -h This text\n" - " -C Filename The config file to use\n" - " -V Print the version of OsmoTRX\n" + " -h, --help This text\n" + " -C, --config Filename The config file to use\n" + " -V, --version Print the version of OsmoTRX\n" ); } @@ -230,8 +231,15 @@ unsigned int i; std::vector rx_paths, tx_paths; bool rx_paths_set = false, tx_paths_set = false; + static struct option long_options[] = { + {"help", 0, 0, 'h'}, + {"config-file", 1, 0, 'C'}, + {"version", 0, 0, 'V' }, + {NULL, 0, 0, 0} + }; - while ((option = getopt(argc, argv, "ha:l:i:j:p:c:dmxgfo:s:b:r:A:R:Set:y:z:C:V")) != -1) { + while ((option = getopt_long(argc, argv, "ha:l:i:j:p:c:dmxgfo:s:b:r:A:R:Set:y:z:C:V", long_options, + NULL)) != -1) { switch (option) { case 'h': print_help(); -- To view, visit https://gerrit.osmocom.org/11435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I90cf01d972aa10b48c59b67a1e7f82a4255ef526 Gerrit-Change-Number: 11435 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 11:27:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 23 Oct 2018 11:27:59 +0000 Subject: Change in osmo-trx[master]: Add long parameters (--help, --version, ...) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11435 ) Change subject: Add long parameters (--help, --version, ...) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I90cf01d972aa10b48c59b67a1e7f82a4255ef526 Gerrit-Change-Number: 11435 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 23 Oct 2018 11:27:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 11:28:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 23 Oct 2018 11:28:35 +0000 Subject: Change in osmo-trx[master]: Add long parameters (--help, --version, ...) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11435 ) Change subject: Add long parameters (--help, --version, ...) ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11435/1/Transceiver52M/osmo-trx.cpp File Transceiver52M/osmo-trx.cpp: https://gerrit.osmocom.org/#/c/11435/1/Transceiver52M/osmo-trx.cpp at 236 PS1, Line 236: {"config-file", 1, 0, 'C'}, why config above and config-file here? -- To view, visit https://gerrit.osmocom.org/11435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I90cf01d972aa10b48c59b67a1e7f82a4255ef526 Gerrit-Change-Number: 11435 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 23 Oct 2018 11:28:35 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 11:32:35 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 23 Oct 2018 11:32:35 +0000 Subject: Change in osmo-trx[master]: Add long parameters (--help, --version, ...) In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11435 to look at the new patch set (#2). Change subject: Add long parameters (--help, --version, ...) ...................................................................... Add long parameters (--help, --version, ...) Makes osmo-trx-* more consistent with other Osmocom programs, and allows an unified test for not having "UNKNOWN" in --version. Related: OS#3578 Change-Id: I90cf01d972aa10b48c59b67a1e7f82a4255ef526 --- M Transceiver52M/osmo-trx.cpp 1 file changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/35/11435/2 -- To view, visit https://gerrit.osmocom.org/11435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I90cf01d972aa10b48c59b67a1e7f82a4255ef526 Gerrit-Change-Number: 11435 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 11:33:25 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 23 Oct 2018 11:33:25 +0000 Subject: Change in osmo-trx[master]: Add long parameters (--help, --version, ...) In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11435 ) Change subject: Add long parameters (--help, --version, ...) ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11435/1/Transceiver52M/osmo-trx.cpp File Transceiver52M/osmo-trx.cpp: https://gerrit.osmocom.org/#/c/11435/1/Transceiver52M/osmo-trx.cpp at 236 PS1, Line 236: {"config-file", 1, 0, 'C'}, > why config above and config-file here? Copy paste mistake from osmo-sip-connector. Fixed now, thanks! -- To view, visit https://gerrit.osmocom.org/11435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I90cf01d972aa10b48c59b67a1e7f82a4255ef526 Gerrit-Change-Number: 11435 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 23 Oct 2018 11:33:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 11:34:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 23 Oct 2018 11:34:29 +0000 Subject: Change in osmo-trx[master]: Add long parameters (--help, --version, ...) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11435 ) Change subject: Add long parameters (--help, --version, ...) ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I90cf01d972aa10b48c59b67a1e7f82a4255ef526 Gerrit-Change-Number: 11435 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 23 Oct 2018 11:34:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 11:34:41 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 23 Oct 2018 11:34:41 +0000 Subject: Change in osmo-trx[master]: Add long parameters (--help, --version, ...) In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11435 ) Change subject: Add long parameters (--help, --version, ...) ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/11435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I90cf01d972aa10b48c59b67a1e7f82a4255ef526 Gerrit-Change-Number: 11435 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 23 Oct 2018 11:34:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 11:34:43 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 23 Oct 2018 11:34:43 +0000 Subject: Change in osmo-trx[master]: Add long parameters (--help, --version, ...) In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11435 ) Change subject: Add long parameters (--help, --version, ...) ...................................................................... Add long parameters (--help, --version, ...) Makes osmo-trx-* more consistent with other Osmocom programs, and allows an unified test for not having "UNKNOWN" in --version. Related: OS#3578 Change-Id: I90cf01d972aa10b48c59b67a1e7f82a4255ef526 --- M Transceiver52M/osmo-trx.cpp 1 file changed, 12 insertions(+), 4 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved osmith: Verified diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index 7f72c47..b6b676e 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -211,9 +212,9 @@ static void print_help() { fprintf(stdout, "Options:\n" - " -h This text\n" - " -C Filename The config file to use\n" - " -V Print the version of OsmoTRX\n" + " -h, --help This text\n" + " -C, --config Filename The config file to use\n" + " -V, --version Print the version of OsmoTRX\n" ); } @@ -230,8 +231,15 @@ unsigned int i; std::vector rx_paths, tx_paths; bool rx_paths_set = false, tx_paths_set = false; + static struct option long_options[] = { + {"help", 0, 0, 'h'}, + {"config", 1, 0, 'C'}, + {"version", 0, 0, 'V'}, + {NULL, 0, 0, 0} + }; - while ((option = getopt(argc, argv, "ha:l:i:j:p:c:dmxgfo:s:b:r:A:R:Set:y:z:C:V")) != -1) { + while ((option = getopt_long(argc, argv, "ha:l:i:j:p:c:dmxgfo:s:b:r:A:R:Set:y:z:C:V", long_options, + NULL)) != -1) { switch (option) { case 'h': print_help(); -- To view, visit https://gerrit.osmocom.org/11435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I90cf01d972aa10b48c59b67a1e7f82a4255ef526 Gerrit-Change-Number: 11435 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 11:43:41 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 23 Oct 2018 11:43:41 +0000 Subject: Change in docker-playground[master]: repo-install-test: version test for all programs Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11436 Change subject: repo-install-test: version test for all programs ...................................................................... repo-install-test: version test for all programs We did not test all programs before, because they did not have --version implemented. Now they do. Related: OS#3555 Change-Id: I796f1e34d2c026b11dff89511b667fa457856088 --- M debian-repo-install-test/testdata/repo-install-test.sh 1 file changed, 6 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/36/11436/1 diff --git a/debian-repo-install-test/testdata/repo-install-test.sh b/debian-repo-install-test/testdata/repo-install-test.sh index 3ef88e8..f45908b 100755 --- a/debian-repo-install-test/testdata/repo-install-test.sh +++ b/debian-repo-install-test/testdata/repo-install-test.sh @@ -66,17 +66,13 @@ } test_binaries() { - # Make sure the binaries are not broken (run -h or --version) - osmo-gtphub -h - osmo-sip-connector -h - osmo-trx-uhd -h - osmo-trx-usrp1 -h - + # Make sure that binares run at all and output a proper version test_binaries_version \ osmo-bsc \ osmo-bts-trx \ osmo-bts-virtual \ osmo-gbproxy \ + osmo-gtphub \ osmo-ggsn \ osmo-hlr \ osmo-hlr-db-tool \ @@ -85,7 +81,10 @@ osmo-msc \ osmo-pcu \ osmo-sgsn \ - osmo-stp + osmo-sip-connector \ + osmo-stp \ + osmo-trx-uhd \ + osmo-trx-usrp1 } finish() { -- To view, visit https://gerrit.osmocom.org/11436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I796f1e34d2c026b11dff89511b667fa457856088 Gerrit-Change-Number: 11436 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 12:26:20 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 23 Oct 2018 12:26:20 +0000 Subject: Change in osmo-bsc[master]: cosmetic: fix spec ref for gsm0808_cipher_mode() Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11437 Change subject: cosmetic: fix spec ref for gsm0808_cipher_mode() ...................................................................... cosmetic: fix spec ref for gsm0808_cipher_mode() Change-Id: I359caf1dd30f033c0b606040ccf27aa4c5a9d2c6 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/37/11437/1 diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index a20d5d0..1e97f33 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -415,7 +415,7 @@ } /* - * GSM 08.08 ? 3.4.7 cipher mode handling. We will have to pick + * GSM 04.08 ? 3.4.7 cipher mode handling. We will have to pick * the cipher to be used for this. In case we are already using * a cipher we will have to send cipher mode reject to the MSC, * otherwise we will have to pick something that we and the MS -- To view, visit https://gerrit.osmocom.org/11437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I359caf1dd30f033c0b606040ccf27aa4c5a9d2c6 Gerrit-Change-Number: 11437 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 12:26:20 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 23 Oct 2018 12:26:20 +0000 Subject: Change in osmo-bsc[master]: cipher mode reject: send proper cause codes Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11438 Change subject: cipher mode reject: send proper cause codes ...................................................................... cipher mode reject: send proper cause codes bssmap_handle_cipher_mode() had code paths doing "goto reject" without setting a meaningful cause value. Related: OS#3186 Change-Id: Ia608fa34a6a2d3035a66d05fbc38553ac5186804 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/38/11438/1 diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 1e97f33..9419f56 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -444,6 +444,7 @@ if (conn->ciphering_handled) { LOGP(DMSC, LOGL_ERROR, "Already seen ciphering command. Protocol Error.\n"); + reject_cause = GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC; goto reject; } @@ -452,6 +453,7 @@ tlv_parse(&tp, gsm0808_att_tlvdef(), msg->l4h + 1, payload_length - 1, 0, 0); if (!TLVP_PRESENT(&tp, GSM0808_IE_ENCRYPTION_INFORMATION)) { LOGP(DMSC, LOGL_ERROR, "IE Encryption Information missing.\n"); + reject_cause = GSM0808_CAUSE_INFORMATION_ELEMENT_OR_FIELD_MISSING; goto reject; } @@ -464,6 +466,7 @@ len = TLVP_LEN(&tp, GSM0808_IE_ENCRYPTION_INFORMATION); if (len < 1) { LOGP(DMSC, LOGL_ERROR, "IE Encryption Information is too short.\n"); + reject_cause = GSM0808_CAUSE_INCORRECT_VALUE; goto reject; } -- To view, visit https://gerrit.osmocom.org/11438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia608fa34a6a2d3035a66d05fbc38553ac5186804 Gerrit-Change-Number: 11438 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 12:28:01 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 23 Oct 2018 12:28:01 +0000 Subject: Change in osmo-bsc[master]: cipher mode reject: send proper cause codes In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11438 ) Change subject: cipher mode reject: send proper cause codes ...................................................................... cipher mode reject: send proper cause codes bssmap_handle_cipher_mode() had code paths doing "goto reject" without setting a meaningful cause value. Related: OS#3186 Change-Id: Ia608fa34a6a2d3035a66d05fbc38553ac5186804 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/38/11438/2 -- To view, visit https://gerrit.osmocom.org/11438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia608fa34a6a2d3035a66d05fbc38553ac5186804 Gerrit-Change-Number: 11438 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 13:04:33 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 23 Oct 2018 13:04:33 +0000 Subject: Change in osmo-mgw[master]: use a dynamic name for rtp connection rate counters Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11439 Change subject: use a dynamic name for rtp connection rate counters ...................................................................... use a dynamic name for rtp connection rate counters Before this change, when running 'show rate-counters' on the VTY, rate counters groups for all RTP connections shared the same static name "rtp connection statistics". This made it impossible to discern which connection an RTP counter group applied to. Instead, allocate a fresh copy of rate counter descriptions for each RTP connection and use a connection-specific label for the rate counter group which includes the internal connection ID, the endpoint number, and the callid. Example of the new rate counter group naming scheme: "rtp statistics for connection 5E7B20AF, endpoint:0x2, callid '1226'" With input from Philipp Maier. Change-Id: I027644f4b913e1f966c11b081e9027e61591a224 Related: OS#2660 --- M src/libosmo-mgcp/mgcp_conn.c 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/39/11439/1 diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 820c63a..dd3c64c 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -43,7 +43,7 @@ const static struct rate_ctr_group_desc rate_ctr_group_desc = { .group_name_prefix = "conn_rtp", - .group_description = "rtp connection statistics", + .group_description = "rtp statistics", .class_id = 1, .num_ctr = ARRAY_SIZE(rate_ctr_desc), .ctr_desc = rate_ctr_desc @@ -94,6 +94,8 @@ static void mgcp_rtp_conn_init(struct mgcp_conn_rtp *conn_rtp, struct mgcp_conn *conn) { struct mgcp_rtp_end *end = &conn_rtp->end; + struct rate_ctr_group_desc *rate_ctrs; + /* FIXME: Each new rate counter group requires an unique index. At the * moment we generate this index using this counter, but perhaps there * is a more concious way to assign the indexes. */ @@ -117,7 +119,15 @@ end->output_enabled = 0; end->maximum_packet_time = -1; - conn_rtp->rate_ctr_group = rate_ctr_group_alloc(conn, &rate_ctr_group_desc, rate_ctr_index); + rate_ctrs = talloc(conn, struct rate_ctr_group_desc); + OSMO_ASSERT(rate_ctrs); + memcpy(rate_ctrs, &rate_ctr_group_desc, sizeof(*rate_ctrs)); + rate_ctrs->group_description = talloc_asprintf(conn, "%s for connection %s, endpoint:0x%x, callid '%s'", + rate_ctr_group_desc.group_description, conn->id, + ENDPOINT_NUMBER(conn->endp), conn->endp->callid); + OSMO_ASSERT(rate_ctrs->group_description); + conn_rtp->rate_ctr_group = rate_ctr_group_alloc(conn, rate_ctrs, rate_ctr_index); + OSMO_ASSERT(conn_rtp->rate_ctr_group); conn_rtp->state.in_stream.err_ts_ctr = &conn_rtp->rate_ctr_group->ctr[IN_STREAM_ERR_TSTMP_CTR]; conn_rtp->state.out_stream.err_ts_ctr = &conn_rtp->rate_ctr_group->ctr[OUT_STREAM_ERR_TSTMP_CTR]; rate_ctr_index++; -- To view, visit https://gerrit.osmocom.org/11439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I027644f4b913e1f966c11b081e9027e61591a224 Gerrit-Change-Number: 11439 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 13:56:00 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 23 Oct 2018 13:56:00 +0000 Subject: Change in osmocom-bb[master]: mobile: display MS IMSI in vty Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11440 Change subject: mobile: display MS IMSI in vty ...................................................................... mobile: display MS IMSI in vty Show IMSI in addition to IMEI when using 'show ms 1' command. Change-Id: Id05f4f5f3416dcdb9ce2fd24f9360f5e6faaf654 --- M src/host/layer23/src/mobile/vty_interface.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/40/11440/1 diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 12c32a5..1fb6e15 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -201,6 +201,9 @@ else vty_out(vty, " IMEI generation: fixed%s", VTY_NEWLINE); + if (ms->settings.test_imsi) + vty_out(vty, " IMSI: %s%s", ms->settings.test_imsi, VTY_NEWLINE); + if (ms->shutdown != MS_SHUTDOWN_NONE) return; -- To view, visit https://gerrit.osmocom.org/11440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id05f4f5f3416dcdb9ce2fd24f9360f5e6faaf654 Gerrit-Change-Number: 11440 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Oct 23 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 23 Oct 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#285?= In-Reply-To: <982576756.153.1540221007323.JavaMail.jenkins@jenkins.osmocom.org> References: <982576756.153.1540221007323.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1495820638.171.1540307407327.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Oct 23 16:02:49 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 23 Oct 2018 16:02:49 +0000 Subject: Change in osmo-bsc[master]: gsm_data: set meaningful default values for amr modes Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11441 Change subject: gsm_data: set meaningful default values for amr modes ...................................................................... gsm_data: set meaningful default values for amr modes The function gsm_bts_alloc() does set default values for the amr rates for a newly allocated bts, but it does not populate the ms_mode and bts_mode flags which contain hysteresis and threshold. Those values are currently set to 0 by default, which does not make much sense. Lets popluate some appropriate default values. - Make sure that .mode .hysteresis and .threshold are populated for MS and BTS in full and halfrate Change-Id: If14843feeeea6584e5991d5c0abb765611dfaa57 Related: OS#3529 --- M src/osmo-bsc/gsm_data.c 1 file changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/41/11441/1 diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 8d0b831..08d5bcb 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -900,6 +900,21 @@ .m12_2 = 1 }; memcpy(bts->mr_full.gsm48_ie, &mr_cfg, sizeof(bts->mr_full.gsm48_ie)); + bts->mr_full.ms_mode[0].mode = 1; + bts->mr_full.ms_mode[1].mode = 2; + bts->mr_full.ms_mode[2].mode = 6; + bts->mr_full.ms_mode[3].mode = 7; + bts->mr_full.bts_mode[0].mode = 1; + bts->mr_full.bts_mode[1].mode = 2; + bts->mr_full.bts_mode[2].mode = 6; + bts->mr_full.bts_mode[3].mode = 7; + for (i = 0; i < 3; i++) { + bts->mr_full.ms_mode[i].hysteresis = 8; + bts->mr_full.ms_mode[i].threshold = 32; + bts->mr_full.bts_mode[i].hysteresis = 8; + bts->mr_full.bts_mode[i].threshold = 32; + } + bts->mr_full.num_modes = 4; mr_cfg = (struct gsm48_multi_rate_conf) { .m4_75 = 0, @@ -912,6 +927,21 @@ .m12_2 = 0 }; memcpy(bts->mr_half.gsm48_ie, &mr_cfg, sizeof(bts->mr_half.gsm48_ie)); + bts->mr_half.ms_mode[0].mode = 1; + bts->mr_half.ms_mode[1].mode = 2; + bts->mr_half.ms_mode[2].mode = 4; + bts->mr_half.ms_mode[3].mode = 5; + bts->mr_half.bts_mode[0].mode = 1; + bts->mr_half.bts_mode[1].mode = 2; + bts->mr_half.bts_mode[2].mode = 4; + bts->mr_half.bts_mode[3].mode = 5; + for (i = 0; i < 3; i++) { + bts->mr_half.ms_mode[i].hysteresis = 8; + bts->mr_half.ms_mode[i].threshold = 32; + bts->mr_half.bts_mode[i].hysteresis = 8; + bts->mr_half.bts_mode[i].threshold = 32; + } + bts->mr_half.num_modes = 4; return bts; } -- To view, visit https://gerrit.osmocom.org/11441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If14843feeeea6584e5991d5c0abb765611dfaa57 Gerrit-Change-Number: 11441 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 16:02:49 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 23 Oct 2018 16:02:49 +0000 Subject: Change in osmo-bsc[master]: codec_pref: also check amr codec rates in check_codec_pref() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11442 Change subject: codec_pref: also check amr codec rates in check_codec_pref() ...................................................................... codec_pref: also check amr codec rates in check_codec_pref() The function check_codec_pref() currently only does a basic check over the general codec configuration of bts and msc. However, it does not yet check if the amr codec rate settings for the BTSs contradict the allowed/forbidden amr codec rates of the MSC. When the two settings do contradict AMR would not work, even when everything else is correctly configured. We need to check this on startup to spot configuration problems quickly. - Add function to calculate intersections of struct gsm48_multi_rate_conf variables. - Calculate the intersection between the multi rate config of each BTS with the one of the MSC Change-Id: I3537d1c89e2520d35cc0e150ba8e6d3693e06710 Related: OS#3529 --- M include/osmocom/bsc/codec_pref.h M src/osmo-bsc/codec_pref.c 2 files changed, 53 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/42/11442/1 diff --git a/include/osmocom/bsc/codec_pref.h b/include/osmocom/bsc/codec_pref.h index d62d29f..51340c1 100644 --- a/include/osmocom/bsc/codec_pref.h +++ b/include/osmocom/bsc/codec_pref.h @@ -22,4 +22,8 @@ const struct bsc_msc_data *msc, const struct gsm_bts *bts); +int calc_amr_rate_intersection(struct gsm48_multi_rate_conf *c, + const struct gsm48_multi_rate_conf *b, + const struct gsm48_multi_rate_conf *a); + int check_codec_pref(struct llist_head *mscs); diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index 9f30c7b..b031220 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -393,6 +393,35 @@ } } +/*! Calculate the intersection of the rate configuration of two multirate configuration + * IE structures. The result c will be a copy of a, but the rate configuration bits + * will be the intersection of the rate configuration bits in a and b. + * \param[out] c user provided memory to store the result. + * \param[in] a multi rate configuration a. + * \param[in] b multi rate configuration b. + * \returns 0 on success, -1 when the result contains an empty set of modes. */ +int calc_amr_rate_intersection(struct gsm48_multi_rate_conf *c, + const struct gsm48_multi_rate_conf *b, + const struct gsm48_multi_rate_conf *a) +{ + struct gsm48_multi_rate_conf res; + uint8_t *_a = (uint8_t *) a; + uint8_t *_b = (uint8_t *) b; + uint8_t *_res = (uint8_t *) & res; + + memcpy(&res, a, sizeof(res)); + + _res[1] = _a[1] & _b[1]; + + if (_res[1] == 0x00) + return -1; + + if (c) + memcpy(c, &res, sizeof(*c)); + + return 0; +} + /*! Visit the codec settings for the MSC and for each BTS in order to make sure * that the configuration does not contain any combinations that lead into a * mutually exclusive codec configuration (empty intersection). @@ -404,6 +433,8 @@ struct gsm_bts *bts; struct gsm0808_speech_codec_list scl; int rc = 0; + int rc_rate; + const struct gsm48_multi_rate_conf *bts_gsm48_ie; llist_for_each_entry(msc, mscs, entry) { llist_for_each_entry(bts, &msc->network->bts_list, list) { @@ -414,6 +445,24 @@ bts->nr, msc->nr); rc = -1; } + + bts_gsm48_ie = (struct gsm48_multi_rate_conf *)&bts->mr_full.gsm48_ie; + rc_rate = calc_amr_rate_intersection(NULL, &msc->amr_conf, bts_gsm48_ie); + if (rc_rate < 0) { + LOGP(DMSC, LOGL_FATAL, + "network amr tch-f mode config of BTS %u does not intersect with amr-config of MSC %u\n", + bts->nr, msc->nr); + rc = -1; + } + + bts_gsm48_ie = (struct gsm48_multi_rate_conf *)&bts->mr_half.gsm48_ie; + rc_rate = calc_amr_rate_intersection(NULL, &msc->amr_conf, bts_gsm48_ie); + if (rc_rate < 0) { + LOGP(DMSC, LOGL_FATAL, + "network amr tch-f mode config of BTS %u does not intersect with amr-config of MSC %u\n", + bts->nr, msc->nr); + rc = -1; + } } } -- To view, visit https://gerrit.osmocom.org/11442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3537d1c89e2520d35cc0e150ba8e6d3693e06710 Gerrit-Change-Number: 11442 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 16:02:50 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 23 Oct 2018 16:02:50 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08: improve gsm48_multirate_config() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11443 Change subject: gsm_04_08: improve gsm48_multirate_config() ...................................................................... gsm_04_08: improve gsm48_multirate_config() The function gsm48_multirate_config() generates the multirate configuration IE, that is sent via RSL to configure the active set of AMR codecs inside the BTS. The function already works, but it does not check the input data for consistancy. Lets add some consistancy check to make sure that inconsistant parameters are rejected. Also allow the output pointer to be NULL, so that the function can be used to perform a dry run to be able to verify parameters. - Check for invalid / inconsistant configuration parameters - Perform a dry-run when lv pointer is set to NULL Change-Id: I06beb7dd7236c81c3a91af4d09c31891f4b910a4 Related: OS#3529 --- M include/osmocom/bsc/gsm_04_08_rr.h M src/osmo-bsc/gsm_04_08_rr.c M tests/gsm0408/Makefile.am M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 5 files changed, 234 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/43/11443/1 diff --git a/include/osmocom/bsc/gsm_04_08_rr.h b/include/osmocom/bsc/gsm_04_08_rr.h index e2e861d..8e4f787 100644 --- a/include/osmocom/bsc/gsm_04_08_rr.h +++ b/include/osmocom/bsc/gsm_04_08_rr.h @@ -23,7 +23,8 @@ struct msgb *msg, struct bsc_subscr *bsub); int gsm48_send_rr_classmark_enquiry(struct gsm_lchan *lchan); int gsm48_send_rr_ciph_mode(struct gsm_lchan *lchan, int want_imeisv); -int gsm48_multirate_config(uint8_t *lv, const struct amr_multirate_conf *mr, const struct amr_mode *modes); +int gsm48_multirate_config(uint8_t *lv, const struct gsm48_multi_rate_conf *mr_conf, + const struct amr_mode *modes, unsigned int num_modes); struct msgb *gsm48_make_ho_cmd(struct gsm_lchan *new_lchan, uint8_t power_command, uint8_t ho_ref); int gsm48_send_ho_cmd(struct gsm_lchan *old_lchan, struct gsm_lchan *new_lchan, uint8_t power_command, uint8_t ho_ref); diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 35044a3..4659c1a 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -321,47 +321,113 @@ cd->arfcn_lo = bts->c0->arfcn & 0xff; } -/*! \brief Encode a TS 04.08 multirate config LV according to 10.5.2.21aa - * \param[out] lv caller-allocated buffer of 7 bytes. First octet is IS length - * \param[in] mr multi-rate configuration to encode - * \param[in] modes array describing the AMR modes - * \returns 0 on success */ -int gsm48_multirate_config(uint8_t *lv, const struct amr_multirate_conf *mr, const struct amr_mode *modes) +/*! \brief Encode a TS 04.08 multirate config LV according to 10.5.2.21aa. + * \param[out] lv caller-allocated buffer of 7 bytes. First octet is is length. + * \param[in] mr_conf multi-rate configuration to encode (selected modes). + * \param[in] modes array describing the AMR modes. + * \param[in] num_modes length of the modes array. + * \returns 0 on success, -EINVAL on failure. */ +int gsm48_multirate_config(uint8_t *lv, + const struct gsm48_multi_rate_conf *mr_conf, + const struct amr_mode *modes, unsigned int num_modes) { - int num = 0, i; + int num = 0; + unsigned int i; + unsigned int k; + unsigned int m = 0; + bool mode_valid; + uint8_t *gsm48_ie = (uint8_t *) mr_conf; + const struct amr_mode *modes_selected[4]; + /* Check if modes for consistency (order and duplicates) */ + for (i = 0; i < num_modes; i++) { + if (i > 0 && modes[i - 1].mode > modes[i].mode) { + LOGP(DRR, LOGL_ERROR, + "BUG: Multirate codec with inconsistant config (mode order).\n"); + return -EINVAL; + } + if (i > 0 && modes[i - 1].mode == modes[i].mode) { + LOGP(DRR, LOGL_ERROR, + "BUG: Multirate codec with inconsistant config (duplicate modes).\n"); + return -EINVAL; + } + } + + /* Check if the active set that is defined in mr_conf has at least one + * mode but not more than 4 modes set */ for (i = 0; i < 8; i++) { - if (((mr->gsm48_ie[1] >> i) & 1)) + if (((gsm48_ie[1] >> i) & 1)) num++; } if (num > 4) { - LOGP(DRR, LOGL_ERROR, "BUG: Using multirate codec with too " - "many modes in config.\n"); - num = 4; + LOGP(DRR, LOGL_ERROR, + "BUG: Multirate codec with too many modes in config.\n"); + return -EINVAL; } if (num < 1) { - LOGP(DRR, LOGL_ERROR, "BUG: Using multirate codec with no " - "mode in config.\n"); - num = 1; + LOGP(DRR, LOGL_ERROR, + "BUG: Multirate codec with no mode in config.\n"); + return -EINVAL; } + /* Do not accept excess hysteresis or threshold values */ + for (i = 0; i < num_modes; i++) { + if (modes[i].threshold >= 64) { + LOGP(DRR, LOGL_ERROR, + "BUG: Multirate codec with excessive threshold values.\n"); + return -EINVAL; + } + if (modes[i].hysteresis >= 16) { + LOGP(DRR, LOGL_ERROR, + "BUG: Multirate codec with excessive hysteresis values.\n"); + return -EINVAL; + } + } + + /* Scan through the selected modes and find a matching threshold/ + * hysteresis value for that mode. */ + for (i = 0; i < 8; i++) { + if (((gsm48_ie[1] >> i) & 1)) { + mode_valid = false; + for (k = 0; k < num_modes; k++) { + if (modes[k].mode == i) { + mode_valid = true; + modes_selected[m] = &modes[k]; + m++; + } + } + if (!mode_valid) { + LOGP(DRR, LOGL_ERROR, + "BUG: Multirate codec with inconsistant config (no mode defined).\n"); + return -EINVAL; + } + } + } + OSMO_ASSERT(m <= 4); + + /* When the caller is not interested in any result, skip the actual + * composition of the IE (dry run) */ + if (!lv) + return 0; + + /* Compose output buffer */ lv[0] = (num == 1) ? 2 : (num + 2); - memcpy(lv + 1, mr->gsm48_ie, 2); + memcpy(lv + 1, gsm48_ie, 2); if (num == 1) return 0; - lv[3] = modes[0].threshold & 0x3f; - lv[4] = modes[0].hysteresis << 4; + lv[3] = modes_selected[0]->threshold & 0x3f; + lv[4] = modes_selected[0]->hysteresis << 4; if (num == 2) return 0; - lv[4] |= (modes[1].threshold & 0x3f) >> 2; - lv[5] = modes[1].threshold << 6; - lv[5] |= (modes[1].hysteresis & 0x0f) << 2; + lv[4] |= (modes_selected[1]->threshold & 0x3f) >> 2; + lv[5] = modes_selected[1]->threshold << 6; + lv[5] |= (modes_selected[1]->hysteresis & 0x0f) << 2; if (num == 3) return 0; - lv[5] |= (modes[2].threshold & 0x3f) >> 4; - lv[6] = modes[2].threshold << 4; - lv[6] |= modes[2].hysteresis & 0x0f; + lv[5] |= (modes_selected[2]->threshold & 0x3f) >> 4; + lv[6] = modes_selected[2]->threshold << 4; + lv[6] |= modes_selected[2]->hysteresis & 0x0f; return 0; } diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am index d790fc8..b207f8b 100644 --- a/tests/gsm0408/Makefile.am +++ b/tests/gsm0408/Makefile.am @@ -23,6 +23,7 @@ $(NULL) gsm0408_test_LDADD = \ + $(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \ $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(top_builddir)/src/osmo-bsc/gsm_timers.o \ diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index bc2777d..faeca39 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -35,6 +35,8 @@ #include #include +#include + #define COMPARE(result, op, value) \ if (!((result) op (value))) {\ fprintf(stderr, "Compare failed. Was %x should be %x in %s:%d\n",result, value, __FILE__, __LINE__); \ @@ -799,6 +801,106 @@ OSMO_ASSERT(pass); } +static void test_gsm48_multirate_config() +{ + uint8_t lv[7]; + struct gsm48_multi_rate_conf *gsm48_ie; + struct amr_multirate_conf mr; + int rc; + + memset(&mr, 0, sizeof(mr)); + + /* Use some made up threshold and hysteresis values */ + mr.ms_mode[0].threshold = 11; + mr.ms_mode[1].threshold = 12; + mr.ms_mode[2].threshold = 13; + mr.ms_mode[0].hysteresis = 15; + mr.ms_mode[1].hysteresis = 12; + mr.ms_mode[2].hysteresis = 8; + + gsm48_ie = (struct gsm48_multi_rate_conf *)&mr.gsm48_ie; + gsm48_ie->ver = 1; + gsm48_ie->m5_90 = 1; + gsm48_ie->m7_40 = 1; + gsm48_ie->m7_95 = 1; + gsm48_ie->m12_2 = 1; + + /* Test #1: Normal configuration with 4 active set members */ + mr.ms_mode[0].mode = 2; + mr.ms_mode[1].mode = 4; + mr.ms_mode[2].mode = 5; + mr.ms_mode[3].mode = 7; + rc = gsm48_multirate_config(lv, gsm48_ie, mr.ms_mode, 4); + OSMO_ASSERT(rc == 0); + printf("gsm48_multirate_config(): rc=%i, lv=%s\n", rc, + osmo_hexdump_nospc(lv, lv[0])); + + /* Test #2: 4 active set members, but wrong mode order: */ + mr.ms_mode[3].mode = 2; + mr.ms_mode[2].mode = 4; + mr.ms_mode[1].mode = 5; + mr.ms_mode[0].mode = 7; + rc = gsm48_multirate_config(lv, gsm48_ie, mr.ms_mode, 4); + OSMO_ASSERT(rc == -EINVAL); + + /* Test #3: Normal configuration with 3 active set members */ + mr.ms_mode[0].mode = 2; + mr.ms_mode[1].mode = 4; + mr.ms_mode[2].mode = 5; + mr.ms_mode[3].mode = 0; + gsm48_ie->m12_2 = 0; + mr.ms_mode[2].threshold = 0; + mr.ms_mode[2].hysteresis = 0; + + rc = gsm48_multirate_config(lv, gsm48_ie, mr.ms_mode, 3); + OSMO_ASSERT(rc == 0); + printf("gsm48_multirate_config(): rc=%i, lv=%s\n", rc, + osmo_hexdump_nospc(lv, lv[0])); + + /* Test #4: 3 active set members, but wrong mode order: */ + mr.ms_mode[0].mode = 2; + mr.ms_mode[2].mode = 4; + mr.ms_mode[1].mode = 5; + rc = gsm48_multirate_config(lv, gsm48_ie, mr.ms_mode, 3); + OSMO_ASSERT(rc == -EINVAL); + + /* Test #5: Normal configuration with 2 active set members */ + mr.ms_mode[0].mode = 2; + mr.ms_mode[1].mode = 4; + mr.ms_mode[2].mode = 0; + gsm48_ie->m7_95 = 0; + mr.ms_mode[1].threshold = 0; + mr.ms_mode[1].hysteresis = 0; + + rc = gsm48_multirate_config(lv, gsm48_ie, mr.ms_mode, 2); + OSMO_ASSERT(rc == 0); + printf("gsm48_multirate_config(): rc=%i, lv=%s\n", rc, + osmo_hexdump_nospc(lv, lv[0])); + + /* Test #6: 2 active set members, but wrong mode order: */ + mr.ms_mode[1].mode = 2; + mr.ms_mode[0].mode = 4; + rc = gsm48_multirate_config(lv, gsm48_ie, mr.ms_mode, 2); + OSMO_ASSERT(rc == -EINVAL); + + /* Test #7: Normal configuration with 1 active set member */ + mr.ms_mode[0].mode = 2; + mr.ms_mode[1].mode = 0; + gsm48_ie->m7_40 = 0; + mr.ms_mode[0].threshold = 0; + mr.ms_mode[0].hysteresis = 0; + + rc = gsm48_multirate_config(lv, gsm48_ie, mr.ms_mode, 1); + OSMO_ASSERT(rc == 0); + printf("gsm48_multirate_config(): rc=%i, lv=%s\n", rc, + osmo_hexdump_nospc(lv, lv[0])); + + /* Test #8: 0 active set members: */ + mr.ms_mode[0].mode = 0; + rc = gsm48_multirate_config(lv, gsm48_ie, mr.ms_mode, 1); + OSMO_ASSERT(rc == -EINVAL); +} + static const struct log_info_cat log_categories[] = { }; @@ -839,6 +941,8 @@ test_gsm48_ra_id_by_bts(); + test_gsm48_multirate_config(); + printf("Done.\n"); return EXIT_SUCCESS; @@ -854,3 +958,37 @@ } void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} + +void bsc_cm_update(struct gsm_subscriber_connection *conn, + const uint8_t *cm2, uint8_t cm2_len, + const uint8_t *cm3, uint8_t cm3_len) {} + +int rsl_siemens_mrpci(struct gsm_lchan *lchan, struct rsl_mrpci *mrpci) +{ return 0; } + +int rsl_chan_mode_modify_req(struct gsm_lchan *ts) { return 0; } + +int rsl_tx_ipacc_crcx(struct gsm_lchan *lchan) { return 0; } + +void gscon_submit_rsl_dtap(struct gsm_subscriber_connection *conn, + struct msgb *msg, int link_id, int allow_sacch) {} + +bool lchan_may_receive_data(struct gsm_lchan *lchan) { return true; } + +int bsc_compl_l3(struct gsm_subscriber_connection *conn, struct msgb *msg, + uint16_t chosen_channel) { return 0; } + +void bsc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, + struct msgb *msg) {} + +void bsc_cipher_mode_compl(struct gsm_subscriber_connection *conn, + struct msgb *msg, uint8_t chosen_encr) {} + +const char *bsc_subscr_name(struct bsc_subscr *bsub) { return NULL; } + +void lchan_release(struct gsm_lchan *lchan, bool sacch_deact, + bool err, enum gsm48_rr_cause cause_rr) {} + +int rsl_data_request(struct msgb *msg, uint8_t link_id) { return 0; } + +int rsl_encryption_cmd(struct msgb *msg) { return 0; } diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 7270721..9424167 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -226,4 +226,8 @@ test_gsm48_ra_id_by_bts[4]: digits='999999' lac=0xffff=htons(65535) rac=0xff=255 pass test_gsm48_ra_id_by_bts[5]: digits='09f909' lac=0xcdab=htons(43981) rac=0xab=171 pass test_gsm48_ra_id_by_bts[6]: digits='090990' lac=0xcdab=htons(43981) rac=0xab=171 pass +gsm48_multirate_config(): rc=0, lv=0620b40bf330 +gsm48_multirate_config(): rc=0, lv=0520340bf3 +gsm48_multirate_config(): rc=0, lv=0420140b +gsm48_multirate_config(): rc=0, lv=0220 Done. -- To view, visit https://gerrit.osmocom.org/11443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I06beb7dd7236c81c3a91af4d09c31891f4b910a4 Gerrit-Change-Number: 11443 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 16:02:50 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 23 Oct 2018 16:02:50 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: check amr mode parameters Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11444 Change subject: bsc_vty: check amr mode parameters ...................................................................... bsc_vty: check amr mode parameters The vty already has a well working interface to configure the AMR mode, threshold and hysteresis parameters. However there are no checks yet to prevent against misconfiguration. - Use gsm48_multirate_config() to perform a global check of the overall configuration - Add check AMR modes during input (order, duplicates) Change-Id: I8b9f69b89a39bbf4800d9790f7abe43ce66aeb71 Related: OS#3529 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 107 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/44/11444/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index f156cc8..dd540c1 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -3511,11 +3511,45 @@ struct gsm48_multi_rate_conf *mr_conf = (struct gsm48_multi_rate_conf *) mr->gsm48_ie; int i; + int mode; + int mode_prev = -1; + /* Check if mode parameters are in order */ + for (i = 0; i < argc; i++) { + mode = atoi(argv[i]); + if (mode_prev > mode) { + vty_out(vty, "Modes must be listed in order%s", + VTY_NEWLINE); + return; + } + + if (mode_prev == mode) { + vty_out(vty, "Modes must be unique %s", VTY_NEWLINE); + return; + } + mode_prev = mode; + } + + /* Prepare the multirate configuration IE */ mr->gsm48_ie[1] = 0; for (i = 0; i < argc; i++) mr->gsm48_ie[1] |= 1 << atoi(argv[i]); mr_conf->icmi = 0; + + /* Store actual mode identifier values */ + for (i = 0; i < argc; i++) { + mr->ms_mode[i].mode = atoi(argv[i]); + mr->bts_mode[i].mode = atoi(argv[i]); + } + mr->num_modes = argc; + + /* Trim excess threshold and hysteresis values from previous config */ + for (i = argc - 1; i < 4; i++) { + mr->ms_mode[i].threshold = 0; + mr->bts_mode[i].threshold = 0; + mr->ms_mode[i].hysteresis = 0; + mr->bts_mode[i].hysteresis = 0; + } } static void get_amr_th_from_arg(struct vty *vty, int argc, const char *argv[], int full) @@ -3567,6 +3601,55 @@ } } +/* Give the current amr configuration a final consistency chack by feeding the + * the configuration into the gsm48 multirate IE generator function */ +static int check_amr_config(struct vty *vty) +{ + int rc = 0; + struct amr_multirate_conf *mr; + const struct gsm48_multi_rate_conf *mr_conf; + struct gsm_bts *bts = vty->index; + int vty_rc = CMD_SUCCESS; + + mr = &bts->mr_full; + mr_conf = (struct gsm48_multi_rate_conf*) mr->gsm48_ie; + rc = gsm48_multirate_config(NULL, mr_conf, mr->ms_mode, mr->num_modes); + if (rc != 0) { + vty_out(vty, + "Invalid AMR multirate configuration (tch-f, ms) - check parameters%s", + VTY_NEWLINE); + vty_rc = CMD_WARNING; + } + + rc = gsm48_multirate_config(NULL, mr_conf, mr->bts_mode, mr->num_modes); + if (rc != 0) { + vty_out(vty, + "Invalid AMR multirate configuration (tch-f, bts) - check parameters%s", + VTY_NEWLINE); + vty_rc = CMD_WARNING; + } + + mr = &bts->mr_half; + mr_conf = (struct gsm48_multi_rate_conf*) mr->gsm48_ie; + rc = gsm48_multirate_config(NULL, mr_conf, mr->ms_mode, mr->num_modes); + if (rc != 0) { + vty_out(vty, + "Invalid AMR multirate configuration (tch-h, ms) - check parameters%s", + VTY_NEWLINE); + vty_rc = CMD_WARNING; + } + + rc = gsm48_multirate_config(NULL, mr_conf, mr->bts_mode, mr->num_modes); + if (rc != 0) { + vty_out(vty, + "Invalid AMR multirate configuration (tch-h, bts) - check parameters%s", + VTY_NEWLINE); + vty_rc = CMD_WARNING; + } + + return vty_rc; +} + #define AMR_TCHF_PAR_STR " (0|1|2|3|4|5|6|7)" #define AMR_TCHF_HELP_STR "4,75k\n5,15k\n5,90k\n6,70k\n7,40k\n7,95k\n" \ "10,2k\n12,2k\n" @@ -3583,7 +3666,7 @@ AMR_TCHF_HELP_STR) { get_amr_from_arg(vty, 1, argv, 1); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_fr_modes2, cfg_bts_amr_fr_modes2_cmd, @@ -3592,7 +3675,7 @@ AMR_TCHF_HELP_STR AMR_TCHF_HELP_STR) { get_amr_from_arg(vty, 2, argv, 1); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_fr_modes3, cfg_bts_amr_fr_modes3_cmd, @@ -3601,7 +3684,7 @@ AMR_TCHF_HELP_STR AMR_TCHF_HELP_STR AMR_TCHF_HELP_STR) { get_amr_from_arg(vty, 3, argv, 1); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_fr_modes4, cfg_bts_amr_fr_modes4_cmd, @@ -3610,7 +3693,7 @@ AMR_TCHF_HELP_STR AMR_TCHF_HELP_STR AMR_TCHF_HELP_STR AMR_TCHF_HELP_STR) { get_amr_from_arg(vty, 4, argv, 1); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_fr_start_mode, cfg_bts_amr_fr_start_mode_cmd, @@ -3618,7 +3701,7 @@ AMR_TEXT "Full Rate\n" AMR_START_TEXT) { get_amr_start_from_arg(vty, argv, 1); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_fr_thres1, cfg_bts_amr_fr_thres1_cmd, @@ -3627,7 +3710,7 @@ AMR_TH_HELP_STR) { get_amr_th_from_arg(vty, 2, argv, 1); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_fr_thres2, cfg_bts_amr_fr_thres2_cmd, @@ -3636,7 +3719,7 @@ AMR_TH_HELP_STR AMR_TH_HELP_STR) { get_amr_th_from_arg(vty, 3, argv, 1); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_fr_thres3, cfg_bts_amr_fr_thres3_cmd, @@ -3645,7 +3728,7 @@ AMR_TH_HELP_STR AMR_TH_HELP_STR AMR_TH_HELP_STR) { get_amr_th_from_arg(vty, 4, argv, 1); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_fr_hyst1, cfg_bts_amr_fr_hyst1_cmd, @@ -3654,7 +3737,7 @@ AMR_HY_HELP_STR) { get_amr_hy_from_arg(vty, 2, argv, 1); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_fr_hyst2, cfg_bts_amr_fr_hyst2_cmd, @@ -3672,7 +3755,7 @@ AMR_HY_HELP_STR AMR_HY_HELP_STR AMR_HY_HELP_STR) { get_amr_hy_from_arg(vty, 4, argv, 1); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_modes1, cfg_bts_amr_hr_modes1_cmd, @@ -3681,7 +3764,7 @@ AMR_TCHH_HELP_STR) { get_amr_from_arg(vty, 1, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_modes2, cfg_bts_amr_hr_modes2_cmd, @@ -3690,7 +3773,7 @@ AMR_TCHH_HELP_STR AMR_TCHH_HELP_STR) { get_amr_from_arg(vty, 2, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_modes3, cfg_bts_amr_hr_modes3_cmd, @@ -3699,7 +3782,7 @@ AMR_TCHH_HELP_STR AMR_TCHH_HELP_STR AMR_TCHH_HELP_STR) { get_amr_from_arg(vty, 3, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_modes4, cfg_bts_amr_hr_modes4_cmd, @@ -3708,7 +3791,7 @@ AMR_TCHH_HELP_STR AMR_TCHH_HELP_STR AMR_TCHH_HELP_STR AMR_TCHH_HELP_STR) { get_amr_from_arg(vty, 4, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_start_mode, cfg_bts_amr_hr_start_mode_cmd, @@ -3716,7 +3799,7 @@ AMR_TEXT "Half Rate\n" AMR_START_TEXT) { get_amr_start_from_arg(vty, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_thres1, cfg_bts_amr_hr_thres1_cmd, @@ -3725,7 +3808,7 @@ AMR_TH_HELP_STR) { get_amr_th_from_arg(vty, 2, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_thres2, cfg_bts_amr_hr_thres2_cmd, @@ -3734,7 +3817,7 @@ AMR_TH_HELP_STR AMR_TH_HELP_STR) { get_amr_th_from_arg(vty, 3, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_thres3, cfg_bts_amr_hr_thres3_cmd, @@ -3743,7 +3826,7 @@ AMR_TH_HELP_STR AMR_TH_HELP_STR AMR_TH_HELP_STR) { get_amr_th_from_arg(vty, 4, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_hyst1, cfg_bts_amr_hr_hyst1_cmd, @@ -3752,7 +3835,7 @@ AMR_HY_HELP_STR) { get_amr_hy_from_arg(vty, 2, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_hyst2, cfg_bts_amr_hr_hyst2_cmd, @@ -3761,7 +3844,7 @@ AMR_HY_HELP_STR AMR_HY_HELP_STR) { get_amr_hy_from_arg(vty, 3, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_hyst3, cfg_bts_amr_hr_hyst3_cmd, @@ -3770,7 +3853,7 @@ AMR_HY_HELP_STR AMR_HY_HELP_STR AMR_HY_HELP_STR) { get_amr_hy_from_arg(vty, 4, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } #define TRX_TEXT "Radio Transceiver\n" @@ -4391,11 +4474,12 @@ mr.ms_mode[0].mode = amr_mode; mr.bts_mode[0].mode = amr_mode; + mr.num_modes = 1; /* encode this configuration into the lchan for both uplink and * downlink direction */ - gsm48_multirate_config(lchan->mr_ms_lv, &mr, mr.ms_mode); - gsm48_multirate_config(lchan->mr_bts_lv, &mr, mr.bts_mode); + gsm48_multirate_config(lchan->mr_ms_lv, mr_conf, mr.ms_mode, mr.num_modes); + gsm48_multirate_config(lchan->mr_bts_lv, mr_conf, mr.bts_mode, mr.num_modes); return 0; } -- To view, visit https://gerrit.osmocom.org/11444 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8b9f69b89a39bbf4800d9790f7abe43ce66aeb71 Gerrit-Change-Number: 11444 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 16:02:51 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 23 Oct 2018 16:02:51 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: generate proper multirate configuration IE on RSL Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11445 Change subject: lchan_fsm: generate proper multirate configuration IE on RSL ...................................................................... lchan_fsm: generate proper multirate configuration IE on RSL During the generation of the multirate configuration IE in the channel activation message that is sent over RSL, all AMR rates except the highest one are trimmed. This was to ensure that the multirate configuration IE only contains one codec rate per active set. Lets fix that and generate a proper IE with threshold and hysteresis values. - extend lchan_mr_config so that it can generate a full multirate configuration IE Change-Id: I7f9f8e8d9e2724cbe3ce2f3599bc0e5185fd8453 Related: OS#3529 --- M src/osmo-bsc/lchan_fsm.c M tests/handover/handover_test.c 2 files changed, 72 insertions(+), 58 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/45/11445/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 39edaff..915b62a 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -36,6 +36,8 @@ #include #include #include +#include + static struct osmo_fsm lchan_fsm; @@ -402,66 +404,71 @@ osmo_fsm_inst_dispatch(lchan->ts->fi, TS_EV_LCHAN_UNUSED, lchan); } -/*! Configure the multirate setting on this channel. */ -void lchan_mr_config(struct gsm_lchan *lchan, struct gsm48_multi_rate_conf *mr_conf) +/* Configure the multirate setting on this channel. */ +static int lchan_mr_config(struct gsm_lchan *lchan, const struct gsm48_multi_rate_conf *mr_conf) { - struct gsm48_multi_rate_conf *ms_conf, *bts_conf; bool full_rate = (lchan->type == GSM_LCHAN_TCH_F); + struct gsm_bts *bts = lchan->ts->trx->bts; + struct bsc_msc_data *msc = lchan->conn->sccp.msc; + struct amr_multirate_conf *mr; + int rc; + int rc_rate; + struct gsm48_multi_rate_conf mr_conf_filtered; + const struct gsm48_multi_rate_conf *mr_conf_bts; - /* initialize the data structure */ - lchan->mr_ms_lv[0] = sizeof(*ms_conf); - lchan->mr_bts_lv[0] = sizeof(*bts_conf); - ms_conf = (struct gsm48_multi_rate_conf *) &lchan->mr_ms_lv[1]; - bts_conf = (struct gsm48_multi_rate_conf *) &lchan->mr_bts_lv[1]; + /* There are two different active sets, depending on the channel rate, + * make sure the appropate one is selected. */ + if (full_rate) + mr = &bts->mr_full; + else + mr = &bts->mr_half; - *ms_conf = *bts_conf = (struct gsm48_multi_rate_conf){ - .ver = 1, - .icmi = 1, - .m4_75 = mr_conf->m4_75, - .m5_15 = mr_conf->m5_15, - .m5_90 = mr_conf->m5_90, - .m6_70 = mr_conf->m6_70, - .m7_40 = mr_conf->m7_40, - .m7_95 = mr_conf->m7_95, - .m10_2 = full_rate? mr_conf->m10_2 : 0, - .m12_2 = full_rate? mr_conf->m12_2 : 0, - }; -} - -/* Mask all rates instead of the highest possible */ -static void lchan_mr_config_mask(struct gsm48_multi_rate_conf *mr_conf) -{ - unsigned int i; - bool highest_seen = false; - uint8_t *_mr_conf = (uint8_t *) mr_conf; - - /* FIXME: At the moment we can not support multiple codec rates in one - * struct gsm48_multi_rate_conf, because the struct lacks the fields - * for Threshold and Hysteresis. Those fields are not needed when only - * a single codec rate is in place, but as soon as multiple codec - * rates are used the parameters are mandatory. The layout for the - * struct would then also be different because each rate needs its - * own Threshold and Hysteresis value. (See also 3GPP TS 04.08, - * chapter 10.5.2.21aa MultiRate configuration). - * - * Since we are unable to signal multiple codec rates properly, we just - * remove all codec rates from the active set, except the highest - * possible. Doing so we lack the functionality to switch towards the - * other, lower codec rates that were offered by the MSC, but it is - * still guaranteed that a rate is selected that is supported by all - * entities. - * - * To fix this problem, we should implement a proper encoder for - * struct gsm48_multi_rate_conf, in libosmocore and use it here. - * struct amr_mode already seems to have members for threshold and - * hysteresis we can use. */ - - for (i = 7; i > 0; i--) { - if (_mr_conf[1] & (1 << i) && highest_seen == false) { - highest_seen = true; - } else if (highest_seen) - _mr_conf[1] &= ~(1 << i); + /* The VTY allows to forbid certain codec rates. Unfortunately we can + * not articulate all of the prohibitions on through S0-S15 on the A + * interface. To ensure that the VTY settings are observed we create + * a manipulated copy of the mr_conf that ensures forbidden codec rates + * are not used in the multirate configuration IE. */ + rc_rate = calc_amr_rate_intersection(&mr_conf_filtered, &msc->amr_conf, mr_conf); + if (rc_rate < 0) { + LOG_LCHAN(lchan, LOGL_ERROR, + "can not encode multirate configuration (invalid amr rate setting, MSC)\n"); + return -EINVAL; } + + /* The two last codec rates which are defined for AMR do only work with + * full rate channels. We will pinch off those rates f?r half-rate + * channels to ensure they are not included accidently. */ + if (!full_rate) { + if (mr_conf_filtered.m10_2 || mr_conf_filtered.m12_2) + LOG_LCHAN(lchan, LOGL_ERROR, "ignoring unsupported amr codec rates\n"); + mr_conf_filtered.m10_2 = 0; + mr_conf_filtered.m12_2 = 0; + } + + /* Ensure that the resulting filtered conf is coherent with the + * configuration that is set for the BTS and the specified rate */ + mr_conf_bts = (struct gsm48_multi_rate_conf *)mr->gsm48_ie; + rc_rate = calc_amr_rate_intersection(&mr_conf_filtered, mr_conf_bts, &mr_conf_filtered); + if (rc_rate < 0) { + LOG_LCHAN(lchan, LOGL_ERROR, + "can not encode multirate configuration (invalid amr rate setting, BTS)\n"); + return -EINVAL; + } + + /* Proceed with the generation of the multirate configuration IE + * (MS and BTS) */ + rc = gsm48_multirate_config(lchan->mr_ms_lv, &mr_conf_filtered, mr->ms_mode, mr->num_modes); + if (rc != 0) { + LOG_LCHAN(lchan, LOGL_ERROR, "can not encode multirate configuration (MS)\n"); + return -EINVAL; + } + rc = gsm48_multirate_config(lchan->mr_bts_lv, &mr_conf_filtered, mr->bts_mode, mr->num_modes); + if (rc != 0) { + LOG_LCHAN(lchan, LOGL_ERROR, "can not encode multirate configuration (BTS)\n"); + return -EINVAL; + } + + return 0; } static void lchan_fsm_unused(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -511,9 +518,10 @@ if (info->chan_mode == GSM48_CMODE_SPEECH_AMR) { gsm48_mr_cfg_from_gsm0808_sc_cfg(&mr_conf, info->s15_s0); - /* FIXME: See above. */ - lchan_mr_config_mask(&mr_conf); - lchan_mr_config(lchan, &mr_conf); + if (lchan_mr_config(lchan, &mr_conf) < 0) { + lchan_fail("Can not generate multirate configuration IE\n"); + return; + } } switch (info->chan_mode) { diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 76e5fe1..7cb4086 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -224,6 +224,12 @@ struct gsm_network *net = lchan->ts->trx->bts->network; struct gsm_subscriber_connection *conn; struct mgcp_client *fake_mgcp_client = (void*)talloc_zero(net, int); + uint8_t *amr_conf; + + /* HACK: lchan_fsm.c requires some AMR codec rates to be enabled, + * lets pretend that all AMR codec rates are allowed */ + amr_conf = (uint8_t*) &fake_msc_data.amr_conf; + amr_conf[1] = 0xff; conn = bsc_subscr_con_allocate(net); -- To view, visit https://gerrit.osmocom.org/11445 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7f9f8e8d9e2724cbe3ce2f3599bc0e5185fd8453 Gerrit-Change-Number: 11445 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 16:09:35 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 23 Oct 2018 16:09:35 +0000 Subject: Change in osmo-mgw[master]: use a dynamic name for rtp connection rate counters In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11439 ) Change subject: use a dynamic name for rtp connection rate counters ...................................................................... Patch Set 1: Code-Review+1 > Build Successful > > https://jenkins.osmocom.org/jenkins/job/gerrit-osmo-mgw/462/ : > SUCCESS' --verified 1 --code-review 0 -- To view, visit https://gerrit.osmocom.org/11439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I027644f4b913e1f966c11b081e9027e61591a224 Gerrit-Change-Number: 11439 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 23 Oct 2018 16:09:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 16:21:25 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 23 Oct 2018 16:21:25 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08: improve gsm48_multirate_config() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11443 to look at the new patch set (#2). Change subject: gsm_04_08: improve gsm48_multirate_config() ...................................................................... gsm_04_08: improve gsm48_multirate_config() The function gsm48_multirate_config() generates the multirate configuration IE, that is sent via RSL to configure the active set of AMR codecs inside the BTS. The function already works, but it does not check the input data for consistancy. Lets add some consistancy check to make sure that inconsistant parameters are rejected. Also allow the output pointer to be NULL, so that the function can be used to perform a dry run to be able to verify parameters. - Check for invalid / inconsistant configuration parameters - Perform a dry-run when lv pointer is set to NULL Change-Id: I06beb7dd7236c81c3a91af4d09c31891f4b910a4 Related: OS#3529 --- M include/osmocom/bsc/gsm_04_08_rr.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/gsm_04_08_rr.c M tests/gsm0408/Makefile.am M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 6 files changed, 237 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/43/11443/2 -- To view, visit https://gerrit.osmocom.org/11443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I06beb7dd7236c81c3a91af4d09c31891f4b910a4 Gerrit-Change-Number: 11443 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 16:21:25 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 23 Oct 2018 16:21:25 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: generate proper multirate configuration IE on RSL In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11445 to look at the new patch set (#2). Change subject: lchan_fsm: generate proper multirate configuration IE on RSL ...................................................................... lchan_fsm: generate proper multirate configuration IE on RSL During the generation of the multirate configuration IE in the channel activation message that is sent over RSL, all AMR rates except the highest one are trimmed. This was to ensure that the multirate configuration IE only contains one codec rate per active set. Lets fix that and generate a proper IE with threshold and hysteresis values. - extend lchan_mr_config so that it can generate a full multirate configuration IE Change-Id: I7f9f8e8d9e2724cbe3ce2f3599bc0e5185fd8453 Related: OS#3529 --- M src/osmo-bsc/lchan_fsm.c M tests/handover/handover_test.c 2 files changed, 72 insertions(+), 58 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/45/11445/2 -- To view, visit https://gerrit.osmocom.org/11445 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7f9f8e8d9e2724cbe3ce2f3599bc0e5185fd8453 Gerrit-Change-Number: 11445 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 16:31:55 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 23 Oct 2018 16:31:55 +0000 Subject: Change in osmocom-bb[master]: mobile: display MS IMSI in vty In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11440 ) Change subject: mobile: display MS IMSI in vty ...................................................................... Patch Set 1: Code-Review-1 I think it can be obtained using 'subscriber' command, why do we need to duplicate? -- To view, visit https://gerrit.osmocom.org/11440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id05f4f5f3416dcdb9ce2fd24f9360f5e6faaf654 Gerrit-Change-Number: 11440 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 23 Oct 2018 16:31:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 16:33:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 23 Oct 2018 16:33:24 +0000 Subject: Change in osmocom-bb[master]: mobile: display MS IMSI in vty In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11440 ) Change subject: mobile: display MS IMSI in vty ...................................................................... Patch Set 1: Code-Review-1 also, why only print the IMSI if it's an emulaed SIM, but not with a real hardware SIM? That's just wrong. -- To view, visit https://gerrit.osmocom.org/11440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id05f4f5f3416dcdb9ce2fd24f9360f5e6faaf654 Gerrit-Change-Number: 11440 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 23 Oct 2018 16:33:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 16:52:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 23 Oct 2018 16:52:43 +0000 Subject: Change in osmo-bsc[master]: gsm_data: set meaningful default values for amr modes In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11441 ) Change subject: gsm_data: set meaningful default values for amr modes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If14843feeeea6584e5991d5c0abb765611dfaa57 Gerrit-Change-Number: 11441 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 23 Oct 2018 16:52:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 16:54:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 23 Oct 2018 16:54:07 +0000 Subject: Change in osmo-bsc[master]: codec_pref: also check amr codec rates in check_codec_pref() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11442 ) Change subject: codec_pref: also check amr codec rates in check_codec_pref() ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11442/1/src/osmo-bsc/codec_pref.c File src/osmo-bsc/codec_pref.c: https://gerrit.osmocom.org/#/c/11442/1/src/osmo-bsc/codec_pref.c at 462 PS1, Line 462: tch-f tch-h? -- To view, visit https://gerrit.osmocom.org/11442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3537d1c89e2520d35cc0e150ba8e6d3693e06710 Gerrit-Change-Number: 11442 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 23 Oct 2018 16:54:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 17:29:47 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 23 Oct 2018 17:29:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RSL_Emulation: handle ASP_IPA_EVENT_DOWN In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11429 ) Change subject: RSL_Emulation: handle ASP_IPA_EVENT_DOWN ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11429/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11429/2//COMMIT_MSG at 9 PS2, Line 9: Otherwise RSL layer fails this way when this event is received: > Why are we expecting the RSL layer to ever receive an ASP_IPA_EVENT_DOWN? I agree the message is a [?] I spoke with pespin and we basically concluded, that this seems to be another issue due to high load. The BTS did not receive the clock from osmo-trx (or what's driving osmo-bts in the test). ?[19:21:15] ?pespin?: Wed Oct 17 07:22:32 2018 DOML <0001> bts.c:239 Shutting down BTS 0, Reason No clock from osmo-trx So failing explicitly in these cases seems the better idea. For an explicit failure you should call "all component.stop" after the setverdict(fail) so that we don't run into any dynamic testcase errors due to unconnected ports that get messages. ? BTS_Tests has an f_shutdown function which does that exactly and should probably be moved to a common place since this should just be callable from about anywhere. -- To view, visit https://gerrit.osmocom.org/11429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idc6565c9de72d98015d56a41e5616c46051c8a8d Gerrit-Change-Number: 11429 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 23 Oct 2018 17:29:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 17:51:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 23 Oct 2018 17:51:26 +0000 Subject: Change in osmo-bts[master]: bts-trx: Try decoding received UL bursts when SACCH frame detected as... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11446 Change subject: bts-trx: Try decoding received UL bursts when SACCH frame detected as lost ...................................................................... bts-trx: Try decoding received UL bursts when SACCH frame detected as lost This way if for instance only 1 out of 3 bursts was lost, reported ul mesuarement is more similar to expected values. Related: OS#3665 Change-Id: I910277df181df5082b234c1c97a75eebdffc2cb5 --- M src/osmo-bts-trx/scheduler_trx.c 1 file changed, 61 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/46/11446/1 diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index fa3aed2..332a41d 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -65,6 +65,61 @@ return 10000 * n_errors / n_bits_total; } +static void reset_ul_bursts(struct l1sched_chan_state *chan_state, uint32_t first_fn) +{ + if (chan_state->ul_bursts) + memset(chan_state->ul_bursts, 0, 464); + chan_state->ul_mask = 0x0; + chan_state->ul_first_fn = first_fn; + chan_state->rssi_sum = 0; + chan_state->rssi_num = 0; + chan_state->toa256_sum = 0; + chan_state->toa_num = 0; +} + +static int _submit_ph_data_ind_with_ul_meas_res(struct l1sched_trx *l1t, uint8_t tn, + uint32_t fn, enum trx_chan_type chan, + struct l1sched_chan_state *chan_state) +{ + uint8_t l2[GSM_MACBLOCK_LEN], l2_len; + int n_errors, n_bits_total; + uint16_t ber10k; + float rssi; + int16_t toa256; + int rc; + struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn); + + /* empty mask -> empty buffer, no need to decode buffer (buffer may not even be allocated) */ + if (chan_state->ul_mask == 0x0) { + l1if_process_meas_res(l1t->trx, tn, fn, trx_chan_desc[chan].chan_nr | tn, + 456, 456, -110, 0); + ber10k = compute_ber10k(0, 456); + return _sched_compose_ph_data_ind(l1t, tn, 0, chan, NULL, 0, + -110, 0, 0, ber10k, + PRES_INFO_INVALID); + } + + /* Once processed, erase mask so they are not used again, also invalidating ul_first_fn */ + chan_state->ul_mask = 0x0; + rssi = chan_state->rssi_sum / chan_state->rssi_num; + toa256 = chan_state->toa256_sum / chan_state->toa_num; + /* decode */ + rc = gsm0503_xcch_decode(l2, chan_state->ul_bursts, &n_errors, &n_bits_total); + if (rc) { + LOGL1S(DL1P, LOGL_NOTICE, l1t, tn, chan, fn, "Received bad data (%u/%u)\n", + chan_state->ul_first_fn, chan_state->ul_first_fn % l1ts->mf_period); + l2_len = 0; + } else + l2_len = GSM_MACBLOCK_LEN; + + /* Send uplink measurement information to L2 */ + l1if_process_meas_res(l1t->trx, tn, chan_state->ul_first_fn, trx_chan_desc[chan].chan_nr | tn, + n_errors, n_bits_total, rssi, toa256); + ber10k = compute_ber10k(n_bits_total, n_errors); + return _sched_compose_ph_data_ind(l1t, tn, chan_state->ul_first_fn, chan, l2, l2_len, + rssi, 4 * toa256, 0, ber10k, PRES_INFO_UNKNOWN); +} + /* * TX on downlink */ @@ -194,16 +249,9 @@ if (L1SAP_IS_LINK_SACCH(trx_chan_desc[chan].link_id)) { /* count and send BFI */ if (++(l1ts->chan_state[chan].lost_frames) > 1) { - /* TODO: Should we pass old TOA here? Otherwise we risk - * unnecessary decreasing TA */ - - /* Send uplink measurement information to L2 */ - l1if_process_meas_res(l1t->trx, tn, fn, trx_chan_desc[chan].chan_nr | tn, - 456, 456, -110, 0); - /* FIXME: use actual values for BER etc */ - _sched_compose_ph_data_ind(l1t, tn, 0, chan, NULL, 0, - -110, 0, 0, 10000, - PRES_INFO_INVALID); + _submit_ph_data_ind_with_ul_meas_res(l1t, tn, fn, chan, &l1ts->chan_state[chan]); + /* Don't keep re-sending same meas result cached over and over */ + reset_ul_bursts(&l1ts->chan_state[chan], fn); } } @@ -767,10 +815,6 @@ uint8_t *rssi_num = &chan_state->rssi_num; int32_t *toa256_sum = &chan_state->toa256_sum; uint8_t *toa_num = &chan_state->toa_num; - uint8_t l2[GSM_MACBLOCK_LEN], l2_len; - int n_errors, n_bits_total; - uint16_t ber10k; - int rc; /* handle RACH, if handover RACH detection is turned on */ if (chan_state->ho_rach_detect == 1) @@ -786,15 +830,8 @@ } /* clear burst & store frame number of first burst */ - if (bid == 0) { - memset(*bursts_p, 0, 464); - *mask = 0x0; - *first_fn = fn; - *rssi_sum = 0; - *rssi_num = 0; - *toa256_sum = 0; - *toa_num = 0; - } + if (bid == 0) + reset_ul_bursts(chan_state, fn); /* update mask + RSSI */ *mask |= (1 << bid); @@ -829,25 +866,8 @@ return 0; } } - *mask = 0x0; - /* decode */ - rc = gsm0503_xcch_decode(l2, *bursts_p, &n_errors, &n_bits_total); - if (rc) { - LOGL1S(DL1P, LOGL_NOTICE, l1t, tn, chan, fn, "Received bad data (%u/%u)\n", - *first_fn, (*first_fn) % l1ts->mf_period); - l2_len = 0; - } else - l2_len = GSM_MACBLOCK_LEN; - - /* Send uplink measurement information to L2 */ - l1if_process_meas_res(l1t->trx, tn, *first_fn, trx_chan_desc[chan].chan_nr | tn, - n_errors, n_bits_total, *rssi_sum / *rssi_num, *toa256_sum / *toa_num); - ber10k = compute_ber10k(n_bits_total, n_errors); - return _sched_compose_ph_data_ind(l1t, tn, *first_fn, chan, l2, l2_len, - *rssi_sum / *rssi_num, - 4 * (*toa256_sum) / *toa_num, 0, ber10k, - PRES_INFO_UNKNOWN); + return _submit_ph_data_ind_with_ul_meas_res(l1t, tn, fn, chan, chan_state); } /*! \brief a single PDTCH burst was received by the PHY, process it */ -- To view, visit https://gerrit.osmocom.org/11446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I910277df181df5082b234c1c97a75eebdffc2cb5 Gerrit-Change-Number: 11446 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 18:01:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 23 Oct 2018 18:01:45 +0000 Subject: Change in osmo-bts[master]: bts-trx: Try decoding received UL bursts when SACCH frame detected as... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11446 ) Change subject: bts-trx: Try decoding received UL bursts when SACCH frame detected as lost ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I910277df181df5082b234c1c97a75eebdffc2cb5 Gerrit-Change-Number: 11446 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 23 Oct 2018 18:01:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 18:19:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 23 Oct 2018 18:19:48 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: check amr mode parameters In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11444 ) Change subject: bsc_vty: check amr mode parameters ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11444 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8b9f69b89a39bbf4800d9790f7abe43ce66aeb71 Gerrit-Change-Number: 11444 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 23 Oct 2018 18:19:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 18:21:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 23 Oct 2018 18:21:30 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08: improve gsm48_multirate_config() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11443 ) Change subject: gsm_04_08: improve gsm48_multirate_config() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I06beb7dd7236c81c3a91af4d09c31891f4b910a4 Gerrit-Change-Number: 11443 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 23 Oct 2018 18:21:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 18:22:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 23 Oct 2018 18:22:36 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: generate proper multirate configuration IE on RSL In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11445 ) Change subject: lchan_fsm: generate proper multirate configuration IE on RSL ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11445 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7f9f8e8d9e2724cbe3ce2f3599bc0e5185fd8453 Gerrit-Change-Number: 11445 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 23 Oct 2018 18:22:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 18:23:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 23 Oct 2018 18:23:31 +0000 Subject: Change in osmo-bsc[master]: codec_pref: also check amr codec rates in check_codec_pref() In-Reply-To: References: Message-ID: Harald Welte has uploaded a new patch set (#2) to the change originally created by dexter. ( https://gerrit.osmocom.org/11442 ) Change subject: codec_pref: also check amr codec rates in check_codec_pref() ...................................................................... codec_pref: also check amr codec rates in check_codec_pref() The function check_codec_pref() currently only does a basic check over the general codec configuration of bts and msc. However, it does not yet check if the amr codec rate settings for the BTSs contradict the allowed/forbidden amr codec rates of the MSC. When the two settings do contradict AMR would not work, even when everything else is correctly configured. We need to check this on startup to spot configuration problems quickly. - Add function to calculate intersections of struct gsm48_multi_rate_conf variables. - Calculate the intersection between the multi rate config of each BTS with the one of the MSC Change-Id: I3537d1c89e2520d35cc0e150ba8e6d3693e06710 Related: OS#3529 --- M include/osmocom/bsc/codec_pref.h M src/osmo-bsc/codec_pref.c 2 files changed, 53 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/42/11442/2 -- To view, visit https://gerrit.osmocom.org/11442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3537d1c89e2520d35cc0e150ba8e6d3693e06710 Gerrit-Change-Number: 11442 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 18:23:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 23 Oct 2018 18:23:54 +0000 Subject: Change in osmo-bsc[master]: gsm_data: set meaningful default values for amr modes In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11441 ) Change subject: gsm_data: set meaningful default values for amr modes ...................................................................... gsm_data: set meaningful default values for amr modes The function gsm_bts_alloc() does set default values for the amr rates for a newly allocated bts, but it does not populate the ms_mode and bts_mode flags which contain hysteresis and threshold. Those values are currently set to 0 by default, which does not make much sense. Lets popluate some appropriate default values. - Make sure that .mode .hysteresis and .threshold are populated for MS and BTS in full and halfrate Change-Id: If14843feeeea6584e5991d5c0abb765611dfaa57 Related: OS#3529 --- M src/osmo-bsc/gsm_data.c 1 file changed, 30 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 8d0b831..08d5bcb 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -900,6 +900,21 @@ .m12_2 = 1 }; memcpy(bts->mr_full.gsm48_ie, &mr_cfg, sizeof(bts->mr_full.gsm48_ie)); + bts->mr_full.ms_mode[0].mode = 1; + bts->mr_full.ms_mode[1].mode = 2; + bts->mr_full.ms_mode[2].mode = 6; + bts->mr_full.ms_mode[3].mode = 7; + bts->mr_full.bts_mode[0].mode = 1; + bts->mr_full.bts_mode[1].mode = 2; + bts->mr_full.bts_mode[2].mode = 6; + bts->mr_full.bts_mode[3].mode = 7; + for (i = 0; i < 3; i++) { + bts->mr_full.ms_mode[i].hysteresis = 8; + bts->mr_full.ms_mode[i].threshold = 32; + bts->mr_full.bts_mode[i].hysteresis = 8; + bts->mr_full.bts_mode[i].threshold = 32; + } + bts->mr_full.num_modes = 4; mr_cfg = (struct gsm48_multi_rate_conf) { .m4_75 = 0, @@ -912,6 +927,21 @@ .m12_2 = 0 }; memcpy(bts->mr_half.gsm48_ie, &mr_cfg, sizeof(bts->mr_half.gsm48_ie)); + bts->mr_half.ms_mode[0].mode = 1; + bts->mr_half.ms_mode[1].mode = 2; + bts->mr_half.ms_mode[2].mode = 4; + bts->mr_half.ms_mode[3].mode = 5; + bts->mr_half.bts_mode[0].mode = 1; + bts->mr_half.bts_mode[1].mode = 2; + bts->mr_half.bts_mode[2].mode = 4; + bts->mr_half.bts_mode[3].mode = 5; + for (i = 0; i < 3; i++) { + bts->mr_half.ms_mode[i].hysteresis = 8; + bts->mr_half.ms_mode[i].threshold = 32; + bts->mr_half.bts_mode[i].hysteresis = 8; + bts->mr_half.bts_mode[i].threshold = 32; + } + bts->mr_half.num_modes = 4; return bts; } -- To view, visit https://gerrit.osmocom.org/11441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If14843feeeea6584e5991d5c0abb765611dfaa57 Gerrit-Change-Number: 11441 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 18:24:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 23 Oct 2018 18:24:00 +0000 Subject: Change in osmo-bsc[master]: codec_pref: also check amr codec rates in check_codec_pref() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11442 ) Change subject: codec_pref: also check amr codec rates in check_codec_pref() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3537d1c89e2520d35cc0e150ba8e6d3693e06710 Gerrit-Change-Number: 11442 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 23 Oct 2018 18:24:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 18:24:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 23 Oct 2018 18:24:45 +0000 Subject: Change in osmo-bsc[master]: cipher mode reject: send proper cause codes In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11438 ) Change subject: cipher mode reject: send proper cause codes ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia608fa34a6a2d3035a66d05fbc38553ac5186804 Gerrit-Change-Number: 11438 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 23 Oct 2018 18:24:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 18:26:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 23 Oct 2018 18:26:09 +0000 Subject: Change in osmo-bsc[master]: cosmetic: fix spec ref for gsm0808_cipher_mode() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11437 ) Change subject: cosmetic: fix spec ref for gsm0808_cipher_mode() ...................................................................... Patch Set 1: Code-Review-1 I don't really see where the entire function does anything related to GSM TS 04.08? It's dealing with BSSAP/BSSMAP which is in 08.08 ?!? -- To view, visit https://gerrit.osmocom.org/11437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I359caf1dd30f033c0b606040ccf27aa4c5a9d2c6 Gerrit-Change-Number: 11437 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 23 Oct 2018 18:26:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 18:26:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 23 Oct 2018 18:26:40 +0000 Subject: Change in docker-playground[master]: repo-install-test: version test for all programs In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11436 ) Change subject: repo-install-test: version test for all programs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I796f1e34d2c026b11dff89511b667fa457856088 Gerrit-Change-Number: 11436 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Tue, 23 Oct 2018 18:26:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 18:27:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 23 Oct 2018 18:27:34 +0000 Subject: Change in osmo-dev[master]: gen_makefile.py: detect changes in cpp files In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11434 ) Change subject: gen_makefile.py: detect changes in cpp files ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9382d984fa1988eefbb6be3e45d88b2f1f5b598a Gerrit-Change-Number: 11434 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Tue, 23 Oct 2018 18:27:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 22:49:09 2018 From: gerrit-no-reply at lists.osmocom.org (Omar Ramadan) Date: Tue, 23 Oct 2018 22:49:09 +0000 Subject: Change in osmo-bts[master]: Add OC-2G BTS sources Message-ID: Omar Ramadan has uploaded this change for review. ( https://gerrit.osmocom.org/11447 Change subject: Add OC-2G BTS sources ...................................................................... Add OC-2G BTS sources Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 --- A src/osmo-bts-oc2g/Makefile.am A src/osmo-bts-oc2g/calib_file.c A src/osmo-bts-oc2g/hw_info.ver_major A src/osmo-bts-oc2g/hw_misc.c A src/osmo-bts-oc2g/hw_misc.h A src/osmo-bts-oc2g/l1_if.c A src/osmo-bts-oc2g/l1_if.h A src/osmo-bts-oc2g/l1_transp.h A src/osmo-bts-oc2g/l1_transp_hw.c A src/osmo-bts-oc2g/main.c A src/osmo-bts-oc2g/misc/.dirstamp A src/osmo-bts-oc2g/misc/oc2gbts_bid.c A src/osmo-bts-oc2g/misc/oc2gbts_bid.h A src/osmo-bts-oc2g/misc/oc2gbts_bts.c A src/osmo-bts-oc2g/misc/oc2gbts_bts.h A src/osmo-bts-oc2g/misc/oc2gbts_clock.c A src/osmo-bts-oc2g/misc/oc2gbts_clock.h A src/osmo-bts-oc2g/misc/oc2gbts_led.c A src/osmo-bts-oc2g/misc/oc2gbts_led.h A src/osmo-bts-oc2g/misc/oc2gbts_mgr.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr.h A src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_nl.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_temp.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c A src/osmo-bts-oc2g/misc/oc2gbts_misc.c A src/osmo-bts-oc2g/misc/oc2gbts_misc.h A src/osmo-bts-oc2g/misc/oc2gbts_nl.c A src/osmo-bts-oc2g/misc/oc2gbts_nl.h A src/osmo-bts-oc2g/misc/oc2gbts_par.c A src/osmo-bts-oc2g/misc/oc2gbts_par.h A src/osmo-bts-oc2g/misc/oc2gbts_power.c A src/osmo-bts-oc2g/misc/oc2gbts_power.h A src/osmo-bts-oc2g/misc/oc2gbts_swd.c A src/osmo-bts-oc2g/misc/oc2gbts_swd.h A src/osmo-bts-oc2g/misc/oc2gbts_temp.c A src/osmo-bts-oc2g/misc/oc2gbts_temp.h A src/osmo-bts-oc2g/misc/oc2gbts_util.c A src/osmo-bts-oc2g/oc2gbts.c A src/osmo-bts-oc2g/oc2gbts.h A src/osmo-bts-oc2g/oc2gbts_vty.c A src/osmo-bts-oc2g/oml.c A src/osmo-bts-oc2g/oml_router.c A src/osmo-bts-oc2g/oml_router.h A src/osmo-bts-oc2g/tch.c A src/osmo-bts-oc2g/utils.c A src/osmo-bts-oc2g/utils.h 47 files changed, 12,596 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/47/11447/1 -- To view, visit https://gerrit.osmocom.org/11447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 Gerrit-Change-Number: 11447 Gerrit-PatchSet: 1 Gerrit-Owner: Omar Ramadan -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 22:49:09 2018 From: gerrit-no-reply at lists.osmocom.org (Omar Ramadan) Date: Tue, 23 Oct 2018 22:49:09 +0000 Subject: Change in osmo-bts[master]: Add OC-2G systemd service and config Message-ID: Omar Ramadan has uploaded this change for review. ( https://gerrit.osmocom.org/11448 Change subject: Add OC-2G systemd service and config ...................................................................... Add OC-2G systemd service and config Change-Id: Ic4b5a97b9677051442f3c3341ba23add35b43715 --- A contrib/systemd/oc2gbts-mgr.service A contrib/systemd/osmo-bts-oc2g.service A doc/examples/oc2g/oc2gbts-mgr.cfg A doc/examples/oc2g/osmo-bts.cfg 4 files changed, 121 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/11448/1 diff --git a/contrib/systemd/oc2gbts-mgr.service b/contrib/systemd/oc2gbts-mgr.service new file mode 100644 index 0000000..ed915b3 --- /dev/null +++ b/contrib/systemd/oc2gbts-mgr.service @@ -0,0 +1,29 @@ +[Unit] +Description=osmo-bts manager for OC-2G +After=oc2g-sysdev-remap.service +Wants=oc2g-sysdev-remap.service + +[Service] +Type=simple +NotifyAccess=all +WatchdogSec=21780s +Restart=always +RestartSec=2 + +# Make sure directories and symbolic link exist +ExecStartPre=/bin/sh -c 'test -d /mnt/storage/var/run/oc2gbts-mgr || mkdir -p /mnt/storage/var/run/oc2gbts-mgr ; test -d /var/run/oc2gbts-mgr || ln -sf /mnt/storage/var/run/oc2gbts-mgr/ /var/run' +# Make sure BTS operation hour exist +ExecStartPre=/bin/sh -c 'test -f /mnt/storage/var/run/oc2gbts-mgr/hours-running || echo 0 > /mnt/storage/var/run/oc2gbts-mgr/hours-running' +# Shutdown all PA correctly +ExecStartPre=/bin/sh -c 'echo disabled > /var/oc2g/pa-state/pa0/state;' +#ExecStartPre=/bin/sh -c 'echo 0 > /var/oc2g/pa-supply/max_microvolts; echo 0 > /var/oc2g/pa-supply/min_microvolts' + +ExecStart=/usr/bin/oc2gbts-mgr -s -c /etc/osmocom/oc2gbts-mgr.cfg + +# Shutdown all PA correctly +ExecStopPost=/bin/sh -c 'echo disabled > /var/oc2g/pa-state/pa0/state;' +#ExecStopPost=/bin/sh -c 'echo 0 > /var/oc2g/pa-supply/max_microvolts; echo 0 > /var/oc2g/pa-supply/min_microvolts' + +[Install] +WantedBy=multi-user.target +Alias=osmo-bts-mgr.service diff --git a/contrib/systemd/osmo-bts-oc2g.service b/contrib/systemd/osmo-bts-oc2g.service new file mode 100644 index 0000000..2f2d837 --- /dev/null +++ b/contrib/systemd/osmo-bts-oc2g.service @@ -0,0 +1,21 @@ +[Unit] +Description=osmo-bts for OC-2G + +[Service] +Type=simple +ExecStartPre=/bin/sh -c 'echo 1 > /sys/class/leds/usr0/brightness' +ExecStartPre=/bin/sh -c 'echo 1 > /sys/class/leds/usr1/brightness' +ExecStart=/usr/bin/osmo-bts-oc2g -s -c /etc/osmocom/osmo-bts.cfg -M +ExecStopPost=/bin/sh -c 'echo 1 > /sys/class/leds/usr0/brightness' +ExecStopPost=/bin/sh -c 'echo 0 > /sys/class/leds/usr1/brightness' +Restart=always +RestartSec=2 +RestartPreventExitStatus=1 + +# The msg queues must be read fast enough +CPUSchedulingPolicy=rr +CPUSchedulingPriority=1 + +[Install] +WantedBy=multi-user.target +Alias=osmo-bts.service diff --git a/doc/examples/oc2g/oc2gbts-mgr.cfg b/doc/examples/oc2g/oc2gbts-mgr.cfg new file mode 100644 index 0000000..8248f60 --- /dev/null +++ b/doc/examples/oc2g/oc2gbts-mgr.cfg @@ -0,0 +1,33 @@ +! +! oc2gbts-mgr (0.3.0.284-a7c2-dirty) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level temp info + logging level fw info + logging level find info + logging level calib info + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice +! +line vty + no login +! +oc2gbts-mgr + limits supply_volt + threshold warning min 17500 + threshold critical min 19000 + limits supply_pwr + threshold warning max 110 + threshold critical max 120 diff --git a/doc/examples/oc2g/osmo-bts.cfg b/doc/examples/oc2g/osmo-bts.cfg new file mode 100644 index 0000000..f985f3b --- /dev/null +++ b/doc/examples/oc2g/osmo-bts.cfg @@ -0,0 +1,38 @@ +! +! OsmoBTS (0.0.1.100-0455-dirty) configuration saved from vty +!! +! +log stderr + logging color 1 + logging timestamp 0 + logging level rsl info + logging level oml info + logging level rll notice + logging level rr notice + logging level meas notice + logging level pag info + logging level l1c info + logging level l1p info + logging level dsp debug + logging level abis notice + logging level rtp notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice +! +line vty + no login +! +phy 0 + instance 0 + trx-calibration-path /mnt/rom/factory/calib +bts 0 + band 900 + ipa unit-id 1500 0 + oml remote-ip 10.42.0.1 + trx 0 + phy 0 instance 0 -- To view, visit https://gerrit.osmocom.org/11448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4b5a97b9677051442f3c3341ba23add35b43715 Gerrit-Change-Number: 11448 Gerrit-PatchSet: 1 Gerrit-Owner: Omar Ramadan -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 23 22:49:10 2018 From: gerrit-no-reply at lists.osmocom.org (Omar Ramadan) Date: Tue, 23 Oct 2018 22:49:10 +0000 Subject: Change in osmo-bts[master]: Add OC-2G to build Message-ID: Omar Ramadan has uploaded this change for review. ( https://gerrit.osmocom.org/11449 Change subject: Add OC-2G to build ...................................................................... Add OC-2G to build Change-Id: I4a8dcf759a2818c8e457bcb82775c4e60c94d771 --- M configure.ac M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/l1sap.h M include/osmo-bts/phy_link.h M src/Makefile.am M src/common/gsm_data_shared.c 6 files changed, 55 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/49/11449/1 diff --git a/configure.ac b/configure.ac index f2d4f84..9a8d58f 100644 --- a/configure.ac +++ b/configure.ac @@ -279,6 +279,27 @@ CPPFLAGS=$oldCPPFLAGS fi +AC_MSG_CHECKING([whether to enable NuRAN Wireless OC-2G hardware support]) +AC_ARG_ENABLE(oc2g, + AC_HELP_STRING([--enable-oc2g], + [enable code for NuRAN Wireless OC-2G bts [default=no]]), + [enable_oc2g="yes"],[enable_oc2g="no"]) +AC_ARG_WITH([oc2g], [AS_HELP_STRING([--with-oc2g=INCLUDE_DIR], [Location of the OC-2G API header files])], + [oc2g_incdir="$withval"],[oc2g_incdir="$incdir"]) +AC_SUBST([OC2G_INCDIR], -I$oc2g_incdir) +AC_MSG_RESULT([$enable_oc2g]) +AM_CONDITIONAL(ENABLE_OC2GBTS, test "x$enable_oc2g" = "xyes") +if test "$enable_oc2g" = "yes"; then + oldCPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $OC2G_INCDIR -I$srcdir/include" + AC_CHECK_HEADER([nrw/oc2g/oc2g.h],[], + [AC_MSG_ERROR([nrw/oc2g/oc2g.h can not be found in $oc2g_incdir])], + [#include ]) + PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd) + PKG_CHECK_MODULES(LIBGPS, libgps) + CPPFLAGS=$oldCPPFLAGS +fi + # https://www.freedesktop.org/software/systemd/man/daemon.html AC_ARG_WITH([systemdsystemunitdir], [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, @@ -307,6 +328,7 @@ src/osmo-bts-omldummy/Makefile src/osmo-bts-sysmo/Makefile src/osmo-bts-litecell15/Makefile + src/osmo-bts-oc2g/Makefile src/osmo-bts-trx/Makefile src/osmo-bts-octphy/Makefile include/Makefile diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 794eaea..80784af 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -411,6 +411,9 @@ uint16_t arfcn; int nominal_power; /* in dBm */ unsigned int max_power_red; /* in actual dB */ + uint8_t max_power_backoff_8psk; /* in actual dB */ + uint8_t c0_idle_power_red; /* in actual dB */ + struct trx_power_params power_params; int ms_power_control; @@ -437,6 +440,7 @@ enum gsm_bts_type_variant { BTS_UNKNOWN, BTS_OSMO_LITECELL15, + BTS_OSMO_OC2G, BTS_OSMO_OCTPHY, BTS_OSMO_SYSMO, BTS_OSMO_TRX, @@ -746,7 +750,14 @@ struct timeval tv_clock; struct osmo_timer_list fn_timer; } vbts; - +#ifdef ENABLE_OC2GBTS + /* specific to Open Cellular 2G BTS */ + struct { + uint8_t led_ctrl_mode; /* 0: control by BTS, 1: not control by BTS */ + struct llist_head ceased_alarm_list; /* ceased alarm list*/ + unsigned int rtp_drift_thres_ms; /* RTP timestamp drift detection threshold */ + } oc2g; +#endif }; diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index 3cf0ea5..4c30589 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -50,7 +50,7 @@ static inline uint8_t l1sap_chan2ss(uint8_t chan_nr) { if (L1SAP_IS_CHAN_BCCH(chan_nr)) - return L1SAP_CHAN2SS_BCCH(chan_nr); + return L1SAP_CHAN2SS_BCCH(chan_nr); if (L1SAP_IS_CHAN_SDCCH8(chan_nr)) return L1SAP_CHAN2SS_SDCCH8(chan_nr); if (L1SAP_IS_CHAN_SDCCH4(chan_nr)) diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h index 36e34e1..2472c05 100644 --- a/include/osmo-bts/phy_link.h +++ b/include/osmo-bts/phy_link.h @@ -135,6 +135,20 @@ uint8_t tx_pwr_adj_mode; /* 0: no auto adjust power, 1: auto adjust power using RMS detector */ uint8_t tx_pwr_red_8psk; /* 8-PSK maximum Tx power reduction level in dB */ } lc15; + struct { + /* configuration */ + uint32_t dsp_trace_f; + char *calib_path; + int minTxPower; + int maxTxPower; + struct oc2gl1_hdl *hdl; + uint8_t max_cell_size; /* 0:166 qbits*/ + uint8_t pedestal_mode; /* 0: unused TS is OFF, 1: unused TS is in minimum Tx power */ + uint8_t dsp_alive_period; /* DSP alive timer period */ + uint8_t tx_pwr_adj_mode; /* 0: no auto adjust power, 1: auto adjust power using RMS detector */ + uint8_t tx_pwr_red_8psk; /* 8-PSK maximum Tx power reduction level in dB */ + uint8_t tx_c0_idle_pwr_red; /* C0 idle slot Tx power reduction level in dB */ + } oc2g; } u; }; diff --git a/src/Makefile.am b/src/Makefile.am index 501591d..70e4d96 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,3 +15,8 @@ if ENABLE_LC15BTS SUBDIRS += osmo-bts-litecell15 endif + +if ENABLE_OC2GBTS +SUBDIRS += osmo-bts-oc2g +endif + diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c index 588d0fd..21e5781 100644 --- a/src/common/gsm_data_shared.c +++ b/src/common/gsm_data_shared.c @@ -71,6 +71,7 @@ const struct value_string osmo_bts_variant_names[_NUM_BTS_VARIANT + 1] = { { BTS_UNKNOWN, "unknown" }, { BTS_OSMO_LITECELL15, "osmo-bts-lc15" }, + { BTS_OSMO_OC2G, "osmo-bts-oc2g" }, { BTS_OSMO_OCTPHY, "osmo-bts-octphy" }, { BTS_OSMO_SYSMO, "osmo-bts-sysmo" }, { BTS_OSMO_TRX, "omso-bts-trx" }, -- To view, visit https://gerrit.osmocom.org/11449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4a8dcf759a2818c8e457bcb82775c4e60c94d771 Gerrit-Change-Number: 11449 Gerrit-PatchSet: 1 Gerrit-Owner: Omar Ramadan -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 07:14:23 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 24 Oct 2018 07:14:23 +0000 Subject: Change in osmo-bsc[master]: codec_pref: also check amr codec rates in check_codec_pref() In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/11442 ) Change subject: codec_pref: also check amr codec rates in check_codec_pref() ...................................................................... codec_pref: also check amr codec rates in check_codec_pref() The function check_codec_pref() currently only does a basic check over the general codec configuration of bts and msc. However, it does not yet check if the amr codec rate settings for the BTSs contradict the allowed/forbidden amr codec rates of the MSC. When the two settings do contradict AMR would not work, even when everything else is correctly configured. We need to check this on startup to spot configuration problems quickly. - Add function to calculate intersections of struct gsm48_multi_rate_conf variables. - Calculate the intersection between the multi rate config of each BTS with the one of the MSC Change-Id: I3537d1c89e2520d35cc0e150ba8e6d3693e06710 Related: OS#3529 --- M include/osmocom/bsc/codec_pref.h M src/osmo-bsc/codec_pref.c 2 files changed, 53 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/codec_pref.h b/include/osmocom/bsc/codec_pref.h index d62d29f..51340c1 100644 --- a/include/osmocom/bsc/codec_pref.h +++ b/include/osmocom/bsc/codec_pref.h @@ -22,4 +22,8 @@ const struct bsc_msc_data *msc, const struct gsm_bts *bts); +int calc_amr_rate_intersection(struct gsm48_multi_rate_conf *c, + const struct gsm48_multi_rate_conf *b, + const struct gsm48_multi_rate_conf *a); + int check_codec_pref(struct llist_head *mscs); diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index 9f30c7b..c99c383 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -393,6 +393,35 @@ } } +/*! Calculate the intersection of the rate configuration of two multirate configuration + * IE structures. The result c will be a copy of a, but the rate configuration bits + * will be the intersection of the rate configuration bits in a and b. + * \param[out] c user provided memory to store the result. + * \param[in] a multi rate configuration a. + * \param[in] b multi rate configuration b. + * \returns 0 on success, -1 when the result contains an empty set of modes. */ +int calc_amr_rate_intersection(struct gsm48_multi_rate_conf *c, + const struct gsm48_multi_rate_conf *b, + const struct gsm48_multi_rate_conf *a) +{ + struct gsm48_multi_rate_conf res; + uint8_t *_a = (uint8_t *) a; + uint8_t *_b = (uint8_t *) b; + uint8_t *_res = (uint8_t *) & res; + + memcpy(&res, a, sizeof(res)); + + _res[1] = _a[1] & _b[1]; + + if (_res[1] == 0x00) + return -1; + + if (c) + memcpy(c, &res, sizeof(*c)); + + return 0; +} + /*! Visit the codec settings for the MSC and for each BTS in order to make sure * that the configuration does not contain any combinations that lead into a * mutually exclusive codec configuration (empty intersection). @@ -404,6 +433,8 @@ struct gsm_bts *bts; struct gsm0808_speech_codec_list scl; int rc = 0; + int rc_rate; + const struct gsm48_multi_rate_conf *bts_gsm48_ie; llist_for_each_entry(msc, mscs, entry) { llist_for_each_entry(bts, &msc->network->bts_list, list) { @@ -414,6 +445,24 @@ bts->nr, msc->nr); rc = -1; } + + bts_gsm48_ie = (struct gsm48_multi_rate_conf *)&bts->mr_full.gsm48_ie; + rc_rate = calc_amr_rate_intersection(NULL, &msc->amr_conf, bts_gsm48_ie); + if (rc_rate < 0) { + LOGP(DMSC, LOGL_FATAL, + "network amr tch-f mode config of BTS %u does not intersect with amr-config of MSC %u\n", + bts->nr, msc->nr); + rc = -1; + } + + bts_gsm48_ie = (struct gsm48_multi_rate_conf *)&bts->mr_half.gsm48_ie; + rc_rate = calc_amr_rate_intersection(NULL, &msc->amr_conf, bts_gsm48_ie); + if (rc_rate < 0) { + LOGP(DMSC, LOGL_FATAL, + "network amr tch-h mode config of BTS %u does not intersect with amr-config of MSC %u\n", + bts->nr, msc->nr); + rc = -1; + } } } -- To view, visit https://gerrit.osmocom.org/11442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3537d1c89e2520d35cc0e150ba8e6d3693e06710 Gerrit-Change-Number: 11442 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 08:09:53 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 24 Oct 2018 08:09:53 +0000 Subject: Change in osmo-msc[master]: gsm_04_08_cc: Add global guard timer for MNCC In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11307 to look at the new patch set (#4). Change subject: gsm_04_08_cc: Add global guard timer for MNCC ...................................................................... gsm_04_08_cc: Add global guard timer for MNCC The external MNCC handler may hang indefinitely in cases where the remote end of the MNCC ceases to work properly. Add a global guard timer to make sure the call reaches ACTIVE state. Change-Id: I7375d1e17cd746aac4eadfe1e587e82cf1630d3d Related: OS#3599 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M tests/msc_vlr/msc_vlr_test_call.err 6 files changed, 94 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/07/11307/4 -- To view, visit https://gerrit.osmocom.org/11307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7375d1e17cd746aac4eadfe1e587e82cf1630d3d Gerrit-Change-Number: 11307 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 08:27:52 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 24 Oct 2018 08:27:52 +0000 Subject: Change in osmo-msc[master]: gsm_04_08_cc: Add global guard timer for MNCC In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11307 to look at the new patch set (#5). Change subject: gsm_04_08_cc: Add global guard timer for MNCC ...................................................................... gsm_04_08_cc: Add global guard timer for MNCC The external MNCC handler may hang indefinitely in cases where the remote end of the MNCC ceases to work properly. Add a global guard timer to make sure the call reaches ACTIVE state. Change-Id: I7375d1e17cd746aac4eadfe1e587e82cf1630d3d Related: OS#3599 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M tests/msc_vlr/msc_vlr_test_call.err 6 files changed, 94 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/07/11307/5 -- To view, visit https://gerrit.osmocom.org/11307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7375d1e17cd746aac4eadfe1e587e82cf1630d3d Gerrit-Change-Number: 11307 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 08:28:56 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 24 Oct 2018 08:28:56 +0000 Subject: Change in osmo-bsc[master]: cosmetic: fix spec ref for gsm0808_cipher_mode() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11437 ) Change subject: cosmetic: fix spec ref for gsm0808_cipher_mode() ...................................................................... Patch Set 1: > I don't really see where the entire function does anything related to GSM TS 04.08? It's dealing with BSSAP/BSSMAP which is in 08.08 ?!? Well, originally this said: > GSM 08.08 ? 3.4.7 cipher mode handling. So I went looking for that chapter in GSM 08.08, but I could not find it. * GSM 08.08 goes only until 3.3, no 3.4: https://www.etsi.org/deliver/etsi_gts/08/0808/05.12.00_60/gsmts_0808v051200p.pdf * GSM 04.08 has "3.4.7 Ciphering mode setting procedure", page 59 in this PDF: https://www.etsi.org/deliver/etsi_gts/04/0408/05.03.00_60/gsmts_0408v050300p.pdf ...so my conclusion was, that this was meant to point to 04.08 ? 3.4.7. What am I missing? -- To view, visit https://gerrit.osmocom.org/11437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I359caf1dd30f033c0b606040ccf27aa4c5a9d2c6 Gerrit-Change-Number: 11437 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 24 Oct 2018 08:28:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 08:30:06 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 24 Oct 2018 08:30:06 +0000 Subject: Change in docker-playground[master]: repo-install-test: version test for all programs In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11436 ) Change subject: repo-install-test: version test for all programs ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I796f1e34d2c026b11dff89511b667fa457856088 Gerrit-Change-Number: 11436 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 24 Oct 2018 08:30:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 08:30:09 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 24 Oct 2018 08:30:09 +0000 Subject: Change in docker-playground[master]: repo-install-test: version test for all programs In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11436 ) Change subject: repo-install-test: version test for all programs ...................................................................... repo-install-test: version test for all programs We did not test all programs before, because they did not have --version implemented. Now they do. Related: OS#3555 Change-Id: I796f1e34d2c026b11dff89511b667fa457856088 --- M debian-repo-install-test/testdata/repo-install-test.sh 1 file changed, 6 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved osmith: Verified diff --git a/debian-repo-install-test/testdata/repo-install-test.sh b/debian-repo-install-test/testdata/repo-install-test.sh index 3ef88e8..f45908b 100755 --- a/debian-repo-install-test/testdata/repo-install-test.sh +++ b/debian-repo-install-test/testdata/repo-install-test.sh @@ -66,17 +66,13 @@ } test_binaries() { - # Make sure the binaries are not broken (run -h or --version) - osmo-gtphub -h - osmo-sip-connector -h - osmo-trx-uhd -h - osmo-trx-usrp1 -h - + # Make sure that binares run at all and output a proper version test_binaries_version \ osmo-bsc \ osmo-bts-trx \ osmo-bts-virtual \ osmo-gbproxy \ + osmo-gtphub \ osmo-ggsn \ osmo-hlr \ osmo-hlr-db-tool \ @@ -85,7 +81,10 @@ osmo-msc \ osmo-pcu \ osmo-sgsn \ - osmo-stp + osmo-sip-connector \ + osmo-stp \ + osmo-trx-uhd \ + osmo-trx-usrp1 } finish() { -- To view, visit https://gerrit.osmocom.org/11436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I796f1e34d2c026b11dff89511b667fa457856088 Gerrit-Change-Number: 11436 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 09:04:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 24 Oct 2018 09:04:10 +0000 Subject: Change in osmo-msc[master]: gsm_04_08_cc: Add global guard timer for MNCC In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11307 ) Change subject: gsm_04_08_cc: Add global guard timer for MNCC ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7375d1e17cd746aac4eadfe1e587e82cf1630d3d Gerrit-Change-Number: 11307 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 24 Oct 2018 09:04:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 09:04:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 24 Oct 2018 09:04:15 +0000 Subject: Change in osmo-msc[master]: gsm_04_08_cc: Add global guard timer for MNCC In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11307 ) Change subject: gsm_04_08_cc: Add global guard timer for MNCC ...................................................................... gsm_04_08_cc: Add global guard timer for MNCC The external MNCC handler may hang indefinitely in cases where the remote end of the MNCC ceases to work properly. Add a global guard timer to make sure the call reaches ACTIVE state. Change-Id: I7375d1e17cd746aac4eadfe1e587e82cf1630d3d Related: OS#3599 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M tests/msc_vlr/msc_vlr_test_call.err 6 files changed, 94 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 54026f6..579697e 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -332,6 +332,9 @@ /* Periodic location update default value */ uint8_t t3212; + /* Global MNCC guard timer value */ + int mncc_guard_timeout; + struct { struct mgcp_client_conf conf; struct mgcp_client *client; diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h index 4ffb468..b7d7971 100644 --- a/include/osmocom/msc/transaction.h +++ b/include/osmocom/msc/transaction.h @@ -69,6 +69,7 @@ int Tcurrent; /* current CC timer */ int T308_second; /* used to send release again */ struct osmo_timer_list timer; + struct osmo_timer_list timer_guard; struct gsm_mncc msg; /* stores setup/disconnect/release message */ } cc; struct { diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 19e6cba..f9888d7 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -73,6 +73,43 @@ static uint32_t new_callref = 0x80000001; +static void gsm48_cc_guard_timeout(void *arg) +{ + struct gsm_trans *trans = arg; + DEBUGP(DCC, "(sub %s) guard timeout expired\n", + vlr_subscr_msisdn_or_name(trans->vsub)); + trans_free(trans); + return; +} + +static void gsm48_stop_guard_timer(struct gsm_trans *trans) +{ + if (osmo_timer_pending(&trans->cc.timer_guard)) { + DEBUGP(DCC, "(sub %s) stopping pending guard timer\n", + vlr_subscr_msisdn_or_name(trans->vsub)); + osmo_timer_del(&trans->cc.timer_guard); + } +} + +static void gsm48_start_guard_timer(struct gsm_trans *trans) +{ + /* NOTE: The purpose of this timer is to prevent the cc state machine + * from hanging in cases where mncc, gsm48 or both become unresponsive + * for some reason. The timer is started initially with the setup from + * the gsm48 side and then re-started with every incoming mncc message. + * Once the mncc state reaches its active state the timer is stopped. + * So if the cc state machine does not show any activity for an + * extended amount of time during call setup or teardown the guard + * timer will time out and hard-clear the connection. */ + if (osmo_timer_pending(&trans->cc.timer_guard)) + gsm48_stop_guard_timer(trans); + DEBUGP(DCC, "(sub %s) starting guard timer with %d seconds\n", + vlr_subscr_msisdn_or_name(trans->vsub), + trans->net->mncc_guard_timeout); + osmo_timer_setup(&trans->cc.timer_guard, gsm48_cc_guard_timeout, trans); + osmo_timer_schedule(&trans->cc.timer_guard, + trans->net->mncc_guard_timeout, 0); +} /* Call Control */ @@ -149,6 +186,10 @@ count_statistics(trans, state); trans->cc.state = state; + + /* Stop the guard timer when a call reaches the active state */ + if (state == GSM_CSTATE_ACTIVE) + gsm48_stop_guard_timer(trans); } static int gsm48_cc_tx_status(struct gsm_trans *trans, void *arg) @@ -259,6 +300,8 @@ } if (trans->cc.state != GSM_CSTATE_NULL) new_cc_state(trans, GSM_CSTATE_NULL); + + gsm48_stop_guard_timer(trans); } static int gsm48_cc_tx_setup(struct gsm_trans *trans, void *arg); @@ -474,6 +517,8 @@ struct tlv_parsed tp; struct gsm_mncc setup; + gsm48_start_guard_timer(trans); + memset(&setup, 0, sizeof(struct gsm_mncc)); setup.callref = trans->callref; @@ -1970,6 +2015,8 @@ log_set_context(LOG_CTX_VLR_SUBSCR, trans->vsub); } + gsm48_start_guard_timer(trans); + if (trans->conn) conn = trans->conn; diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index fe6ae88..a16cec8 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -333,6 +333,16 @@ return CMD_SUCCESS; } +DEFUN(cfg_msc_mncc_guard_timeout, + cfg_msc_mncc_guard_timeout_cmd, + "mncc-guard-timeout <0-255>", + "Set global guard timer for mncc interface activity\n" + "guard timer value (sec.)") +{ + gsmnet->mncc_guard_timeout = atoi(argv[0]); + return CMD_SUCCESS; +} + DEFUN(cfg_msc_assign_tmsi, cfg_msc_assign_tmsi_cmd, "assign-tmsi", "Assign TMSI during Location Updating.\n") @@ -421,6 +431,8 @@ static int config_write_msc(struct vty *vty) { vty_out(vty, "msc%s", VTY_NEWLINE); + vty_out(vty, " mncc-guard-timeout %i%s", + gsmnet->mncc_guard_timeout, VTY_NEWLINE); vty_out(vty, " %sassign-tmsi%s", gsmnet->vlr->cfg.assign_tmsi? "" : "no ", VTY_NEWLINE); @@ -1415,6 +1427,7 @@ install_element(CONFIG_NODE, &cfg_msc_cmd); install_node(&msc_node, config_write_msc); install_element(MSC_NODE, &cfg_msc_assign_tmsi_cmd); + install_element(MSC_NODE, &cfg_msc_mncc_guard_timeout_cmd); install_element(MSC_NODE, &cfg_msc_no_assign_tmsi_cmd); install_element(MSC_NODE, &cfg_msc_auth_tuple_max_reuse_count_cmd); install_element(MSC_NODE, &cfg_msc_auth_tuple_reuse_on_error_cmd); diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index 3965e9b..c9ecb64 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -54,6 +54,8 @@ /* Use 30 min periodic update interval as sane default */ net->t3212 = 5; + net->mncc_guard_timeout = 180; + net->paging_response_timer = MSC_PAGING_RESPONSE_TIMER_DEFAULT; INIT_LLIST_HEAD(&net->trans_list); diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index 19cb25d..936f61c 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -277,6 +277,7 @@ DREF MSISDN:42342: MSC conn use + trans_cc == 3 (0x1a: dtap,cm_service,trans_cc) DMM MSISDN:42342: rx msg GSM48_MT_CC_SETUP: received_cm_service_request changes to false DREF MSISDN:42342: MSC conn use - cm_service == 2 (0x12: dtap,trans_cc) +DCC (sub 42342) starting guard timer with 180 seconds DCC (ti 08 sub MSISDN:42342) new state NULL -> INITIATED DCC Subscriber MSISDN:42342 (42342) sends SETUP to 123 DMNCC transmit message MNCC_SETUP_IND @@ -287,6 +288,8 @@ DREF MSISDN:42342: MSC conn use - dtap == 1 (0x10: trans_cc) - MNCC says that's fine DMNCC receive message MNCC_CALL_PROC_REQ +DCC (sub 42342) stopping pending guard timer +DCC (sub 42342) starting guard timer with 180 seconds DCC (ti 08 sub 42342) Received 'MNCC_CALL_PROC_REQ' from MNCC in state 1 (INITIATED) DCC (ti 08 sub MSISDN:42342) new state INITIATED -> MO_CALL_PROC DMSC msc_tx 2 bytes to MSISDN:42342 via RAN_UTRAN_IU @@ -296,12 +299,16 @@ - Total time passed: 1.000023 s - The other call leg got established (not shown here), MNCC tells us so DMNCC receive message MNCC_ALERT_REQ +DCC (sub 42342) stopping pending guard timer +DCC (sub 42342) starting guard timer with 180 seconds DCC (ti 08 sub 42342) Received 'MNCC_ALERT_REQ' from MNCC in state 3 (MO_CALL_PROC) DCC (ti 08 sub MSISDN:42342) new state MO_CALL_PROC -> CALL_DELIVERED DMSC msc_tx 2 bytes to MSISDN:42342 via RAN_UTRAN_IU - DTAP --RAN_UTRAN_IU--> MS: GSM48_MT_CC_ALERTING: 8301 - DTAP matches expected message DMNCC receive message MNCC_SETUP_RSP +DCC (sub 42342) stopping pending guard timer +DCC (sub 42342) starting guard timer with 180 seconds DCC (ti 08 sub 42342) Received 'MNCC_SETUP_RSP' from MNCC in state 4 (CALL_DELIVERED) DCC starting timer T313 with 30 seconds DCC (ti 08 sub MSISDN:42342) new state CALL_DELIVERED -> CONNECT_IND @@ -314,6 +321,7 @@ DRLL Dispatching 04.08 message GSM48_MT_CC_CONNECT_ACK (0x3:0xf) DCC stopping pending timer T313 DCC (ti 08 sub MSISDN:42342) new state CONNECT_IND -> ACTIVE +DCC (sub 42342) stopping pending guard timer DMNCC transmit message MNCC_SETUP_COMPL_IND DCC Sending 'MNCC_SETUP_COMPL_IND' to MNCC. MSC --> MNCC: callref 0x80000001: MNCC_SETUP_COMPL_IND @@ -334,6 +342,7 @@ DMM Subscr_Conn(CM_SERVICE_REQ:901700000010650){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_COMMUNICATING DREF MSISDN:42342: MSC conn use - dtap == 1 (0x10: trans_cc) DMNCC receive message MNCC_REL_REQ +DCC (sub 42342) starting guard timer with 180 seconds DCC (ti 08 sub 42342) Received 'MNCC_REL_REQ' from MNCC in state 12 (DISCONNECT_IND) DCC starting timer T308 with 10 seconds DCC (ti 08 sub MSISDN:42342) new state DISCONNECT_IND -> RELEASE_REQ @@ -349,6 +358,7 @@ MSC --> MNCC: callref 0x80000001: MNCC_REL_CNF MS <--Call Release-- MSC: subscr=MSISDN:42342 callref=0x0 DCC (ti 08 sub MSISDN:42342) new state RELEASE_REQ -> NULL +DCC (sub 42342) stopping pending guard timer DREF VLR subscr MSISDN:42342 usage decreases to: 2 DREF MSISDN:42342: MSC conn use - trans_cc == 1 (0x2: dtap) DMM Subscr_Conn(CM_SERVICE_REQ:901700000010650){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_COMMUNICATING @@ -697,8 +707,10 @@ DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_COMMUNICATING DREF MSISDN:42342: MSC conn use - dtap == 1 (0x10: trans_cc) DMNCC receive message MNCC_SETUP_COMPL_REQ +DCC (sub 42342) starting guard timer with 180 seconds DCC (ti 00 sub 42342) Received 'MNCC_SETUP_COMPL_REQ' from MNCC in state 8 (CONNECT_REQUEST) DCC (ti 00 sub MSISDN:42342) new state CONNECT_REQUEST -> ACTIVE +DCC (sub 42342) stopping pending guard timer DMSC msc_tx 2 bytes to MSISDN:42342 via RAN_UTRAN_IU - DTAP --RAN_UTRAN_IU--> MS: GSM48_MT_CC_CONNECT_ACK: 030f - DTAP matches expected message @@ -717,6 +729,7 @@ DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_COMMUNICATING DREF MSISDN:42342: MSC conn use - dtap == 1 (0x10: trans_cc) DMNCC receive message MNCC_REL_REQ +DCC (sub 42342) starting guard timer with 180 seconds DCC (ti 00 sub 42342) Received 'MNCC_REL_REQ' from MNCC in state 12 (DISCONNECT_IND) DCC starting timer T308 with 10 seconds DCC (ti 00 sub MSISDN:42342) new state DISCONNECT_IND -> RELEASE_REQ @@ -732,6 +745,7 @@ MSC --> MNCC: callref 0x423: MNCC_REL_CNF MS <--Call Release-- MSC: subscr=MSISDN:42342 callref=0x0 DCC (ti 00 sub MSISDN:42342) new state RELEASE_REQ -> NULL +DCC (sub 42342) stopping pending guard timer DREF VLR subscr MSISDN:42342 usage decreases to: 2 DREF MSISDN:42342: MSC conn use - trans_cc == 1 (0x2: dtap) DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_COMMUNICATING @@ -1078,6 +1092,7 @@ DCC stopping pending timer T301 MS <--Call Release-- MSC: subscr=MSISDN:42342 callref=0x423 DMNCC receive message MNCC_REL_REQ +DCC (sub 42342) starting guard timer with 180 seconds DCC (ti 00 sub 42342) Received 'MNCC_REL_REQ' from MNCC in state 7 (CALL_RECEIVED) DCC starting timer T308 with 10 seconds DCC (ti 00 sub MSISDN:42342) new state CALL_RECEIVED -> RELEASE_REQ @@ -1089,6 +1104,7 @@ MSC --> MNCC: callref 0x423: MNCC_REL_CNF DCC stopping pending timer T308 DCC (ti 00 sub MSISDN:42342) new state RELEASE_REQ -> NULL +DCC (sub 42342) stopping pending guard timer DREF VLR subscr MSISDN:42342 usage decreases to: 2 DREF MSISDN:42342: MSC conn use - trans_cc == 1 (0x100: release) - Iu Release --RAN_UTRAN_IU--> MS @@ -1389,6 +1405,7 @@ DREF MSISDN:42342: MSC conn use + trans_cc == 3 (0x1a: dtap,cm_service,trans_cc) DMM MSISDN:42342: rx msg GSM48_MT_CC_SETUP: received_cm_service_request changes to false DREF MSISDN:42342: MSC conn use - cm_service == 2 (0x12: dtap,trans_cc) +DCC (sub 42342) starting guard timer with 180 seconds DCC (ti 08 sub MSISDN:42342) new state NULL -> INITIATED DCC Subscriber MSISDN:42342 (42342) sends SETUP to 123 DMNCC transmit message MNCC_SETUP_IND @@ -1399,6 +1416,8 @@ DREF MSISDN:42342: MSC conn use - dtap == 1 (0x10: trans_cc) - MNCC says that's fine DMNCC receive message MNCC_CALL_PROC_REQ +DCC (sub 42342) stopping pending guard timer +DCC (sub 42342) starting guard timer with 180 seconds DCC (ti 08 sub 42342) Received 'MNCC_CALL_PROC_REQ' from MNCC in state 1 (INITIATED) DCC (ti 08 sub MSISDN:42342) new state INITIATED -> MO_CALL_PROC DMSC msc_tx 2 bytes to MSISDN:42342 via RAN_UTRAN_IU @@ -1407,6 +1426,8 @@ MS <--Call Assignment-- MSC: subscr=MSISDN:42342 callref=0x80000002 - But the other side's MSISDN could not be resolved, MNCC tells us to cancel DMNCC receive message MNCC_REL_REQ +DCC (sub 42342) stopping pending guard timer +DCC (sub 42342) starting guard timer with 180 seconds DCC (ti 08 sub 42342) Received 'MNCC_REL_REQ' from MNCC in state 3 (MO_CALL_PROC) DCC starting timer T308 with 10 seconds DCC (ti 08 sub MSISDN:42342) new state MO_CALL_PROC -> RELEASE_REQ @@ -1427,6 +1448,7 @@ MSC --> MNCC: callref 0x80000002: MNCC_REL_CNF MS <--Call Release-- MSC: subscr=MSISDN:42342 callref=0x0 DCC (ti 08 sub MSISDN:42342) new state RELEASE_REQ -> NULL +DCC (sub 42342) stopping pending guard timer DREF VLR subscr MSISDN:42342 usage decreases to: 2 DREF MSISDN:42342: MSC conn use - trans_cc == 1 (0x2: dtap) DMM Subscr_Conn(CM_SERVICE_REQ:901700000010650){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_COMMUNICATING @@ -1733,6 +1755,7 @@ DREF MSISDN:42342: MSC conn use + trans_cc == 3 (0x1a: dtap,cm_service,trans_cc) DMM MSISDN:42342: rx msg GSM48_MT_CC_SETUP: received_cm_service_request changes to false DREF MSISDN:42342: MSC conn use - cm_service == 2 (0x12: dtap,trans_cc) +DCC (sub 42342) starting guard timer with 180 seconds DCC (ti 08 sub MSISDN:42342) new state NULL -> INITIATED DCC Subscriber MSISDN:42342 (42342) sends SETUP to 123 DMNCC transmit message MNCC_SETUP_IND @@ -1743,6 +1766,8 @@ DREF MSISDN:42342: MSC conn use - dtap == 1 (0x10: trans_cc) - MNCC says that's fine DMNCC receive message MNCC_CALL_PROC_REQ +DCC (sub 42342) stopping pending guard timer +DCC (sub 42342) starting guard timer with 180 seconds DCC (ti 08 sub 42342) Received 'MNCC_CALL_PROC_REQ' from MNCC in state 1 (INITIATED) DCC (ti 08 sub MSISDN:42342) new state INITIATED -> MO_CALL_PROC DMSC msc_tx 2 bytes to MSISDN:42342 via RAN_UTRAN_IU @@ -1751,6 +1776,8 @@ MS <--Call Assignment-- MSC: subscr=MSISDN:42342 callref=0x80000003 - But the other side's MSISDN could not be resolved, MNCC tells us to cancel DMNCC receive message MNCC_REL_REQ +DCC (sub 42342) stopping pending guard timer +DCC (sub 42342) starting guard timer with 180 seconds DCC (ti 08 sub 42342) Received 'MNCC_REL_REQ' from MNCC in state 3 (MO_CALL_PROC) DCC starting timer T308 with 10 seconds DCC (ti 08 sub MSISDN:42342) new state MO_CALL_PROC -> RELEASE_REQ @@ -1770,6 +1797,7 @@ DCC Sending 'MNCC_REL_CNF' to MNCC. MSC --> MNCC: callref 0x80000003: MNCC_REL_CNF DCC (ti 08 sub MSISDN:42342) new state RELEASE_REQ -> NULL +DCC (sub 42342) stopping pending guard timer DREF VLR subscr MSISDN:42342 usage decreases to: 2 DREF MSISDN:42342: MSC conn use - trans_cc == 0 (0x0: ) DMM Subscr_Conn(CM_SERVICE_REQ:901700000010650){SUBSCR_CONN_S_COMMUNICATING}: Received Event SUBSCR_CONN_E_UNUSED -- To view, visit https://gerrit.osmocom.org/11307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7375d1e17cd746aac4eadfe1e587e82cf1630d3d Gerrit-Change-Number: 11307 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 09:32:29 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 24 Oct 2018 09:32:29 +0000 Subject: Change in libosmocore[master]: vty: adjust telnet log Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11450 Change subject: vty: adjust telnet log ...................................................................... vty: adjust telnet log Adjust wording so telnet command can be directly copy-pasted from the log to access the interface without the need for further editing. Change-Id: I1876447f9285adcd1b09937a6121afabd0b32e52 --- M src/vty/telnet_interface.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/50/11450/1 diff --git a/src/vty/telnet_interface.c b/src/vty/telnet_interface.c index fdd88c1..fcb4c8d 100644 --- a/src/vty/telnet_interface.c +++ b/src/vty/telnet_interface.c @@ -101,7 +101,7 @@ return -1; } - LOGP(DLGLOBAL, LOGL_NOTICE, "telnet at %s %d\n", ip, port); + LOGP(DLGLOBAL, LOGL_NOTICE, "Available via telnet %s %d\n", ip, port); return 0; } -- To view, visit https://gerrit.osmocom.org/11450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1876447f9285adcd1b09937a6121afabd0b32e52 Gerrit-Change-Number: 11450 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 09:37:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 24 Oct 2018 09:37:42 +0000 Subject: Change in osmo-bts[master]: Add OC-2G BTS sources In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11447 ) Change subject: Add OC-2G BTS sources ...................................................................... Patch Set 1: Code-Review-1 An initial review showed there are *many* parts that are identical to osmo-bts-litecell15, and we generally don't like "copy+paste" programming. In the end we have multiple compies of essentially the same source files, becoming a maintenance problem over time, when fixes are applied to one copy, but not the other. I've manually looked through each of the files and looked at the differences between the oc2g and the lc15 counterpart. == 100% identical to osmo-bts-sysmo or osmo-bts-lc15: oml_router.c oml_router.h misc/oc2gbts_nl.c == 99% identical to lc15 (just names changed) hw_misc.h hw_misc.c l1_transp.h l1_trans_hw.c oc2gbts.c / lc15bts.c oc2gbts_vty.c / lc15bts_vty.c oml.c tch.c utils.c utils.h l1_if.h misc/oc2gbts_bts.h misc/oc2gbts_bid.h misc/oc2gbts_clock.h misc/oc2gbts_clock.c misc/oc2gbts_led.c misc/oc2gbts_swd.c misc/oc2gbts_swd.h == 80% identical to lc15 (some small changes) l1_if.c misc/oc2gbts_bts.c misc/oc2gbts_mgr.c misc/oc2gbts_mgr.h misc/oc2gbts_mgr_nl.c misc/oc2gbts_temp.c misc/oc2gbts_temp.h == more differences compared to lc15, possibly not intentional? / what to do? misc/oc2gbts_temp.c misc/oc2gbts_mgr_vty.c misc/oc2gbts_misc.c misc/oc2gbts_par.c misc/oc2gbts_power.c misc/oc2gbts_util.c So we have to discuss how to go about this. The 100% identical files are easy, one can simply lik the existing implementation. We could also introduce a "src/nuran-common" directory for common code between the different models. For those parts with less similarity, this may require some refactoring, so that common/shared code goes to common/shared files and really only those bits that differ are handled in the respective implementations. Given that osmo-bts-litecell15 also started as copy of osmo-bts-sysmo, there may be room for further unification, but let's not conflate those two discussions. I think gerrit is not the best location to discuss this, so I'll start a mailing list thread. -- To view, visit https://gerrit.osmocom.org/11447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 Gerrit-Change-Number: 11447 Gerrit-PatchSet: 1 Gerrit-Owner: Omar Ramadan Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 24 Oct 2018 09:37:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 09:39:23 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 24 Oct 2018 09:39:23 +0000 Subject: Change in osmocom-bb[master]: mobile: display MS IMSI in vty In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11440 ) Change subject: mobile: display MS IMSI in vty ...................................................................... Patch Set 1: Curious, "sh subs 1" gives me empty IMSI while with this patch I can see it via "sh ms 1". Anyway, it's purely cosmetic - will investigate later on. -- To view, visit https://gerrit.osmocom.org/11440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id05f4f5f3416dcdb9ce2fd24f9360f5e6faaf654 Gerrit-Change-Number: 11440 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 24 Oct 2018 09:39:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 10:44:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 24 Oct 2018 10:44:02 +0000 Subject: Change in libosmocore[master]: vty: adjust telnet log In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11450 ) Change subject: vty: adjust telnet log ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1876447f9285adcd1b09937a6121afabd0b32e52 Gerrit-Change-Number: 11450 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 24 Oct 2018 10:44:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 10:49:23 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 24 Oct 2018 10:49:23 +0000 Subject: Change in osmo-dev[master]: find the terminal once and abort if missing In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11143 ) Change subject: find the terminal once and abort if missing ...................................................................... Patch Set 6: Verified+1 -- To view, visit https://gerrit.osmocom.org/11143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 Gerrit-Change-Number: 11143 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 24 Oct 2018 10:49:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 10:49:28 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 24 Oct 2018 10:49:28 +0000 Subject: Change in osmo-dev[master]: change default of MGW4BSC_PORT to 2427 In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11141 ) Change subject: change default of MGW4BSC_PORT to 2427 ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/11141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2c73df138642bc3fd52eea493fcab5261e5bc5c8 Gerrit-Change-Number: 11141 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 24 Oct 2018 10:49:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 10:49:31 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 24 Oct 2018 10:49:31 +0000 Subject: Change in osmo-dev[master]: 3G+2G.deps: add osmo-sip-connector In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11140 ) Change subject: 3G+2G.deps: add osmo-sip-connector ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/11140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I57fa43209581638c39554079d7c4b65ce24890f8 Gerrit-Change-Number: 11140 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 24 Oct 2018 10:49:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 10:49:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 24 Oct 2018 10:49:39 +0000 Subject: Change in osmo-dev[master]: 3G+2G.deps: add osmo-sip-connector In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11140 ) Change subject: 3G+2G.deps: add osmo-sip-connector ...................................................................... 3G+2G.deps: add osmo-sip-connector Change-Id: I57fa43209581638c39554079d7c4b65ce24890f8 --- M 3G+2G.deps 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, but someone else must approve osmith: Verified diff --git a/3G+2G.deps b/3G+2G.deps index 5b4fa0a..5a17146 100644 --- a/3G+2G.deps +++ b/3G+2G.deps @@ -12,3 +12,4 @@ osmo-msc osmo-iuh osmo-mgw libsmpp34 osmo-bsc libosmo-sccp osmo-mgw osmo-sgsn osmo-iuh osmo-ggsn +osmo-sip-connector libosmocore -- To view, visit https://gerrit.osmocom.org/11140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I57fa43209581638c39554079d7c4b65ce24890f8 Gerrit-Change-Number: 11140 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 10:49:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 24 Oct 2018 10:49:40 +0000 Subject: Change in osmo-dev[master]: change default of MGW4BSC_PORT to 2427 In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11141 ) Change subject: change default of MGW4BSC_PORT to 2427 ...................................................................... change default of MGW4BSC_PORT to 2427 That way one can view the MGCP traffic in wireshark without changing the MGCP port. We are using a different IP for the two MGWs already, so they won't conflict even if they use the same port. Change-Id: I2c73df138642bc3fd52eea493fcab5261e5bc5c8 --- M net/config_2g3g 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve osmith: Verified diff --git a/net/config_2g3g b/net/config_2g3g index c7a19de..266997f 100644 --- a/net/config_2g3g +++ b/net/config_2g3g @@ -49,7 +49,7 @@ BSC_IP="${PUBLIC_IP}" BSC_PC="0.42.0" MGW4BSC_IP="${PUBLIC_IP2}" -MGW4BSC_PORT="12427" +MGW4BSC_PORT="2427" MGW4BSC_VTY_IP="127.0.0.2" HNBGW_PC="0.3.0" -- To view, visit https://gerrit.osmocom.org/11141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2c73df138642bc3fd52eea493fcab5261e5bc5c8 Gerrit-Change-Number: 11141 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 10:49:41 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 24 Oct 2018 10:49:41 +0000 Subject: Change in osmo-dev[master]: find the terminal once and abort if missing In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11143 ) Change subject: find the terminal once and abort if missing ...................................................................... find the terminal once and abort if missing Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 --- M net/tmpl_std/run.sh 1 file changed, 16 insertions(+), 4 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved osmith: Verified diff --git a/net/tmpl_std/run.sh b/net/tmpl_std/run.sh index 57dcc23..cca7a75 100755 --- a/net/tmpl_std/run.sh +++ b/net/tmpl_std/run.sh @@ -34,18 +34,30 @@ logdir="current_log" mkdir -p "$logdir" +find_term() { + # Find a terminal program and write to the global "terminal" variable + local programs="urxvt xterm" + local program + for program in $programs; do + terminal="$(which $program)" + [ -n "$terminal" ] && return + done + + # No terminal found + echo "ERROR: Couldn't find terminal program! Looked for: $programs" + exit 1 +} + term() { title="$2" if [ -z "$title" ]; then title="$(basename $@)" fi - terminal="$(which urxvt || which xterm)" - if ! which $terminal; then - echo "CANNOT FIND XTERM PROGRAM" - fi exec $terminal -title "CN:$title" -e sh -c "export LD_LIBRARY_PATH='/usr/local/lib'; $1; echo; while true; do echo 'q Enter to close'; read q_to_close; if [ \"x\$q_to_close\" = xq ]; then break; fi; done" } +find_term + sudo tcpdump -i $dev -n -w current_log/$dev.single.pcap -U not port 22 & sudo tcpdump -i lo -n -w current_log/lo.single.pcap -U not port 22 & -- To view, visit https://gerrit.osmocom.org/11143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3 Gerrit-Change-Number: 11143 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 10:58:51 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 24 Oct 2018 10:58:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RSL_Emulation: Fail explicitly on ASP_IPA_EVENT_DOWN In-Reply-To: References: Message-ID: daniel has uploaded a new patch set (#3) to the change originally created by Pau Espin Pedrol. ( https://gerrit.osmocom.org/11429 ) Change subject: RSL_Emulation: Fail explicitly on ASP_IPA_EVENT_DOWN ...................................................................... RSL_Emulation: Fail explicitly on ASP_IPA_EVENT_DOWN Otherwise RSL layer fails this way when this event is received: RSL_Emulation.ttcn:429 Receive operation on port IPA_PT succeeded, message from TC_chan_act_a51-RSL-IPA(3): @IPA_Emulation.ASP_IPA_Event: { up_down := ASP_IPA_EVENT_DOWN (0) } id 9 - Function main_client was stopped. PTC terminates. RSL_Emulation.ttcn:429 Message with id 9 was extracted from the queue of IPA_PT. RSL_Emulation.ttcn:430 setverdict(fail): none -> fail reason: "Received unknown primitive from IPA", new component reason: "Received unknown primitive from IPA" We now fail with a clearer message "Lost IPA connection!". These failures seem to happen under high load when the BTS doesn't get a steady clock from osmo-trx. Change-Id: Idc6565c9de72d98015d56a41e5616c46051c8a8d --- M library/RSL_Emulation.ttcn 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/11429/3 -- To view, visit https://gerrit.osmocom.org/11429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idc6565c9de72d98015d56a41e5616c46051c8a8d Gerrit-Change-Number: 11429 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 10:58:52 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 24 Oct 2018 10:58:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11451 Change subject: Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling ...................................................................... Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling This function can now be called from anywhere to try and safely shutdown a testcase. It is not optimal as we can't call "all component.stop" from outside the mtc, but without any proper and orderly shutdown handling of all our emulation components I believe this is the best we can do. To use it: import from Misc_Helpers all; in your module and then call Misc_Helpers.f_shutdown(); You can pass the function a verdict and a message and it will take care of calling setverdict, but beware of the following: 1. The file/line of the verdict is always pointing to the f_shutdown function. 2. While setverdict would accept any number of arguments as log message and convert them to a log string f_shutdown expects one charstring. It's possible to use the log2str function to use the log arguments in setverdict for f_shutdown, for example setverdict(fail, "Template didn't match: ", tmpl_foo); would become Misc_Helpers.f_shutdown(fail, log2str("Template didn't match: ", tmpl_foo)); Change-Id: I84d1aa6732f6b748d2bfdeac8f6309023717f267 --- M bsc-nat/gen_links.sh M bsc/gen_links.sh M ggsn_tests/gen_links.sh M hlr/gen_links.sh M lapdm/gen_links.sh A library/Misc_Helpers.ttcn M mgw/gen_links.sh M msc/gen_links.sh M pcu/gen_links.sh M sccp/gen_links.sh M selftest/gen_links.sh M sgsn/gen_links.sh M sip/gen_links.sh M sysinfo/gen_links.sh 14 files changed, 38 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/11451/1 diff --git a/bsc-nat/gen_links.sh b/bsc-nat/gen_links.sh index 453d8ca..1ab54f1 100755 --- a/bsc-nat/gen_links.sh +++ b/bsc-nat/gen_links.sh @@ -47,7 +47,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn BSSMAP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn BSSAP_CodecPort.ttcn" +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn BSSMAP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn BSSAP_CodecPort.ttcn" gen_links $DIR $FILES ignore_pp_results diff --git a/bsc/gen_links.sh b/bsc/gen_links.sh index 88983d7..bf10761 100755 --- a/bsc/gen_links.sh +++ b/bsc/gen_links.sh @@ -67,7 +67,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn BSSMAP_Emulation.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn BSSAP_Adapter.ttcn Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn" +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn BSSMAP_Emulation.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn BSSAP_Adapter.ttcn Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn" gen_links $DIR $FILES ignore_pp_results diff --git a/ggsn_tests/gen_links.sh b/ggsn_tests/gen_links.sh index 4e012ae..82e35d4 100755 --- a/ggsn_tests/gen_links.sh +++ b/ggsn_tests/gen_links.sh @@ -45,7 +45,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn " FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Templates.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " gen_links $DIR $FILES diff --git a/hlr/gen_links.sh b/hlr/gen_links.sh index f9e80c5..872820d 100755 --- a/hlr/gen_links.sh +++ b/hlr/gen_links.sh @@ -36,7 +36,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp GSUP_Types.ttcn GSUP_Emulation.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp GSUP_Types.ttcn GSUP_Emulation.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " FILES+="SS_Templates.ttcn USSD_Helpers.ttcn " diff --git a/lapdm/gen_links.sh b/lapdm/gen_links.sh index 6236edd..12830dd 100755 --- a/lapdm/gen_links.sh +++ b/lapdm/gen_links.sh @@ -14,7 +14,7 @@ DIR=../library -FILES="General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn RLCMAC_CSN1_Types.ttcn Osmocom_Types.ttcn L1CTL_PortType.ttcn L1CTL_PortType_CtrlFunct.ttcn L1CTL_PortType_CtrlFunctDef.cc L1CTL_Types.ttcn LAPDm_RAW_PT.ttcn LAPDm_Types.ttcn RLCMAC_Types.ttcn RLCMAC_EncDec.cc" +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn RLCMAC_CSN1_Types.ttcn Osmocom_Types.ttcn L1CTL_PortType.ttcn L1CTL_PortType_CtrlFunct.ttcn L1CTL_PortType_CtrlFunctDef.cc L1CTL_Types.ttcn LAPDm_RAW_PT.ttcn LAPDm_Types.ttcn RLCMAC_Types.ttcn RLCMAC_EncDec.cc" gen_links $DIR $FILES ignore_pp_results diff --git a/library/Misc_Helpers.ttcn b/library/Misc_Helpers.ttcn new file mode 100644 index 0000000..0060776 --- /dev/null +++ b/library/Misc_Helpers.ttcn @@ -0,0 +1,25 @@ +module Misc_Helpers { + +/* Try to properly shutdown a testcase. + * The reliable method to stop a testcase without running into dynamic + * testcase errors due to unconnected ports receiving messages is to call + * all component.stop before terminating. However, this can only be called + * from the mtc! So in case we want to terminate from a component that is not + * the mtc we try to do the next best thing which is calling mtc.stop and + * hoping for the best. + */ +function f_shutdown(verdicttype verdict := none, charstring text := "") { + if (verdict != none) { + setverdict(verdict, text); + } + + if (self == mtc) { + /* Properly stop all ports before disconnecting them. This avoids + * running into the dynamic testcase error due to messages arriving on + * unconnected ports. */ + all component.stop; + } + mtc.stop +} + +} diff --git a/mgw/gen_links.sh b/mgw/gen_links.sh index 9e88f17..8b2def7 100755 --- a/mgw/gen_links.sh +++ b/mgw/gen_links.sh @@ -30,7 +30,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn Osmocom_Types.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc " FILES+="RTP_CodecPort.ttcn RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_Emulation.ttcn IuUP_EncDec.cc " gen_links $DIR $FILES diff --git a/msc/gen_links.sh b/msc/gen_links.sh index df646d9..5d73fea 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -86,7 +86,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn MNCC_Types.ttcn MNCC_EncDec.cc MNCC_CodecPort.ttcn mncc.h MNCC_Emulation.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn MNCC_Types.ttcn MNCC_EncDec.cc MNCC_CodecPort.ttcn mncc.h MNCC_Emulation.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc GSUP_Types.ttcn GSUP_Emulation.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn L3_Templates.ttcn L3_Common.ttcn " FILES+="BSSMAP_Emulation.ttcn BSSAP_CodecPort.ttcn BSSMAP_Templates.ttcn BSSAP_Adapter.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_Emulation.ttcn " diff --git a/pcu/gen_links.sh b/pcu/gen_links.sh index 06ed606..6f33433 100755 --- a/pcu/gen_links.sh +++ b/pcu/gen_links.sh @@ -46,7 +46,7 @@ DIR=../library -FILES="General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc L1CTL_Types.ttcn L1CTL_PortType.ttcn L1CTL_PortType_CtrlFunct.ttcn L1CTL_PortType_CtrlFunctDef.cc LAPDm_RAW_PT.ttcn LAPDm_Types.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc L1CTL_Types.ttcn L1CTL_PortType.ttcn L1CTL_PortType_CtrlFunct.ttcn L1CTL_PortType_CtrlFunctDef.cc LAPDm_RAW_PT.ttcn LAPDm_Types.ttcn " FILES+="NS_Emulation.ttcn NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc " FILES+="BSSGP_Emulation.ttcn Osmocom_Gb_Types.ttcn " FILES+="LLC_Templates.ttcn L3_Templates.ttcn L3_Common.ttcn " diff --git a/sccp/gen_links.sh b/sccp/gen_links.sh index faf347c..614e0f1 100755 --- a/sccp/gen_links.sh +++ b/sccp/gen_links.sh @@ -52,7 +52,7 @@ DIR=../library -FILES="General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn " FILES+="Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " diff --git a/selftest/gen_links.sh b/selftest/gen_links.sh index 73b812d..09d2f26 100755 --- a/selftest/gen_links.sh +++ b/selftest/gen_links.sh @@ -39,7 +39,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn BSSAP_CodecPort.ttcn Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn GSUP_Types.ttcn" +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn BSSAP_CodecPort.ttcn Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn GSUP_Types.ttcn" gen_links $DIR $FILES ignore_pp_results diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh index 1c3fb1d..fe09726 100755 --- a/sgsn/gen_links.sh +++ b/sgsn/gen_links.sh @@ -54,7 +54,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc " +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc " FILES+="NS_Emulation.ttcn NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc " FILES+="BSSGP_Emulation.ttcn Osmocom_Gb_Types.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " diff --git a/sip/gen_links.sh b/sip/gen_links.sh index 37c0a70..cf09731 100755 --- a/sip/gen_links.sh +++ b/sip/gen_links.sh @@ -39,7 +39,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn MNCC_Types.ttcn MNCC_EncDec.cc MNCC_CodecPort.ttcn mncc.h MNCC_Emulation.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn MNCC_Types.ttcn MNCC_EncDec.cc MNCC_CodecPort.ttcn mncc.h MNCC_Emulation.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunctDef.cc " diff --git a/sysinfo/gen_links.sh b/sysinfo/gen_links.sh index 314b3b1..f44350a 100755 --- a/sysinfo/gen_links.sh +++ b/sysinfo/gen_links.sh @@ -21,7 +21,7 @@ gen_links $DIR $FILES DIR=../library -FILES="GSMTAP_PortType.ttcn GSMTAP_Types.ttcn GSM_SystemInformation.ttcn GSM_RR_Types.ttcn RLCMAC_CSN1_Types.ttcn GSM_Types.ttcn IPL4_GSMTAP_CtrlFunct.ttcn IPL4_GSMTAP_CtrlFunctDef.cc Osmocom_Types.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn" +FILES="GSMTAP_PortType.ttcn GSMTAP_Types.ttcn GSM_SystemInformation.ttcn GSM_RR_Types.ttcn RLCMAC_CSN1_Types.ttcn GSM_Types.ttcn IPL4_GSMTAP_CtrlFunct.ttcn IPL4_GSMTAP_CtrlFunctDef.cc Osmocom_Types.ttcn Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn" gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/11451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I84d1aa6732f6b748d2bfdeac8f6309023717f267 Gerrit-Change-Number: 11451 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 10:58:52 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 24 Oct 2018 10:58:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: Use Misc_Helpers.f_shutdown consistently Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11452 Change subject: BTS_Tests: Use Misc_Helpers.f_shutdown consistently ...................................................................... BTS_Tests: Use Misc_Helpers.f_shutdown consistently Replace all calls to setverdict(fail) with f_shutdown() since I'd rather fail and stop early in case we encounter an error. Only replace setverdict(pass) with f_shutdown() if it is followed by mtc.stop Remove internal function f_shutdown and use the one from Misc_Helpers Change-Id: Ia8b01a1876e969d6f0760ea625e4df83af4f54ca --- M bts/BTS_Tests.ttcn M bts/gen_links.sh 2 files changed, 131 insertions(+), 208 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/11452/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index fe0a933..38cfe78 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1,5 +1,6 @@ module BTS_Tests { +import from Misc_Helpers all; import from General_Types all; import from GSM_Types all; import from GSM_RR_Types all; @@ -270,8 +271,7 @@ pcu_last_info := sd.data; } [] pt.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(?, ?, ?))) -> value sd { - setverdict(fail, "Invalid PCU Version/BTS Number received"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Invalid PCU Version/BTS Number received"); } } @@ -289,8 +289,7 @@ alt { [] as_pcu_info_ind(pt, pcu_conn_id, pcu_last_info); [] T.timeout { - setverdict(fail, "Timeout waiting for PCU INFO_IND"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Timeout waiting for PCU INFO_IND"); } } } @@ -341,8 +340,7 @@ alt { [] RSL_CCHAN.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_UP}); [] T.timeout { - setverdict(fail, "Timeout waiting for ASP_IPA_EVENT_UP"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Timeout waiting for ASP_IPA_EVENT_UP"); } } f_sleep(0.5); /* workaround for OS#3000 */ @@ -366,12 +364,6 @@ } } -function f_shutdown() runs on test_CT { - /* mtc.stop cleanly stops testcase execution to avoid unclean shutdown */ - all component.stop; - mtc.stop; -} - /* Attach L1CTL to master test_CT (classic tests, non-handler mode) */ function f_init_l1ctl() runs on test_CT { map(self:L1CTL, system:L1CTL); @@ -415,8 +407,7 @@ private altstep as_Tguard() runs on ConnHdlr { [] g_Tguard.timeout { - setverdict(fail, "Tguard timeout"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Tguard timeout"); } } @@ -430,8 +421,7 @@ res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BB_TRXC, mp_bb_trxc_ip, mp_bb_trxc_port, "", -1, -1, {udp:={}}, {}); if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect to trx-control interface of trxcon, check your configuration"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Could not connect to trx-control interface of trxcon, check your configuration"); } g_bb_trxc_conn_id := res.connId; } @@ -481,15 +471,13 @@ setverdict(pass); } [] T.timeout { - setverdict(fail, "Timeout expecting " & id); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Timeout expecting " & id); } [not ignore_other] as_l1_sacch(); [not ignore_other] as_meas_res(); [not ignore_other] as_l1_dcch(); [not ignore_other] RSL.receive { - setverdict(fail, "Unexpected RSL message received"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Unexpected RSL message received"); } [ignore_other] RSL.receive { repeat; } } @@ -566,7 +554,7 @@ f_init(testcasename()); vc_conn := f_start_handler(refers(f_TC_chan_act_stress), pars); vc_conn.done; - f_shutdown(); + Misc_Helpers.f_shutdown(); } /* Test if re-activation of an already active channel fails as expected */ @@ -576,8 +564,7 @@ RSL.send(ts_RSL_CHAN_ACT(g_chan_nr, g_pars.chan_mode)); alt { [] RSL.receive(tr_RSL_CHAN_ACT_ACK(g_chan_nr)) { - setverdict(fail, "Unexpected CHAN ACT ACK on double activation"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Unexpected CHAN ACT ACK on double activation"); } [] RSL.receive(tr_RSL_CHAN_ACT_NACK(g_chan_nr)) { setverdict(pass); @@ -591,7 +578,7 @@ f_init(); vc_conn := f_start_handler(refers(f_TC_chan_act_react), pars); vc_conn.done; - f_shutdown(); + Misc_Helpers.f_shutdown(); } /* Attempt to de-activate a channel that's not active */ @@ -604,8 +591,7 @@ setverdict(pass); } [] T.timeout { - setverdict(fail, "Timeout expecting RF_CHAN_REL_ACK"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Timeout expecting RF_CHAN_REL_ACK"); } } } @@ -614,7 +600,7 @@ f_init(); var ConnHdlr vc_conn := f_start_handler(refers(f_TC_chan_deact_not_active), pars); vc_conn.done; - f_shutdown(); + Misc_Helpers.f_shutdown(); } /* attempt to activate channel with wrong RSL Channel Nr IE; expect NACK */ @@ -622,8 +608,7 @@ RSL.send(ts_RSL_CHAN_ACT(g_chan_nr, g_pars.chan_mode)); alt { [] RSL.receive(tr_RSL_CHAN_ACT_ACK(g_chan_nr)) { - setverdict(fail, "Unexpected CHAN ACT ACK"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Unexpected CHAN ACT ACK"); } [] RSL.receive(tr_RSL_CHAN_ACT_NACK(g_chan_nr)) { setverdict(pass); @@ -667,7 +652,7 @@ vc_conn := f_start_handler(refers(f_TC_chan_act_wrong_nr), pars); vc_conn.done; } - f_shutdown(); + Misc_Helpers.f_shutdown(); } /* execute the same callback function on a variety of logical channels */ @@ -684,7 +669,7 @@ vc_conn.done; } - f_shutdown(); + Misc_Helpers.f_shutdown(); } /*********************************************************************** @@ -696,8 +681,7 @@ T_sacch.start; alt { [not exp] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(0))) { - setverdict(fail, "Received SACCH when not expecting it"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Received SACCH when not expecting it"); } [not exp] T_sacch.timeout { setverdict(pass); @@ -706,8 +690,7 @@ setverdict(pass); } [exp] T_sacch.timeout { - setverdict(fail, "Timeout waiting for SACCH on ", g_chan_nr); - mtc.stop; + Misc_Helpers.f_shutdown(fail, log2str("Timeout waiting for SACCH on ", g_chan_nr)); } [] L1CTL.receive { repeat; } [] RSL.receive { repeat; } @@ -750,7 +733,7 @@ vc_conn.done; } /* TODO: do the above in parallel, rather than sequentially? */ - f_shutdown(); + Misc_Helpers.f_shutdown(); } /* verify that given SACCH payload is present */ @@ -771,8 +754,7 @@ } [] L1CTL.receive { repeat; } [] T_sacch.timeout { - setverdict(fail, "Timeout waiting for SACCH ", l3_exp); - mtc.stop; + Misc_Helpers.f_shutdown(fail, log2str("Timeout waiting for SACCH ", l3_exp)); } } } @@ -788,8 +770,7 @@ [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(0))) -> value dl { var octetstring l3 := substr(dl.payload.data_ind.payload, 4, 19); if (match(l3, l3_exp)) { - setverdict(fail, "Received unexpected SACCH ", dl); - mtc.stop; + Misc_Helpers.f_shutdown(fail, log2str("Received unexpected SACCH ", dl)); } else { repeat; } @@ -832,7 +813,7 @@ vc_conn.done; } /* TODO: do the above in parallel, rather than sequentially? */ - f_shutdown(); + Misc_Helpers.f_shutdown(); } /* Test for lchan-specific SACCH INFO MODIFY (TS 48.058 4.12) */ @@ -880,7 +861,7 @@ vc_conn.done; } /* TODO: do the above in parallel, rather than sequentially? */ - f_shutdown(); + Misc_Helpers.f_shutdown(); } /* Test SACCH scheduling of multiple different SI message types */ @@ -923,7 +904,7 @@ vc_conn.done; } /* TODO: do the above in parallel, rather than sequentially? */ - f_shutdown(); + Misc_Helpers.f_shutdown(); } /* Test if SACH information is modified as expected */ @@ -969,7 +950,7 @@ vc_conn.done; } /* TODO: do the above in parallel, rather than sequentially? */ - f_shutdown(); + Misc_Helpers.f_shutdown(); } /* TODO: Test for SACCH information present in RSL CHAN ACT (overrides FILLING) */ @@ -1017,8 +998,7 @@ var OCT1 ra := f_rnd_ra_cs(); var GsmFrameNumber fn := f_L1CTL_RACH(L1CTL, oct2int(ra)); if (fn == fn_last) { - setverdict(fail, "Two RACH in same FN?!?"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Two RACH in same FN?!?"); } fn_last := fn; @@ -1029,18 +1009,16 @@ T.stop; } [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(?, ?, ?))) { - setverdict(fail, "Unexpected CHAN RQD"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Unexpected CHAN RQD"); } [] RSL_CCHAN.receive { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for CHAN RQD"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Timeout waiting for CHAN RQD"); } } } setverdict(pass); - f_shutdown(); + Misc_Helpers.f_shutdown(); } /* Send 1000 RACH Requests (flood ~ 89/s) and count if count(Abis) == count(Um) */ @@ -1055,8 +1033,7 @@ var OCT1 ra := f_rnd_ra_cs(); var GsmFrameNumber fn := f_L1CTL_RACH(L1CTL, oct2int(ra)); if (fn == fn_last) { - setverdict(fail, "Two RACH in same FN?!?"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Two RACH in same FN?!?"); } fn_last := fn; } @@ -1075,9 +1052,9 @@ if (rsl_chrqd == 1000) { setverdict(pass); } else { - setverdict(fail, "Received only ", rsl_chrqd, " out of 1000 RACH"); + Misc_Helpers.f_shutdown(fail, log2str("Received only ", rsl_chrqd, " out of 1000 RACH")); } - f_shutdown(); + Misc_Helpers.f_shutdown(); } private function f_main_trxc_connect() runs on test_CT { @@ -1086,8 +1063,7 @@ res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BB_TRXC, mp_bb_trxc_ip, mp_bb_trxc_port, "", -1, -1, {udp:={}}, {}); if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect to trx-control interface of trxcon, check your configuration"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Could not connect to trx-control interface of trxcon, check your configuration"); } g_bb_trxc_conn_id := res.connId; } @@ -1110,16 +1086,14 @@ setverdict(pass); } [not expect_pass] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(ra, fn))) { - setverdict(fail, "RACH passed but was expected to be dropped: ", toffs256); - mtc.stop; + Misc_Helpers.f_shutdown(fail, log2str("RACH passed but was expected to be dropped: ", toffs256)); } [] RSL_CCHAN.receive { repeat; } [not expect_pass] T.timeout { setverdict(pass); } [expect_pass] T.timeout { - setverdict(fail, "Timeout waiting for CHAN RQD"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Timeout waiting for CHAN RQD"); } } } @@ -1146,7 +1120,7 @@ /* more than 63 bits is not legal / permitted */ f_rach_toffs(64*256, false); f_rach_toffs(127*256, false); - f_shutdown(); + Misc_Helpers.f_shutdown(); } /*********************************************************************** @@ -1322,17 +1296,14 @@ g_first_meas_res := false; repeat; } else { - setverdict(fail, "Received unspecific MEAS RES ", rsl); - mtc.stop; + Misc_Helpers.f_shutdown(fail, log2str("Received unspecific MEAS RES ", rsl)); } } [] RSL.receive(tr_RSL_MEAS_RES(?)) -> value rsl { - setverdict(fail, "Received unexpected MEAS RES ", rsl); - mtc.stop; + Misc_Helpers.f_shutdown(fail, log2str("Received unexpected MEAS RES ", rsl)); } [g_Tmeas_exp.running] g_Tmeas_exp.timeout { - setverdict(fail, "Didn't receive expected measurement result") - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Didn't receive expected measurement result") } } @@ -1347,7 +1318,9 @@ case (RSL_ALG_ID_A5_6) { return 6; } case (RSL_ALG_ID_A5_7) { return 7; } case else { - setverdict(fail, "Unknwon Algorithm ID"); + Misc_Helpers.f_shutdown(fail, "Unknwon Algorithm ID"); + /* Make compiler happy by calling mtc.stop here. It is already + * called in f_shutdown */ mtc.stop; } } @@ -1363,7 +1336,9 @@ case (RSL_ALG_ID_A5_6) { return '101'B; } case (RSL_ALG_ID_A5_7) { return '110'B; } case else { - setverdict(fail, "Unknwon Algorithm ID"); + Misc_Helpers.f_shutdown(fail, "Unknwon Algorithm ID"); + /* Make compiler happy by calling mtc.stop here. It is already + * called in f_shutdown */ mtc.stop; } } @@ -1435,13 +1410,12 @@ [] as_l1_dcch(); [] L1CTL.receive { repeat; } [g_Tmeas_exp.running] T.timeout { - /* as_meas_res() would have done setverdict(fail) / mtc.stop in case + /* as_meas_res() would have done Misc_Helpers.f_shutdown(fail) in case * of any earlier errors, so if we reach this timeout, we're good */ setverdict(pass); } [] T.timeout { - setverdict(fail, "No MEAS RES received at all"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "No MEAS RES received at all"); } } f_rsl_chan_deact(); @@ -1457,7 +1431,7 @@ vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars); vc_conn.done; } - f_shutdown(); + Misc_Helpers.f_shutdown(); } testcase TC_meas_res_sign_tchh() runs on test_CT { var ConnHdlr vc_conn; @@ -1468,7 +1442,7 @@ vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars); vc_conn.done; } - f_shutdown(); + Misc_Helpers.f_shutdown(); } testcase TC_meas_res_sign_sdcch4() runs on test_CT { var ConnHdlr vc_conn; @@ -1479,7 +1453,7 @@ vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars); vc_conn.done; } - f_shutdown(); + Misc_Helpers.f_shutdown(); } testcase TC_meas_res_sign_sdcch8() runs on test_CT { var ConnHdlr vc_conn; @@ -1490,7 +1464,7 @@ vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars); vc_conn.done; } - f_shutdown(); + Misc_Helpers.f_shutdown(); } testcase TC_meas_res_sign_tchh_toa256() runs on test_CT { var ConnHdlr vc_conn; @@ -1503,7 +1477,7 @@ vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars); vc_conn.done; } - f_shutdown(); + Misc_Helpers.f_shutdown(); } @@ -1524,8 +1498,7 @@ } [] RSL.receive { repeat }; [] T.timeout { - setverdict(fail, "No CONN FAIL IND received"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "No CONN FAIL IND received"); } } f_rsl_chan_deact(); @@ -1570,8 +1543,7 @@ fn_check.frame_nr := frame_nr_51; if (bs_ag_blks_res < 0 or bs_ag_blks_res > 7) { - setverdict(fail, "bs_ag_blks_res out of valid range (0..7)"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "bs_ag_blks_res out of valid range (0..7)"); return; } @@ -1600,8 +1572,7 @@ return; } - setverdict(fail, "received paging on AGCH"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "received paging on AGCH"); return; } @@ -1716,8 +1687,7 @@ repeat; } [not cfg.exp_overload] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_PAGING_LOAD_IND(0))) { - setverdict(fail, "Unexpected PCH Overload"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Unexpected PCH Overload"); } [cfg.exp_load_ind] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_PAGING_LOAD_IND)) { log("Rx LOAD_IND"); @@ -1775,8 +1745,7 @@ [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_PAGING_LOAD_IND(65535))) { } [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_PAGING_LOAD_IND)) { repeat; } [] T_wait.timeout { - setverdict(fail, "Waiting for empty paging queue"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Waiting for empty paging queue"); } [] as_rsl_res_ind(); } @@ -1802,12 +1771,12 @@ }; var PagingTestState st := f_TC_paging(cfg); if (st.num_paging_sent != st.num_paging_rcv_ids) { - setverdict(fail, "Expected ", st.num_paging_sent, " pagings but have ", - st.num_paging_rcv_ids); + Misc_Helpers.f_shutdown(fail, log2str("Expected ", st.num_paging_sent, " pagings but have ", + st.num_paging_rcv_ids)); } else { setverdict(pass); } - f_shutdown(); + Misc_Helpers.f_shutdown(); } /* Create ~ 80% paging load (TMSI only) sustained for about 20s, verifying that @@ -1826,12 +1795,12 @@ }; var PagingTestState st := f_TC_paging(cfg); if (st.num_paging_sent != st.num_paging_rcv_ids) { - setverdict(fail, "Expected ", st.num_paging_sent, " pagings but have ", - st.num_paging_rcv_ids); + Misc_Helpers.f_shutdown(fail, log2str("Expected ", st.num_paging_sent, " pagings but have ", + st.num_paging_rcv_ids)); } else { setverdict(pass); } - f_shutdown(); + Misc_Helpers.f_shutdown(); } /* Create ~ 200% paging load (IMSI only) sustained for about 20s, verifying that @@ -1853,11 +1822,11 @@ * slots and will fully drain that buffer before returning */ var template integer tpl := (st.num_paging_sent*78/100 .. st.num_paging_sent *85/100); if (not match(st.num_paging_rcv_ids, tpl)) { - setverdict(fail, "Expected ", tpl, " pagings but have ", st.num_paging_rcv_ids); + Misc_Helpers.f_shutdown(fail, log2str("Expected ", tpl, " pagings but have ", st.num_paging_rcv_ids)); } else { setverdict(pass); } - f_shutdown(); + Misc_Helpers.f_shutdown(); } /* Create ~ 200% paging load (TMSI only) sustained for about 20s, verifying that @@ -1879,11 +1848,11 @@ * slots and will fully drain that buffer before returning */ var template integer tpl := (st.num_paging_sent*64/100 .. st.num_paging_sent *72/100); if (not match(st.num_paging_rcv_ids, tpl)) { - setverdict(fail, "Expected ", tpl, " pagings but have ", st.num_paging_rcv_ids); + Misc_Helpers.f_shutdown(fail, log2str("Expected ", tpl, " pagings but have ", st.num_paging_rcv_ids)); } else { setverdict(pass); } - f_shutdown(); + Misc_Helpers.f_shutdown(); } @@ -1946,8 +1915,7 @@ var GsmRrMessage rr := dec_GsmRrMessage(l1_dl.payload.data_ind.payload); if (not match(rr, tr_IMM_ASS(42, ?, 5, ?, ?))) { /* FIXME: Why are we seeing paging requests on PCH/AGCH? */ - //setverdict(fail, "Unexpected IMM-ASS values on AGCH: ", rr); - //mtc.stop; + //Misc_Helpers.f_shutdown(fail, log2str("Unexpected IMM-ASS values on AGCH: ", rr)); } else { num_rx := num_rx+1; } @@ -1959,16 +1927,15 @@ res_str := f_fmt_ia_stats(num_tx, num_rx, num_del); log("AGCH test: " & res_str); if (num_rx + num_del != num_tx) { - setverdict(fail, "RX + DEL != TX ?!?: " & res_str); - mtc.stop + Misc_Helpers.f_shutdown(fail, "RX + DEL != TX ?!?: " & res_str); } rx_ratio := int2float(num_rx) / int2float(num_tx); if (rx_ratio < exp_pass*0.8 or rx_ratio > exp_pass*1.2) { - setverdict(fail, "RX ratio ("&float2str(rx_ratio)&") far from expected ("&float2str(exp_pass)&") " & res_str); + Misc_Helpers.f_shutdown(fail, "RX ratio ("&float2str(rx_ratio)&") far from expected ("&float2str(exp_pass)&") " & res_str); } else { setverdict(pass); } - f_shutdown(); + Misc_Helpers.f_shutdown(); } /* send a long burst of 1000 IMM.ASS with 20ms spacing (50 per s); expect 75% of them to be deleted */ @@ -2021,8 +1988,7 @@ /* ensure a given TC slot of the SI vector contains given SI type at least once at TC */ function f_ensure_si_vec_contains(SystemInformationVectorPerTc arr, integer tc, RrMessageType key, boolean ext_bcch := false) { if (not f_si_vecslot_contains(arr[tc], key, ext_bcch)) { - setverdict(fail, "No ", key, " in TC=", tc, "!"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, log2str("No ", key, " in TC=", tc, "!")); } } @@ -2041,8 +2007,7 @@ function f_si_vecslot_contains_n_of_m(SystemInformationVector arr, RrMessageType key, boolean bcch_ext := false, integer n := 1, integer m := 4) return boolean { var integer count := 0; if (sizeof(arr) < m) { - setverdict(fail, "Error: Insufficient SI in array"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Error: Insufficient SI in array"); } for (var integer i:= 0; i < m; i := i + 1) { var integer fn_mod51 := arr[i].frame_number mod 51; @@ -2063,8 +2028,7 @@ /* ensure a given TC slot of the SI vector contains given SI type at least N out of M times at TC */ function f_ensure_si_vec_contains_n_of_m(SystemInformationVectorPerTc arr, integer tc, RrMessageType key, boolean ext_bcch := false, integer n, integer m) { if (not f_si_vecslot_contains_n_of_m(arr[tc], key, ext_bcch, n, m)) { - setverdict(fail, "Not ", n, "/", m, " of ", key, " in TC=", tc, "!"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, log2str("Not ", n, "/", m, " of ", key, " in TC=", tc, "!")); } } @@ -2085,8 +2049,7 @@ /* ensure a given TC slot of the SI vector contains only given SI type */ function f_ensure_si_vec_contains_only(SystemInformationVectorPerTc arr, integer tc, RrMessageType key, boolean ext_bcch := false) { if (not f_si_vecslot_contains_only(arr[tc], key, ext_bcch)) { - setverdict(fail, "Not all ", key, " in TC=", tc, "!"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, log2str("Not all ", key, " in TC=", tc, "!")); } } @@ -2115,8 +2078,7 @@ var integer i; for (i := 0; i < sizeof(si_per_tc); i := i + 1) { if (sizeof(si_per_tc[i]) == 0) { - setverdict(fail, "No SI messages for TC=", i); - mtc.stop; + Misc_Helpers.f_shutdown(fail, log2str("No SI messages for TC=", i)); } } if (cfg.si1_present) { @@ -2198,8 +2160,7 @@ f_ensure_si_vec_contains(si_per_tc, 0, SYSTEM_INFORMATION_TYPE_13, true); } if (f_si_vec_contains(si_per_tc, SYSTEM_INFORMATION_TYPE_13alt)) { - setverdict(fail, "Cannot have SI13alt and SI13"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Cannot have SI13alt and SI13"); } } if (cfg.si16_present or cfg.si17_present) { @@ -2209,8 +2170,7 @@ testcase.stop("Error: Cannot have SI16/SI17 and SI22!"); } if (f_si_vec_contains(si_per_tc, SYSTEM_INFORMATION_TYPE_22)) { - setverdict(fail, "Cannot have SI16/SI17 and SI22!"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Cannot have SI16/SI17 and SI22!"); } if (not cfg.bcch_extended) { testcase.stop("Error: SI16/SI17 requires BCCH Extd!"); @@ -2255,8 +2215,7 @@ testcase.stop("Error: Cannot have SI13alt and SI13"); } if (f_si_vec_contains(si_per_tc, SYSTEM_INFORMATION_TYPE_13)) { - setverdict(fail, "Cannot have SI13alt and SI13"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Cannot have SI13alt and SI13"); } if (not cfg.bcch_extended) { f_ensure_si_vec_contains_n_of_m(si_per_tc, 4, SYSTEM_INFORMATION_TYPE_13alt, false, 1, 4); @@ -2287,8 +2246,7 @@ } else { f_ensure_si_vec_contains_n_of_m(si_per_tc, 4, SYSTEM_INFORMATION_TYPE_21, true, 1, 4); if (f_si_vecslot_contains(si_per_tc[4], SYSTEM_INFORMATION_TYPE_21)) { - setverdict(fail, "Cannot have SI21 on BCCH Norm if BCCH Extd enabled!"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Cannot have SI21 on BCCH Norm if BCCH Extd enabled!"); } } } @@ -2302,8 +2260,7 @@ } if (f_si_vec_contains(si_per_tc, SYSTEM_INFORMATION_TYPE_16) or f_si_vec_contains(si_per_tc, SYSTEM_INFORMATION_TYPE_17)) { - setverdict(fail, "Cannot have SI16/SI17 and SI22!"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Cannot have SI16/SI17 and SI22!"); } if (not cfg.bcch_extended) { testcase.stop("Error: SI22 requires BCCH Extd!"); @@ -2375,7 +2332,7 @@ f_init(); /* 2+3+4 are mandatory and set in f_init() */ f_TC_si_sched(); - f_shutdown(); + Misc_Helpers.f_shutdown(); } testcase TC_si_sched_1() runs on test_CT { @@ -2383,7 +2340,7 @@ si_cfg.si1_present := true; f_rsl_bcch_fill_raw(RSL_SYSTEM_INFO_1, '5506198fb38000000000000000000000000000e504002b'O); f_TC_si_sched(); - f_shutdown(); + Misc_Helpers.f_shutdown(); } testcase TC_si_sched_2bis() runs on test_CT { @@ -2391,7 +2348,7 @@ si_cfg.si2bis_present := true; f_rsl_bcch_fill_raw(RSL_SYSTEM_INFO_2bis, '550602bfe809b3ff00000000000000000000007900002b'O); f_TC_si_sched(); - f_shutdown(); + Misc_Helpers.f_shutdown(); } testcase TC_si_sched_2ter() runs on test_CT { @@ -2399,7 +2356,7 @@ si_cfg.si2ter_present := true; f_rsl_bcch_fill_raw(RSL_SYSTEM_INFO_2ter, '010603bf66b0aa0a00000002000000000000002b2b2b2b'O); f_TC_si_sched(); - f_shutdown(); + Misc_Helpers.f_shutdown(); } testcase TC_si_sched_2ter_2bis() runs on test_CT { @@ -2409,7 +2366,7 @@ si_cfg.si2ter_present := true; f_rsl_bcch_fill_raw(RSL_SYSTEM_INFO_2ter, '010603bf66b0aa0a00000002000000000000002b2b2b2b'O); f_TC_si_sched(); - f_shutdown(); + Misc_Helpers.f_shutdown(); } testcase TC_si_sched_2quater() runs on test_CT { @@ -2417,7 +2374,7 @@ si_cfg.si2quater_present := true; f_rsl_bcch_fill_raw(RSL_SYSTEM_INFO_2quater, '050607a8a0364aa698d72ff424feee0506d5e7fff02043'O); f_TC_si_sched(); - f_shutdown(); + Misc_Helpers.f_shutdown(); } testcase TC_si_sched_13() runs on test_CT { @@ -2425,7 +2382,7 @@ si_cfg.si13_present := true; f_rsl_bcch_fill_raw(RSL_SYSTEM_INFO_13, '0106009000185a6fc9e08410ab2b2b2b2b2b2b2b2b2b2b'O); f_TC_si_sched(); - f_shutdown(); + Misc_Helpers.f_shutdown(); } testcase TC_si_sched_13_2bis_2ter_2quater() runs on test_CT { @@ -2439,7 +2396,7 @@ si_cfg.si13_present := true; f_rsl_bcch_fill_raw(RSL_SYSTEM_INFO_13, '0106009000185a6fc9e08410ab2b2b2b2b2b2b2b2b2b2b'O); f_TC_si_sched(); - f_shutdown(); + Misc_Helpers.f_shutdown(); } @@ -2449,7 +2406,7 @@ //ts_RSL_BCCH_INFO(si_type, info); /* expect no ERROR REPORT after either of them * /* negative test: ensure ERROR REPORT on unsupported types */ - f_shutdown(); + Misc_Helpers.f_shutdown(); } /*********************************************************************** @@ -2464,15 +2421,13 @@ setverdict(pass); } [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_ERROR_REPORT(?))) { - setverdict(fail, "Wrong cause in RSL ERR REP"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Wrong cause in RSL ERR REP"); } [] RSL_CCHAN.receive { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for RSL ERR REP"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Timeout waiting for RSL ERR REP"); } } } @@ -2618,8 +2573,7 @@ T.start; alt { [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RTS_REQ(bts_nr))) { - setverdict(fail, "PCU RTS.req before PDCH active?"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "PCU RTS.req before PDCH active?"); } [] PCU.receive { repeat; } [] T.timeout { } @@ -2636,17 +2590,14 @@ } [not exp_success] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RTS_REQ(bts_nr, trx_nr, ts_nr))) { - setverdict(fail, "Unexpected RTS.req for supposedly failing activation"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Unexpected RTS.req for supposedly failing activation"); } [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RTS_REQ)) { - setverdict(fail, "RTS.req for wrong TRX/TS"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "RTS.req for wrong TRX/TS"); } [] PCU.receive { repeat; } [exp_success] T.timeout { - setverdict(fail, "Timeout waiting for PCU RTS.req"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Timeout waiting for PCU RTS.req"); } [not exp_success] T.timeout { setverdict(pass); @@ -2666,8 +2617,7 @@ T.start; alt { [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RTS_REQ(bts_nr, trx_nr, ts_nr))) { - setverdict(fail, "Received unexpected PCU RTS.req"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Received unexpected PCU RTS.req"); } [] PCU.receive { repeat; } [] T.timeout { @@ -2737,8 +2687,7 @@ } [] PCU.receive { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for SI13"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Timeout waiting for SI13"); } } } @@ -2771,8 +2720,7 @@ } [] PCU.receive { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for RTS.ind"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Timeout waiting for RTS.ind"); } } } @@ -2845,8 +2793,7 @@ } [] L1CTL.receive { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for PCU-originated AGCH block on Um"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Timeout waiting for PCU-originated AGCH block on Um"); } } } @@ -2870,8 +2817,7 @@ } [] L1CTL.receive { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for PCU-originated AGCH block on Um"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Timeout waiting for PCU-originated AGCH block on Um"); } } } @@ -2887,8 +2833,7 @@ var OCT1 ra := f_rnd_ra_ps(); var GsmFrameNumber fn := f_L1CTL_RACH(L1CTL, oct2int(ra)); if (fn == fn_last) { - setverdict(fail, "Two RACH in same FN?!?"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Two RACH in same FN?!?"); } fn_last := fn; @@ -2899,13 +2844,11 @@ T.stop; } [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RACH_IND)) { - setverdict(fail, "Unexpected RACH IND"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Unexpected RACH IND"); } [] PCU.receive { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for RACH IND"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Timeout waiting for RACH IND"); } } } @@ -2943,13 +2886,11 @@ [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_PAG_REQ(0, t_mi_lv))) { } [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_PAG_REQ)) { - setverdict(fail, "Unexpected PAGING REQ"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Unexpected PAGING REQ"); } [] PCU.receive { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for PAGING REQ"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Timeout waiting for PAGING REQ"); } } } @@ -2970,8 +2911,7 @@ alt { [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd { if (substr(sd.data.u.info_ind.trx[trx_nr].pdch_mask, g_chan_nr.tn, 1) != '1'B) { - setverdict(fail, "PCUIF_INFO_IND PDCH_MASK not '1' after PDCH ACT"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "PCUIF_INFO_IND PDCH_MASK not '1' after PDCH ACT"); } } [] PCU.receive { repeat; } @@ -2991,8 +2931,7 @@ alt { [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd { if (substr(sd.data.u.info_ind.trx[trx_nr].pdch_mask, g_chan_nr.tn, 1) != '0'B) { - setverdict(fail, "PCUIF_INFO_IND PDCH_MASK not '0' after PDCH DEACT"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "PCUIF_INFO_IND PDCH_MASK not '0' after PDCH DEACT"); } } [] PCU.receive { repeat; } @@ -3154,8 +3093,7 @@ alt { [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd { if (substr(sd.data.u.info_ind.trx[trx_nr].pdch_mask, g_chan_nr.tn, 1) != '1'B) { - setverdict(fail, "PCUIF_INFO_IND PDCH_MASK not '1' after PDCH ACT"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "PCUIF_INFO_IND PDCH_MASK not '1' after PDCH ACT"); } } [] PCU.receive { repeat; } @@ -3177,8 +3115,7 @@ alt { [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd { if (substr(sd.data.u.info_ind.trx[trx_nr].pdch_mask, g_chan_nr.tn, 1) != '0'B) { - setverdict(fail, "PCUIF_INFO_IND PDCH_MASK not '0' after PDCH DEACT"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "PCUIF_INFO_IND PDCH_MASK not '0' after PDCH DEACT"); } } [] PCU.receive { repeat; } @@ -3263,8 +3200,7 @@ alt { [] RSL.receive(tr_RSL_IPA_PDCH_ACT_NACK(g_chan_nr, ?)); [] RSL.receive(tr_RSL_IPA_PDCH_ACT_ACK(g_chan_nr, ?)) { - setverdict(fail, "Unexpected PDCH ACT ACK"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Unexpected PDCH ACT ACK"); } [] RSL.receive { repeat; } } @@ -3373,7 +3309,7 @@ } } - f_shutdown(); + Misc_Helpers.f_shutdown(); } /* test if SABM on Um triggers EST IND (TS 48.058 3.1) */ @@ -3395,23 +3331,20 @@ if (tc.exp) { setverdict(pass); } else { - setverdict(fail, "Unexpected EST IND with L3 in ", tc); - mtc.stop; + Misc_Helpers.f_shutdown(fail, log2str("Unexpected EST IND with L3 in ", tc)); } } [tc.l3 == ''O] RSL.receive(tr_RSL_EST_IND_NOL3(g_chan_nr, tc.link_id)) { if (tc.exp) { setverdict(pass); } else { - setverdict(fail, "Unexpected EST IND without L3 in ", tc); - mtc.stop; + Misc_Helpers.f_shutdown(fail, log2str("Unexpected EST IND without L3 in ", tc)); } } /* We also expect to receive the measurements */ [] as_meas_res(verify_meas := false); [tc.exp] T.timeout { - setverdict(fail, "Timeout waiting for EST IND"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Timeout waiting for EST IND"); } [not tc.exp] T.timeout { setverdict(pass); @@ -3472,8 +3405,7 @@ } [] L1CTL.receive { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for SABM"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Timeout waiting for SABM"); } } @@ -3527,8 +3459,7 @@ T.start; alt { [] T.timeout { - setverdict(fail, "Timeout waiting for LAPDm ", exp); - mtc.stop; + Misc_Helpers.f_shutdown(fail, log2str("Timeout waiting for LAPDm ", exp)); } [] as_l1_exp_lapdm(exp); } @@ -3543,8 +3474,7 @@ [l3 != ''O] RSL.receive(tr_RSL_EST_IND(g_chan_nr, link_id, l3)); [l3 == ''O] RSL.receive(tr_RSL_EST_IND_NOL3(g_chan_nr, link_id)); [] RSL.receive(tr_RSL_ERROR_IND(g_chan_nr, link_id, ?)) { - setverdict(fail, "Failing due to RSL_ERROR_IND"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Failing due to RSL_ERROR_IND"); } [] RSL.receive { repeat; } } @@ -3754,8 +3684,7 @@ private altstep as_rsl_any_ind(boolean exp_any) runs on ConnHdlr { [exp_any] RSL.receive { repeat; } [not exp_any] RSL.receive { - setverdict(fail, "Unexpected RSL message!"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Unexpected RSL message!"); } } @@ -3777,8 +3706,7 @@ [exp_sacch] as_meas_res(verify_meas := false); [] as_rsl_any_ind(exp_any); [] T.timeout { - setverdict(fail, "Timeout waiting for UNIT_DATA_IND"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Timeout waiting for UNIT_DATA_IND"); } } } @@ -3802,8 +3730,7 @@ [exp_sacch] as_meas_res(verify_meas := false); [] as_rsl_any_ind(exp_any); [] T.timeout { - setverdict(fail, "Timeout waiting for DATA_IND"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Timeout waiting for DATA_IND"); } } } @@ -3910,14 +3837,12 @@ if (ischosen(exp_match.ab)) { lf.ab := dec_LapdmFrameAB(enc); } else { - setverdict(fail, "unsupported frame type"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "unsupported frame type"); } /* check if decoder result matches expectation */ if (not match(lf, exp_match)) { - setverdict(fail, name, ": decoded LAPDm doesn't match"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, log2str(name, ": decoded LAPDm doesn't match")); } else { log(name, ": matched"); setverdict(pass); @@ -3926,8 +3851,7 @@ /* test if re-encoded frame equals original input */ reenc := enc_LapdmFrame(lf); if (enc != reenc) { - setverdict(fail, name, ": re-encoded LAPDm frame doesn't match"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, log2str(name, ": re-encoded LAPDm frame doesn't match")); } else { setverdict(pass); } @@ -4025,7 +3949,7 @@ T.stop; f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); - setverdict(fail, "Received fill frame on non-TCH/F channel; DTX is only allowed on TCH/F!"); + Misc_Helpers.f_shutdown(fail, "Received fill frame on non-TCH/F channel; DTX is only allowed on TCH/F!"); } if (fn > first_fn + frame_dtx_tchf_mod) { T.stop; @@ -4039,7 +3963,7 @@ if (nfill_frames_sacch + nfill_frames_nonsacch < expected_fill_frames) { log("received only ", nfill_frames_sacch, "+", nfill_frames_nonsacch, " (SACCH+other) out of ", expected_fill_frames, " expected fill frames"); - setverdict(fail, "Not enough fill frames received"); + Misc_Helpers.f_shutdown(fail, "Not enough fill frames received"); } else { setverdict(pass); } @@ -4063,7 +3987,7 @@ " (mod ", block_dtx_tchf_mod, ": ", fn mod block_dtx_tchf_mod, ")"); f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); - setverdict(fail, "Unexpected L2 fill frame received on Um"); + Misc_Helpers.f_shutdown(fail, "Unexpected L2 fill frame received on Um"); } } else { if (dl.dl_info.link_id.c == SACCH) { @@ -4086,7 +4010,7 @@ } else { f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); - setverdict(fail, "Unknown channel type"); + Misc_Helpers.f_shutdown(fail, "Unknown channel type"); } f_rsl_chan_deact(); @@ -4097,7 +4021,7 @@ } else { log("received only ", nfill_frames_sacch, "+", nfill_frames_nonsacch, " (SACCH+other) out of ", expected_fill_frames, " expected fill frames"); - setverdict(fail, "Not enough fill frames received"); + Misc_Helpers.f_shutdown(fail, "Not enough fill frames received"); } } else { repeat; @@ -4108,8 +4032,7 @@ [] T.timeout { f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); - setverdict(fail, "Timeout waiting for L2 fill frames on Um"); - mtc.stop; + Misc_Helpers.f_shutdown(fail, "Timeout waiting for L2 fill frames on Um"); } } } diff --git a/bts/gen_links.sh b/bts/gen_links.sh index 1ec6153..2a07f16 100755 --- a/bts/gen_links.sh +++ b/bts/gen_links.sh @@ -33,7 +33,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_VTY_Functions.ttcn GSM_SystemInformation.ttcn Osmocom_Types.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc L1CTL_Types.ttcn L1CTL_PortType.ttcn L1CTL_PortType_CtrlFunct.ttcn L1CTL_PortType_CtrlFunctDef.cc LAPDm_RAW_PT.ttcn LAPDm_Types.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_VTY_Functions.ttcn GSM_SystemInformation.ttcn Osmocom_Types.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc L1CTL_Types.ttcn L1CTL_PortType.ttcn L1CTL_PortType_CtrlFunct.ttcn L1CTL_PortType_CtrlFunctDef.cc LAPDm_RAW_PT.ttcn LAPDm_Types.ttcn " #FILES+="NS_Emulation.ttcn NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc " #FILES+="BSSGP_Emulation.ttcn Osmocom_Gb_Types.ttcn " FILES+="IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp IPA_CodecPort.ttcn RSL_Types.ttcn RSL_Emulation.ttcn " -- To view, visit https://gerrit.osmocom.org/11452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia8b01a1876e969d6f0760ea625e4df83af4f54ca Gerrit-Change-Number: 11452 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 11:02:39 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 24 Oct 2018 11:02:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RSL_Emulation: Fail explicitly on ASP_IPA_EVENT_DOWN In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11429 ) Change subject: RSL_Emulation: Fail explicitly on ASP_IPA_EVENT_DOWN ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11429/3/library/RSL_Emulation.ttcn File library/RSL_Emulation.ttcn: https://gerrit.osmocom.org/#/c/11429/3/library/RSL_Emulation.ttcn at 357 PS3, Line 357: // Both doesn't really make sense Pau, I'm not sure what to do here. Since we failed before anyway it probably makes sense to fail as well. Just thinking about it, it's probably best to not have a guard expression and just have one alt statement for IPA_EVENT_DOWN. Does that make sense? -- To view, visit https://gerrit.osmocom.org/11429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idc6565c9de72d98015d56a41e5616c46051c8a8d Gerrit-Change-Number: 11429 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 24 Oct 2018 11:02:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 11:14:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 24 Oct 2018 11:14:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11451 ) Change subject: Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11451/1/library/Misc_Helpers.ttcn File library/Misc_Helpers.ttcn: https://gerrit.osmocom.org/#/c/11451/1/library/Misc_Helpers.ttcn at 3 PS1, Line 3: /* Try to properly shutdown a testcase. whitespace -- To view, visit https://gerrit.osmocom.org/11451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I84d1aa6732f6b748d2bfdeac8f6309023717f267 Gerrit-Change-Number: 11451 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 24 Oct 2018 11:14:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 11:21:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 24 Oct 2018 11:21:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11451 ) Change subject: Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling ...................................................................... Patch Set 1: Code-Review-1 What about passing __FILE__, __LINE__ as parameters to the function so we can log correctly file and LINE during setverdict? check https://github.com/maaron/ttcn3/blob/master/LTE%20-%20Formal%20Delivery%2036.523-3v10.1.0/14/ETWS.ttcn -- To view, visit https://gerrit.osmocom.org/11451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I84d1aa6732f6b748d2bfdeac8f6309023717f267 Gerrit-Change-Number: 11451 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 24 Oct 2018 11:21:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 11:25:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 24 Oct 2018 11:25:46 +0000 Subject: Change in libosmocore[master]: vty: adjust telnet log In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11450 ) Change subject: vty: adjust telnet log ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1876447f9285adcd1b09937a6121afabd0b32e52 Gerrit-Change-Number: 11450 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 24 Oct 2018 11:25:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 11:25:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 24 Oct 2018 11:25:49 +0000 Subject: Change in libosmocore[master]: vty: adjust telnet log In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11450 ) Change subject: vty: adjust telnet log ...................................................................... vty: adjust telnet log Adjust wording so telnet command can be directly copy-pasted from the log to access the interface without the need for further editing. Change-Id: I1876447f9285adcd1b09937a6121afabd0b32e52 --- M src/vty/telnet_interface.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/vty/telnet_interface.c b/src/vty/telnet_interface.c index fdd88c1..fcb4c8d 100644 --- a/src/vty/telnet_interface.c +++ b/src/vty/telnet_interface.c @@ -101,7 +101,7 @@ return -1; } - LOGP(DLGLOBAL, LOGL_NOTICE, "telnet at %s %d\n", ip, port); + LOGP(DLGLOBAL, LOGL_NOTICE, "Available via telnet %s %d\n", ip, port); return 0; } -- To view, visit https://gerrit.osmocom.org/11450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1876447f9285adcd1b09937a6121afabd0b32e52 Gerrit-Change-Number: 11450 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 11:26:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 24 Oct 2018 11:26:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11451 ) Change subject: Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11451/1/library/Misc_Helpers.ttcn File library/Misc_Helpers.ttcn: https://gerrit.osmocom.org/#/c/11451/1/library/Misc_Helpers.ttcn at 15 PS1, Line 15: Once we add the __FILE__ and __LINE thing, I'd add an extra log here to always known from where the test was stopped, even if veredict was not set in this call (by calling with verdict=none or without parameters). -- To view, visit https://gerrit.osmocom.org/11451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I84d1aa6732f6b748d2bfdeac8f6309023717f267 Gerrit-Change-Number: 11451 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 24 Oct 2018 11:26:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 11:27:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 24 Oct 2018 11:27:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: Use Misc_Helpers.f_shutdown consistently In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11452 ) Change subject: BTS_Tests: Use Misc_Helpers.f_shutdown consistently ...................................................................... Patch Set 1: I like it, but see my comment on adding __LINE__ and __FILE__ in previous commit. -- To view, visit https://gerrit.osmocom.org/11452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia8b01a1876e969d6f0760ea625e4df83af4f54ca Gerrit-Change-Number: 11452 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 24 Oct 2018 11:27:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Oct 24 11:33:30 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 24 Oct 2018 11:33:30 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-ggsn_=C2=BB_--disable-gtp?= =?UTF-8?Q?-linux,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1022?= Message-ID: <820247162.189.1540380810035.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 10.48 KB...] checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking execinfo.h usability... yes checking execinfo.h presence... yes checking for execinfo.h... yes checking sys/select.h usability... yes checking sys/select.h presence... yes checking for sys/select.h... yes checking sys/socket.h usability... yes checking sys/socket.h presence... yes checking for sys/socket.h... yes checking sys/timerfd.h usability... yes checking sys/timerfd.h presence... yes checking for sys/timerfd.h... yes checking syslog.h usability... yes checking syslog.h presence... yes checking for syslog.h... yes checking ctype.h usability... yes checking ctype.h presence... yes checking for ctype.h... yes checking netinet/tcp.h usability... yes checking netinet/tcp.h presence... yes checking for netinet/tcp.h... yes checking for size_t... yes checking for working alloca.h... yes checking for alloca... yes checking for library containing dlopen... -ldl checking for library containing dlsym... -ldl checking for backtrace in -lexecinfo... no checking for doxygen... (cached) false checking whether SYS_getrandom is declared... yes checking if gcc supports -fvisibility=hidden... yes checking for clock_gettime... yes checking for localtime_r... yes checking whether struct tm has tm_gmtoff member... yes checking for TALLOC... yes checking for PCSC... yes checking for LIBGNUTLS... yes checking whether to enable VTY/CTRL tests... no checking whether C compiler accepts -mavx2... yes checking whether C compiler accepts -mssse3... yes checking whether C compiler accepts -msse4.1... yes checking whether gcc has __builtin_cpu_supports built-in... yes CFLAGS="-g -O2 -DBUILDING_LIBOSMOCORE -Wall" CPPFLAGS=" -DBUILDING_LIBOSMOCORE -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmocore.pc config.status: creating libosmocodec.pc config.status: creating libosmocoding.pc config.status: creating libosmovty.pc config.status: creating libosmogsm.pc config.status: creating libosmogb.pc config.status: creating libosmoctrl.pc config.status: creating libosmosim.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating src/vty/Makefile config.status: creating src/codec/Makefile config.status: creating src/coding/Makefile config.status: creating src/sim/Makefile config.status: creating src/gsm/Makefile config.status: creating src/gb/Makefile config.status: creating src/ctrl/Makefile config.status: creating src/pseudotalloc/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating utils/Makefile config.status: creating Doxyfile.core config.status: creating Doxyfile.gsm config.status: creating Doxyfile.vty config.status: creating Doxyfile.codec config.status: creating Doxyfile.coding config.status: creating Doxyfile.gb config.status: creating Doxyfile.ctrl config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j 8 install echo 0.12.0.91-7a2e > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory ' Making install in include make[2]: Entering directory ' GEN osmocom/gsm/gsm0503.h Generating header file... Generate 'xcch' declaration Generate 'rach' declaration Generate 'rach_ext' declaration Generate 'sch' declaration Generate 'cs2' declaration Generate 'cs3' declaration Generate 'cs2_np' declaration Generate 'cs3_np' declaration Generate 'tch_afs_12_2' declaration Generate 'tch_afs_10_2' declaration Generate 'tch_afs_7_95' declaration Generate 'tch_afs_7_4' declaration Generate 'tch_afs_6_7' declaration Generate 'tch_afs_5_9' declaration Generate 'tch_afs_5_15' declaration Generate 'tch_afs_4_75' declaration Generate 'tch_fr' declaration Generate 'tch_hr' declaration Generate 'tch_ahs_7_95' declaration Generate 'tch_ahs_7_4' declaration Generate 'tch_ahs_6_7' declaration Generate 'tch_ahs_5_9' declaration Generate 'tch_ahs_5_15' declaration Generate 'tch_ahs_4_75' declaration Generate 'mcs1_dl_hdr' declaration Generate 'mcs1_ul_hdr' declaration Generate 'mcs1' declaration Generate 'mcs2' declaration Generate 'mcs3' declaration Generate 'mcs4' declaration Generate 'mcs5_dl_hdr' declaration Generate 'mcs5_ul_hdr' declaration Generate 'mcs5' declaration Generate 'mcs6' declaration Generate 'mcs7_dl_hdr' declaration Generate 'mcs7_ul_hdr' declaration Generate 'mcs7' declaration Generate 'mcs8' declaration Generate 'mcs9' declaration Generation complete. make install-am make[3]: Entering directory ' GEN osmocom/core/bit16gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc64gen.h make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/application.h osmocom/core/backtrace.h osmocom/core/bit16gen.h osmocom/core/bit32gen.h osmocom/core/bit64gen.h osmocom/core/bits.h osmocom/core/bitvec.h osmocom/core/bitcomp.h osmocom/core/byteswap.h osmocom/core/conv.h osmocom/core/counter.h osmocom/core/crc16.h osmocom/core/crc16gen.h osmocom/core/crc32gen.h osmocom/core/crc64gen.h osmocom/core/crc8gen.h osmocom/core/crcgen.h osmocom/core/endian.h osmocom/core/defs.h osmocom/core/fsm.h osmocom/core/gsmtap.h osmocom/core/gsmtap_util.h osmocom/core/isdnhdlc.h osmocom/core/linuxlist.h osmocom/core/linuxrbtree.h osmocom/core/logging.h osmocom/core/loggingrb.h osmocom/core/stats.h osmocom/core/macaddr.h osmocom/core/msgb.h osmocom/core/panic.h osmocom/core/prbs.h osmocom/core/prim.h osmocom/core/process.h osmocom/core/rate_ctr.h osmocom/core/stat_item.h osmocom/core/select.h osmocom/core/sercomm.h osmocom/core/signal.h osmocom/core/socket.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/coding/gsm0503_tables.h osmocom/coding/gsm0503_parity.h osmocom/coding/gsm0503_mapping.h osmocom/coding/gsm0503_interleaving.h osmocom/coding/gsm0503_coding.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/statistics.h osmocom/core/strrb.h osmocom/core/talloc.h osmocom/core/timer.h osmocom/core/timer_compat.h osmocom/core/utils.h osmocom/core/write_queue.h osmocom/core/plugin.h osmocom/core/msgfile.h osmocom/core/serial.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/vty/buffer.h osmocom/vty/command.h osmocom/vty/logging.h osmocom/vty/stats.h osmocom/vty/misc.h osmocom/vty/telnet_interface.h osmocom/vty/vector.h osmocom/vty/vty.h osmocom/vty/ports.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/protocol/gsm_03_40.h osmocom/gsm/protocol/gsm_03_41.h osmocom/gsm/protocol/gsm_04_08.h osmocom/gsm/protocol/gsm_04_08_gprs.h osmocom/gsm/protocol/gsm_04_11.h osmocom/gsm/protocol/gsm_04_12.h osmocom/gsm/protocol/gsm_04_14.h osmocom/gsm/protocol/gsm_04_80.h osmocom/gsm/protocol/gsm_08_08.h osmocom/gsm/protocol/gsm_08_58.h osmocom/gsm/protocol/gsm_09_02.h osmocom/gsm/protocol/gsm_12_21.h osmocom/gsm/protocol/gsm_23_003.h osmocom/gsm/protocol/gsm_29_118.h osmocom/gsm/protocol/gsm_44_318.h osmocom/gsm/protocol/ipaccess.h osmocom/gsm/protocol/smpp34_osmocom.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/sim/class_tables.h osmocom/sim/sim.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/gprs_bssgp.h osmocom/gprs/gprs_bssgp_bss.h osmocom/gprs/gprs_msgb.h osmocom/gprs/gprs_ns.h osmocom/gprs/gprs_ns_frgre.h osmocom/gprs/gprs_rlc.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/crypt/auth.h osmocom/crypt/gprs_cipher.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/a5.h osmocom/gsm/abis_nm.h osmocom/gsm/apn.h osmocom/gsm/bts_features.h osmocom/gsm/comp128.h osmocom/gsm/comp128v23.h osmocom/gsm/bitvec_gsm.h osmocom/gsm/gan.h osmocom/gsm/gsm0341.h osmocom/gsm/gsm0411_smc.h osmocom/gsm/gsm0411_smr.h osmocom/gsm/gsm0411_utils.h osmocom/gsm/gsm0480.h osmocom/gsm/gsm0502.h osmocom/gsm/gsm0503.h osmocom/gsm/gsm0808.h osmocom/gsm/gsm0808_utils.h osmocom/gsm/gsm23003.h osmocom/gsm/gsm48.h osmocom/gsm/gsm48_ie.h osmocom/gsm/gsm_utils.h osmocom/gsm/gsup.h osmocom/gsm/ipa.h osmocom/gsm/lapd_core.h osmocom/gsm/lapdm.h osmocom/gsm/meas_rep.h osmocom/gsm/mncc.h osmocom/gsm/prim.h osmocom/gsm/l1sap.h osmocom/gsm/oap.h osmocom/gsm/oap_client.h osmocom/gsm/rsl.h osmocom/gsm/rxlev_stat.h osmocom/gsm/sysinfo.h osmocom/gsm/tlv.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/ctrl/control_cmd.h osmocom/ctrl/control_if.h osmocom/ctrl/ports.h osmocom/ctrl/control_vty.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/protocol/gsm_04_60.h osmocom/gprs/protocol/gsm_08_16.h osmocom/gprs/protocol/gsm_08_18.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/codec/ecu.h osmocom/codec/codec.h osmocom/codec/gsm610_bits.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' GEN crc64gen.c GEN crc16gen.c GEN crc8gen.c GEN crc32gen.c make install-am make[3]: Entering directory ' CC timer.lo CC bitvec.lo CC timer_gettimeofday.lo CC bits.lo CC select.lo CC timer_clockgettime.lo CC msgb.lo CC signal.lo CC bitcomp.lo CC counter.lo CC fsm.lo CC write_queue.lo CC utils.lo CC socket.lo CC logging.lo CC logging_syslog.lo CC logging_gsmtap.lo CC rate_ctr.lo CC gsmtap_util.lo CC crc16.lo CC panic.lo CC backtrace.lo CC conv.lo CC application.lo CC rbtree.lo CC strrb.lo CC loggingrb.lo CC crc8gen.lo CC crc16gen.lo CC crc32gen.lo CC crc64gen.lo CC macaddr.lo CC stat_item.lo CC stats.lo CC stats_statsd.lo CC prim.lo CC conv_acc.lo CC conv_acc_generic.lo CC prbs.lo CC sercomm.lo CC isdnhdlc.lo CC conv_acc_sse.lo CC conv_acc_sse_avx.lo CC plugin.lo CC msgfile.lo /bin/bash: line 2: 31443 Segmentation fault /bin/bash ../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT msgfile.lo -MD -MP -MF $depbase.Tpo -c -o msgfile.lo msgfile.c Makefile:558: recipe for target 'msgfile.lo' failed make[3]: *** [msgfile.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... CC serial.lo make[3]: Leaving directory ' Makefile:662: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:614: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:913: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Oct 24 11:42:48 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 24 Oct 2018 11:42:48 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6364?= Message-ID: <447351709.190.1540381368421.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.05 MB...] 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 whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-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 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 checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMOGB... yes checking for LIBOSMONETIF... yes checking for LIBGTP... yes checking for LIBCARES... yes checking for ANSI C header files... (cached) yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Wall -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating osmo-sgsn.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/sgsn/Makefile config.status: creating src/Makefile config.status: creating src/gprs/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gprs/Makefile config.status: creating tests/gbproxy/Makefile config.status: creating tests/sgsn/Makefile config.status: creating tests/gtphub/Makefile config.status: creating tests/xid/Makefile config.status: creating tests/sndcp_xid/Makefile config.status: creating tests/slhc/Makefile config.status: creating tests/v42bis/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands make[1]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build' make all-recursive make[2]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build' Making all in doc make[3]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/doc' Making all in examples make[4]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/doc/examples' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/doc/examples' make[4]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/doc' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/doc' make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/doc' Making all in include make[3]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/include' Making all in osmocom make[4]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/include/osmocom' Making all in sgsn make[5]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/include/osmocom/sgsn' make[5]: Nothing to be done for 'all'. make[5]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/include/osmocom/sgsn' make[5]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/include/osmocom' make[5]: Nothing to be done for 'all-am'. make[5]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/include/osmocom' make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/include/osmocom' make[4]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/include' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/include' make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/include' Making all in src make[3]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/src' Making all in gprs make[4]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/src/gprs' CC gb_proxy.o CC gb_proxy_main.o CC gb_proxy_vty.o CC gb_proxy_ctrl.o CC gb_proxy_patch.o CC gb_proxy_tlli.o CC gb_proxy_peer.o CC gprs_gb_parse.o CC gprs_llc_parse.o CC crc24.o CC gprs_utils.o CCLD osmo-gbproxy CC gprs_gmm_attach.o CC gprs_gmm.o ../../../src/gprs/gprs_gmm.c: In function 'gsm0408_gprs_rcvmsg_iu': ../../../src/gprs/gprs_gmm.c:2880:9: note: #pragma message: set drop_cipherable arg for gsm0408_rcv_gmm() from IuPS? #pragma message "set drop_cipherable arg for gsm0408_rcv_gmm() from IuPS?" ^ CC gprs_sgsn.o CC gprs_sndcp.o CC gprs_sndcp_comp.o CC gprs_sndcp_dcomp.o CC gprs_sndcp_pcomp.o CC gprs_sndcp_vty.o CC gprs_sndcp_xid.o CC sgsn_main.o CC sgsn_vty.o CC sgsn_libgtp.o CC gprs_llc.o CC gprs_llc_vty.o CC sgsn_ctrl.o CC sgsn_auth.o CC gprs_subscriber.o CC sgsn_cdr.o CC sgsn_ares.o CC slhc.o CC gprs_llc_xid.o CC v42bis.o CC gsup_client.o CCLD osmo-sgsn CC gtphub_main.o CC gtphub.o CC gtphub_sock.o CC gtphub_ares.o CC gtphub_vty.o CCLD osmo-gtphub make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/src/gprs' make[4]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/src' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/src' make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/src' Making all in contrib make[3]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/contrib' Making all in systemd make[4]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/contrib/systemd' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/contrib/systemd' make[4]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/contrib' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/contrib' make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/contrib' Making all in tests make[3]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/tests' Making all in gprs make[4]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/tests/gprs' CC gprs_test.o CC gprs_utils.o CCLD gprs_test make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/tests/gprs' Making all in gbproxy make[4]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/tests/gbproxy' CC gbproxy_test.o CCLD gbproxy_test make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/tests/gbproxy' Making all in gtphub make[4]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/tests/gtphub' CC gtphub_test.o CCLD gtphub_test make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/tests/gtphub' Making all in sgsn make[4]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/tests/sgsn' CC sgsn_test.o CCLD sgsn_test make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/tests/sgsn' Making all in xid make[4]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/tests/xid' CC xid_test.o CCLD xid_test make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/tests/xid' Making all in sndcp_xid make[4]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/tests/sndcp_xid' CC sndcp_xid_test.o CCLD sndcp_xid_test make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/tests/sndcp_xid' Making all in slhc make[4]: Entering directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/tests/slhc' CC slhc_test.o CCLD slhc_test /bin/bash: line 1: 7609 Segmentation fault (core dumped) /bin/bash ../../libtool --silent --tag=CC --mode=link gcc -Wall -ggdb3 -I/build/deps/install/stow/libosmocore/include/ -I/build/deps/install/stow/libosmocore/include/ -g -O2 -Wall -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess -o slhc_test slhc_test.o ../../src/gprs/slhc.o -L/build/deps/install/stow/libosmocore/lib -ltalloc -losmocore Makefile:371: recipe for target 'slhc_test' failed make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/tests/slhc' make[4]: *** [slhc_test] Error 139 Makefile:401: recipe for target 'all-recursive' failed make[3]: *** [all-recursive] Error 1 make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build/tests' Makefile:494: recipe for target 'all-recursive' failed make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build' Makefile:402: recipe for target 'all' failed make[1]: Leaving directory '/build/osmo-sgsn-1.3.0.60-e64f0/_build' make[1]: *** [all] Error 2 Makefile:702: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Oct 24 11:50:14 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 24 Oct 2018 11:50:14 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--en?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6365?= In-Reply-To: <447351709.190.1540381368421.JavaMail.jenkins@jenkins.osmocom.org> References: <447351709.190.1540381368421.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1303020989.191.1540381814209.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Oct 24 12:12:03 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 24 Oct 2018 12:12:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11451 ) Change subject: Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11451/1/library/Misc_Helpers.ttcn File library/Misc_Helpers.ttcn: https://gerrit.osmocom.org/#/c/11451/1/library/Misc_Helpers.ttcn at 15 PS1, Line 15: > Once we add the __FILE__ and __LINE thing, I'd add an extra log here to always known from where the [?] I looked around in the compiled files a bit and I don't see any way to automatically include file/line from the caller (like with C macros). So I guess the only way is to add them as optional arguments and pass __BFILE__ and __LINE__ in the caller. Not the nicest solution, but okay -- To view, visit https://gerrit.osmocom.org/11451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I84d1aa6732f6b748d2bfdeac8f6309023717f267 Gerrit-Change-Number: 11451 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 24 Oct 2018 12:12:03 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 12:37:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 24 Oct 2018 12:37:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11451 ) Change subject: Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11451/1/library/Misc_Helpers.ttcn File library/Misc_Helpers.ttcn: https://gerrit.osmocom.org/#/c/11451/1/library/Misc_Helpers.ttcn at 15 PS1, Line 15: > I looked around in the compiled files a bit and I don't see any way to automatically include file/li [?] Yes, just passed them as separate parameters to f_shutdown function, probably best is first place since we always want to print that shutdown procedure started from there. -- To view, visit https://gerrit.osmocom.org/11451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I84d1aa6732f6b748d2bfdeac8f6309023717f267 Gerrit-Change-Number: 11451 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 24 Oct 2018 12:37:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 13:32:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 24 Oct 2018 13:32:58 +0000 Subject: Change in osmo-bts[master]: bts-trx: Try decoding received UL bursts when SACCH frame detected as... In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11446 ) Change subject: bts-trx: Try decoding received UL bursts when SACCH frame detected as lost ...................................................................... Patch Set 1: Code-Review-1 It makes sense to investigate the problem carefully. I think, that this change makes complicated things even more complex. Why? - In general, SACCH frame loss detection is implemented in a hackish way ATM - it's being triggered by DL processing path, which is not (and should not be) synchronized with the UL processing path. We have at least ~20 TDMA frame difference between them. See both 'osmotrx fn-advance' and 'osmotrx rts-advance' configuration options for OsmoBTS, and '-f --trx-advance' command line option for trxcon. - Instead of complicating the code more, I think we should focus on implementing (and discussing) the TDMA frame loss detection on the link between L1 and TRX. -- To view, visit https://gerrit.osmocom.org/11446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I910277df181df5082b234c1c97a75eebdffc2cb5 Gerrit-Change-Number: 11446 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 24 Oct 2018 13:32:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 13:47:09 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 24 Oct 2018 13:47:09 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08: improve gsm48_multirate_config() In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/11443 ) Change subject: gsm_04_08: improve gsm48_multirate_config() ...................................................................... gsm_04_08: improve gsm48_multirate_config() The function gsm48_multirate_config() generates the multirate configuration IE, that is sent via RSL to configure the active set of AMR codecs inside the BTS. The function already works, but it does not check the input data for consistancy. Lets add some consistancy check to make sure that inconsistant parameters are rejected. Also allow the output pointer to be NULL, so that the function can be used to perform a dry run to be able to verify parameters. - Check for invalid / inconsistant configuration parameters - Perform a dry-run when lv pointer is set to NULL Change-Id: I06beb7dd7236c81c3a91af4d09c31891f4b910a4 Related: OS#3529 --- M include/osmocom/bsc/gsm_04_08_rr.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/gsm_04_08_rr.c M tests/gsm0408/Makefile.am M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 6 files changed, 237 insertions(+), 26 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/bsc/gsm_04_08_rr.h b/include/osmocom/bsc/gsm_04_08_rr.h index e2e861d..8e4f787 100644 --- a/include/osmocom/bsc/gsm_04_08_rr.h +++ b/include/osmocom/bsc/gsm_04_08_rr.h @@ -23,7 +23,8 @@ struct msgb *msg, struct bsc_subscr *bsub); int gsm48_send_rr_classmark_enquiry(struct gsm_lchan *lchan); int gsm48_send_rr_ciph_mode(struct gsm_lchan *lchan, int want_imeisv); -int gsm48_multirate_config(uint8_t *lv, const struct amr_multirate_conf *mr, const struct amr_mode *modes); +int gsm48_multirate_config(uint8_t *lv, const struct gsm48_multi_rate_conf *mr_conf, + const struct amr_mode *modes, unsigned int num_modes); struct msgb *gsm48_make_ho_cmd(struct gsm_lchan *new_lchan, uint8_t power_command, uint8_t ho_ref); int gsm48_send_ho_cmd(struct gsm_lchan *old_lchan, struct gsm_lchan *new_lchan, uint8_t power_command, uint8_t ho_ref); diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index f156cc8..08b5dad 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -4391,11 +4391,12 @@ mr.ms_mode[0].mode = amr_mode; mr.bts_mode[0].mode = amr_mode; + mr.num_modes = 1; /* encode this configuration into the lchan for both uplink and * downlink direction */ - gsm48_multirate_config(lchan->mr_ms_lv, &mr, mr.ms_mode); - gsm48_multirate_config(lchan->mr_bts_lv, &mr, mr.bts_mode); + gsm48_multirate_config(lchan->mr_ms_lv, mr_conf, mr.ms_mode, mr.num_modes); + gsm48_multirate_config(lchan->mr_bts_lv, mr_conf, mr.bts_mode, mr.num_modes); return 0; } diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 35044a3..4659c1a 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -321,47 +321,113 @@ cd->arfcn_lo = bts->c0->arfcn & 0xff; } -/*! \brief Encode a TS 04.08 multirate config LV according to 10.5.2.21aa - * \param[out] lv caller-allocated buffer of 7 bytes. First octet is IS length - * \param[in] mr multi-rate configuration to encode - * \param[in] modes array describing the AMR modes - * \returns 0 on success */ -int gsm48_multirate_config(uint8_t *lv, const struct amr_multirate_conf *mr, const struct amr_mode *modes) +/*! \brief Encode a TS 04.08 multirate config LV according to 10.5.2.21aa. + * \param[out] lv caller-allocated buffer of 7 bytes. First octet is is length. + * \param[in] mr_conf multi-rate configuration to encode (selected modes). + * \param[in] modes array describing the AMR modes. + * \param[in] num_modes length of the modes array. + * \returns 0 on success, -EINVAL on failure. */ +int gsm48_multirate_config(uint8_t *lv, + const struct gsm48_multi_rate_conf *mr_conf, + const struct amr_mode *modes, unsigned int num_modes) { - int num = 0, i; + int num = 0; + unsigned int i; + unsigned int k; + unsigned int m = 0; + bool mode_valid; + uint8_t *gsm48_ie = (uint8_t *) mr_conf; + const struct amr_mode *modes_selected[4]; + /* Check if modes for consistency (order and duplicates) */ + for (i = 0; i < num_modes; i++) { + if (i > 0 && modes[i - 1].mode > modes[i].mode) { + LOGP(DRR, LOGL_ERROR, + "BUG: Multirate codec with inconsistant config (mode order).\n"); + return -EINVAL; + } + if (i > 0 && modes[i - 1].mode == modes[i].mode) { + LOGP(DRR, LOGL_ERROR, + "BUG: Multirate codec with inconsistant config (duplicate modes).\n"); + return -EINVAL; + } + } + + /* Check if the active set that is defined in mr_conf has at least one + * mode but not more than 4 modes set */ for (i = 0; i < 8; i++) { - if (((mr->gsm48_ie[1] >> i) & 1)) + if (((gsm48_ie[1] >> i) & 1)) num++; } if (num > 4) { - LOGP(DRR, LOGL_ERROR, "BUG: Using multirate codec with too " - "many modes in config.\n"); - num = 4; + LOGP(DRR, LOGL_ERROR, + "BUG: Multirate codec with too many modes in config.\n"); + return -EINVAL; } if (num < 1) { - LOGP(DRR, LOGL_ERROR, "BUG: Using multirate codec with no " - "mode in config.\n"); - num = 1; + LOGP(DRR, LOGL_ERROR, + "BUG: Multirate codec with no mode in config.\n"); + return -EINVAL; } + /* Do not accept excess hysteresis or threshold values */ + for (i = 0; i < num_modes; i++) { + if (modes[i].threshold >= 64) { + LOGP(DRR, LOGL_ERROR, + "BUG: Multirate codec with excessive threshold values.\n"); + return -EINVAL; + } + if (modes[i].hysteresis >= 16) { + LOGP(DRR, LOGL_ERROR, + "BUG: Multirate codec with excessive hysteresis values.\n"); + return -EINVAL; + } + } + + /* Scan through the selected modes and find a matching threshold/ + * hysteresis value for that mode. */ + for (i = 0; i < 8; i++) { + if (((gsm48_ie[1] >> i) & 1)) { + mode_valid = false; + for (k = 0; k < num_modes; k++) { + if (modes[k].mode == i) { + mode_valid = true; + modes_selected[m] = &modes[k]; + m++; + } + } + if (!mode_valid) { + LOGP(DRR, LOGL_ERROR, + "BUG: Multirate codec with inconsistant config (no mode defined).\n"); + return -EINVAL; + } + } + } + OSMO_ASSERT(m <= 4); + + /* When the caller is not interested in any result, skip the actual + * composition of the IE (dry run) */ + if (!lv) + return 0; + + /* Compose output buffer */ lv[0] = (num == 1) ? 2 : (num + 2); - memcpy(lv + 1, mr->gsm48_ie, 2); + memcpy(lv + 1, gsm48_ie, 2); if (num == 1) return 0; - lv[3] = modes[0].threshold & 0x3f; - lv[4] = modes[0].hysteresis << 4; + lv[3] = modes_selected[0]->threshold & 0x3f; + lv[4] = modes_selected[0]->hysteresis << 4; if (num == 2) return 0; - lv[4] |= (modes[1].threshold & 0x3f) >> 2; - lv[5] = modes[1].threshold << 6; - lv[5] |= (modes[1].hysteresis & 0x0f) << 2; + lv[4] |= (modes_selected[1]->threshold & 0x3f) >> 2; + lv[5] = modes_selected[1]->threshold << 6; + lv[5] |= (modes_selected[1]->hysteresis & 0x0f) << 2; if (num == 3) return 0; - lv[5] |= (modes[2].threshold & 0x3f) >> 4; - lv[6] = modes[2].threshold << 4; - lv[6] |= modes[2].hysteresis & 0x0f; + lv[5] |= (modes_selected[2]->threshold & 0x3f) >> 4; + lv[6] = modes_selected[2]->threshold << 4; + lv[6] |= modes_selected[2]->hysteresis & 0x0f; return 0; } diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am index d790fc8..b207f8b 100644 --- a/tests/gsm0408/Makefile.am +++ b/tests/gsm0408/Makefile.am @@ -23,6 +23,7 @@ $(NULL) gsm0408_test_LDADD = \ + $(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \ $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(top_builddir)/src/osmo-bsc/gsm_timers.o \ diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index bc2777d..faeca39 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -35,6 +35,8 @@ #include #include +#include + #define COMPARE(result, op, value) \ if (!((result) op (value))) {\ fprintf(stderr, "Compare failed. Was %x should be %x in %s:%d\n",result, value, __FILE__, __LINE__); \ @@ -799,6 +801,106 @@ OSMO_ASSERT(pass); } +static void test_gsm48_multirate_config() +{ + uint8_t lv[7]; + struct gsm48_multi_rate_conf *gsm48_ie; + struct amr_multirate_conf mr; + int rc; + + memset(&mr, 0, sizeof(mr)); + + /* Use some made up threshold and hysteresis values */ + mr.ms_mode[0].threshold = 11; + mr.ms_mode[1].threshold = 12; + mr.ms_mode[2].threshold = 13; + mr.ms_mode[0].hysteresis = 15; + mr.ms_mode[1].hysteresis = 12; + mr.ms_mode[2].hysteresis = 8; + + gsm48_ie = (struct gsm48_multi_rate_conf *)&mr.gsm48_ie; + gsm48_ie->ver = 1; + gsm48_ie->m5_90 = 1; + gsm48_ie->m7_40 = 1; + gsm48_ie->m7_95 = 1; + gsm48_ie->m12_2 = 1; + + /* Test #1: Normal configuration with 4 active set members */ + mr.ms_mode[0].mode = 2; + mr.ms_mode[1].mode = 4; + mr.ms_mode[2].mode = 5; + mr.ms_mode[3].mode = 7; + rc = gsm48_multirate_config(lv, gsm48_ie, mr.ms_mode, 4); + OSMO_ASSERT(rc == 0); + printf("gsm48_multirate_config(): rc=%i, lv=%s\n", rc, + osmo_hexdump_nospc(lv, lv[0])); + + /* Test #2: 4 active set members, but wrong mode order: */ + mr.ms_mode[3].mode = 2; + mr.ms_mode[2].mode = 4; + mr.ms_mode[1].mode = 5; + mr.ms_mode[0].mode = 7; + rc = gsm48_multirate_config(lv, gsm48_ie, mr.ms_mode, 4); + OSMO_ASSERT(rc == -EINVAL); + + /* Test #3: Normal configuration with 3 active set members */ + mr.ms_mode[0].mode = 2; + mr.ms_mode[1].mode = 4; + mr.ms_mode[2].mode = 5; + mr.ms_mode[3].mode = 0; + gsm48_ie->m12_2 = 0; + mr.ms_mode[2].threshold = 0; + mr.ms_mode[2].hysteresis = 0; + + rc = gsm48_multirate_config(lv, gsm48_ie, mr.ms_mode, 3); + OSMO_ASSERT(rc == 0); + printf("gsm48_multirate_config(): rc=%i, lv=%s\n", rc, + osmo_hexdump_nospc(lv, lv[0])); + + /* Test #4: 3 active set members, but wrong mode order: */ + mr.ms_mode[0].mode = 2; + mr.ms_mode[2].mode = 4; + mr.ms_mode[1].mode = 5; + rc = gsm48_multirate_config(lv, gsm48_ie, mr.ms_mode, 3); + OSMO_ASSERT(rc == -EINVAL); + + /* Test #5: Normal configuration with 2 active set members */ + mr.ms_mode[0].mode = 2; + mr.ms_mode[1].mode = 4; + mr.ms_mode[2].mode = 0; + gsm48_ie->m7_95 = 0; + mr.ms_mode[1].threshold = 0; + mr.ms_mode[1].hysteresis = 0; + + rc = gsm48_multirate_config(lv, gsm48_ie, mr.ms_mode, 2); + OSMO_ASSERT(rc == 0); + printf("gsm48_multirate_config(): rc=%i, lv=%s\n", rc, + osmo_hexdump_nospc(lv, lv[0])); + + /* Test #6: 2 active set members, but wrong mode order: */ + mr.ms_mode[1].mode = 2; + mr.ms_mode[0].mode = 4; + rc = gsm48_multirate_config(lv, gsm48_ie, mr.ms_mode, 2); + OSMO_ASSERT(rc == -EINVAL); + + /* Test #7: Normal configuration with 1 active set member */ + mr.ms_mode[0].mode = 2; + mr.ms_mode[1].mode = 0; + gsm48_ie->m7_40 = 0; + mr.ms_mode[0].threshold = 0; + mr.ms_mode[0].hysteresis = 0; + + rc = gsm48_multirate_config(lv, gsm48_ie, mr.ms_mode, 1); + OSMO_ASSERT(rc == 0); + printf("gsm48_multirate_config(): rc=%i, lv=%s\n", rc, + osmo_hexdump_nospc(lv, lv[0])); + + /* Test #8: 0 active set members: */ + mr.ms_mode[0].mode = 0; + rc = gsm48_multirate_config(lv, gsm48_ie, mr.ms_mode, 1); + OSMO_ASSERT(rc == -EINVAL); +} + static const struct log_info_cat log_categories[] = { }; @@ -839,6 +941,8 @@ test_gsm48_ra_id_by_bts(); + test_gsm48_multirate_config(); + printf("Done.\n"); return EXIT_SUCCESS; @@ -854,3 +958,37 @@ } void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} + +void bsc_cm_update(struct gsm_subscriber_connection *conn, + const uint8_t *cm2, uint8_t cm2_len, + const uint8_t *cm3, uint8_t cm3_len) {} + +int rsl_siemens_mrpci(struct gsm_lchan *lchan, struct rsl_mrpci *mrpci) +{ return 0; } + +int rsl_chan_mode_modify_req(struct gsm_lchan *ts) { return 0; } + +int rsl_tx_ipacc_crcx(struct gsm_lchan *lchan) { return 0; } + +void gscon_submit_rsl_dtap(struct gsm_subscriber_connection *conn, + struct msgb *msg, int link_id, int allow_sacch) {} + +bool lchan_may_receive_data(struct gsm_lchan *lchan) { return true; } + +int bsc_compl_l3(struct gsm_subscriber_connection *conn, struct msgb *msg, + uint16_t chosen_channel) { return 0; } + +void bsc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, + struct msgb *msg) {} + +void bsc_cipher_mode_compl(struct gsm_subscriber_connection *conn, + struct msgb *msg, uint8_t chosen_encr) {} + +const char *bsc_subscr_name(struct bsc_subscr *bsub) { return NULL; } + +void lchan_release(struct gsm_lchan *lchan, bool sacch_deact, + bool err, enum gsm48_rr_cause cause_rr) {} + +int rsl_data_request(struct msgb *msg, uint8_t link_id) { return 0; } + +int rsl_encryption_cmd(struct msgb *msg) { return 0; } diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 7270721..9424167 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -226,4 +226,8 @@ test_gsm48_ra_id_by_bts[4]: digits='999999' lac=0xffff=htons(65535) rac=0xff=255 pass test_gsm48_ra_id_by_bts[5]: digits='09f909' lac=0xcdab=htons(43981) rac=0xab=171 pass test_gsm48_ra_id_by_bts[6]: digits='090990' lac=0xcdab=htons(43981) rac=0xab=171 pass +gsm48_multirate_config(): rc=0, lv=0620b40bf330 +gsm48_multirate_config(): rc=0, lv=0520340bf3 +gsm48_multirate_config(): rc=0, lv=0420140b +gsm48_multirate_config(): rc=0, lv=0220 Done. -- To view, visit https://gerrit.osmocom.org/11443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I06beb7dd7236c81c3a91af4d09c31891f4b910a4 Gerrit-Change-Number: 11443 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 14:02:45 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 24 Oct 2018 14:02:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11451 to look at the new patch set (#2). Change subject: Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling ...................................................................... Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling This function can now be called from anywhere to try and safely shutdown a testcase. It is not optimal as we can't call "all component.stop" from outside the mtc, but without any proper and orderly shutdown handling of all our emulation components I believe this is the best we can do. To use it: import from Misc_Helpers all; in your module and then call Misc_Helpers.f_shutdown(__BFILE__, __LINE__); You can also pass the function a verdict and a message and it will take care of calling setverdict, but beware of the following: While setverdict would accept any number of arguments as log message and convert them to a log string f_shutdown expects one charstring. It's possible to use the log2str function to use the log arguments in setverdict for f_shutdown, for example setverdict(fail, "Template didn't match: ", tmpl_foo); would become Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Template didn't match: ", tmpl_foo)); Change-Id: I84d1aa6732f6b748d2bfdeac8f6309023717f267 --- M bsc-nat/gen_links.sh M bsc/gen_links.sh M ggsn_tests/gen_links.sh M hlr/gen_links.sh M lapdm/gen_links.sh A library/Misc_Helpers.ttcn M mgw/gen_links.sh M msc/gen_links.sh M pcu/gen_links.sh M sccp/gen_links.sh M selftest/gen_links.sh M sgsn/gen_links.sh M sip/gen_links.sh M sysinfo/gen_links.sh 14 files changed, 41 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/11451/2 -- To view, visit https://gerrit.osmocom.org/11451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I84d1aa6732f6b748d2bfdeac8f6309023717f267 Gerrit-Change-Number: 11451 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 14:02:45 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 24 Oct 2018 14:02:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: Use Misc_Helpers.f_shutdown consistently In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11452 to look at the new patch set (#2). Change subject: BTS_Tests: Use Misc_Helpers.f_shutdown consistently ...................................................................... BTS_Tests: Use Misc_Helpers.f_shutdown consistently Replace all calls to setverdict(fail) with f_shutdown() since I'd rather fail and stop early in case we encounter an error. Only replace setverdict(pass) with f_shutdown() if it is followed by mtc.stop Remove internal function f_shutdown and use the one from Misc_Helpers Change-Id: Ia8b01a1876e969d6f0760ea625e4df83af4f54ca --- M bts/BTS_Tests.ttcn M bts/gen_links.sh 2 files changed, 131 insertions(+), 208 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/11452/2 -- To view, visit https://gerrit.osmocom.org/11452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia8b01a1876e969d6f0760ea625e4df83af4f54ca Gerrit-Change-Number: 11452 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 14:02:45 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 24 Oct 2018 14:02:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RSL_Emulation: Fail explicitly on ASP_IPA_EVENT_DOWN In-Reply-To: References: Message-ID: daniel has uploaded a new patch set (#4) to the change originally created by Pau Espin Pedrol. ( https://gerrit.osmocom.org/11429 ) Change subject: RSL_Emulation: Fail explicitly on ASP_IPA_EVENT_DOWN ...................................................................... RSL_Emulation: Fail explicitly on ASP_IPA_EVENT_DOWN Otherwise RSL layer fails this way when this event is received: RSL_Emulation.ttcn:429 Receive operation on port IPA_PT succeeded, message from TC_chan_act_a51-RSL-IPA(3): @IPA_Emulation.ASP_IPA_Event: { up_down := ASP_IPA_EVENT_DOWN (0) } id 9 - Function main_client was stopped. PTC terminates. RSL_Emulation.ttcn:429 Message with id 9 was extracted from the queue of IPA_PT. RSL_Emulation.ttcn:430 setverdict(fail): none -> fail reason: "Received unknown primitive from IPA", new component reason: "Received unknown primitive from IPA" We now fail with a clearer message "Lost IPA connection!". These failures seem to happen under high load when the BTS doesn't get a steady clock from osmo-trx. Change-Id: Idc6565c9de72d98015d56a41e5616c46051c8a8d --- M library/RSL_Emulation.ttcn 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/11429/4 -- To view, visit https://gerrit.osmocom.org/11429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idc6565c9de72d98015d56a41e5616c46051c8a8d Gerrit-Change-Number: 11429 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 14:03:57 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 24 Oct 2018 14:03:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11451 ) Change subject: Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11451/1/library/Misc_Helpers.ttcn File library/Misc_Helpers.ttcn: https://gerrit.osmocom.org/#/c/11451/1/library/Misc_Helpers.ttcn at 3 PS1, Line 3: /* Try to properly shutdown a testcase. > whitespace Done https://gerrit.osmocom.org/#/c/11451/1/library/Misc_Helpers.ttcn at 15 PS1, Line 15: > Yes, just passed them as separate parameters to f_shutdown function, probably best is first place si [?] Done -- To view, visit https://gerrit.osmocom.org/11451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I84d1aa6732f6b748d2bfdeac8f6309023717f267 Gerrit-Change-Number: 11451 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 24 Oct 2018 14:03:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 14:12:26 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 24 Oct 2018 14:12:26 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: check amr mode parameters In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/11444 ) Change subject: bsc_vty: check amr mode parameters ...................................................................... bsc_vty: check amr mode parameters The vty already has a well working interface to configure the AMR mode, threshold and hysteresis parameters. However there are no checks yet to prevent against misconfiguration. - Use gsm48_multirate_config() to perform a global check of the overall configuration - Add check AMR modes during input (order, duplicates) Change-Id: I8b9f69b89a39bbf4800d9790f7abe43ce66aeb71 Related: OS#3529 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 104 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 08b5dad..dd540c1 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -3511,11 +3511,45 @@ struct gsm48_multi_rate_conf *mr_conf = (struct gsm48_multi_rate_conf *) mr->gsm48_ie; int i; + int mode; + int mode_prev = -1; + /* Check if mode parameters are in order */ + for (i = 0; i < argc; i++) { + mode = atoi(argv[i]); + if (mode_prev > mode) { + vty_out(vty, "Modes must be listed in order%s", + VTY_NEWLINE); + return; + } + + if (mode_prev == mode) { + vty_out(vty, "Modes must be unique %s", VTY_NEWLINE); + return; + } + mode_prev = mode; + } + + /* Prepare the multirate configuration IE */ mr->gsm48_ie[1] = 0; for (i = 0; i < argc; i++) mr->gsm48_ie[1] |= 1 << atoi(argv[i]); mr_conf->icmi = 0; + + /* Store actual mode identifier values */ + for (i = 0; i < argc; i++) { + mr->ms_mode[i].mode = atoi(argv[i]); + mr->bts_mode[i].mode = atoi(argv[i]); + } + mr->num_modes = argc; + + /* Trim excess threshold and hysteresis values from previous config */ + for (i = argc - 1; i < 4; i++) { + mr->ms_mode[i].threshold = 0; + mr->bts_mode[i].threshold = 0; + mr->ms_mode[i].hysteresis = 0; + mr->bts_mode[i].hysteresis = 0; + } } static void get_amr_th_from_arg(struct vty *vty, int argc, const char *argv[], int full) @@ -3567,6 +3601,55 @@ } } +/* Give the current amr configuration a final consistency chack by feeding the + * the configuration into the gsm48 multirate IE generator function */ +static int check_amr_config(struct vty *vty) +{ + int rc = 0; + struct amr_multirate_conf *mr; + const struct gsm48_multi_rate_conf *mr_conf; + struct gsm_bts *bts = vty->index; + int vty_rc = CMD_SUCCESS; + + mr = &bts->mr_full; + mr_conf = (struct gsm48_multi_rate_conf*) mr->gsm48_ie; + rc = gsm48_multirate_config(NULL, mr_conf, mr->ms_mode, mr->num_modes); + if (rc != 0) { + vty_out(vty, + "Invalid AMR multirate configuration (tch-f, ms) - check parameters%s", + VTY_NEWLINE); + vty_rc = CMD_WARNING; + } + + rc = gsm48_multirate_config(NULL, mr_conf, mr->bts_mode, mr->num_modes); + if (rc != 0) { + vty_out(vty, + "Invalid AMR multirate configuration (tch-f, bts) - check parameters%s", + VTY_NEWLINE); + vty_rc = CMD_WARNING; + } + + mr = &bts->mr_half; + mr_conf = (struct gsm48_multi_rate_conf*) mr->gsm48_ie; + rc = gsm48_multirate_config(NULL, mr_conf, mr->ms_mode, mr->num_modes); + if (rc != 0) { + vty_out(vty, + "Invalid AMR multirate configuration (tch-h, ms) - check parameters%s", + VTY_NEWLINE); + vty_rc = CMD_WARNING; + } + + rc = gsm48_multirate_config(NULL, mr_conf, mr->bts_mode, mr->num_modes); + if (rc != 0) { + vty_out(vty, + "Invalid AMR multirate configuration (tch-h, bts) - check parameters%s", + VTY_NEWLINE); + vty_rc = CMD_WARNING; + } + + return vty_rc; +} + #define AMR_TCHF_PAR_STR " (0|1|2|3|4|5|6|7)" #define AMR_TCHF_HELP_STR "4,75k\n5,15k\n5,90k\n6,70k\n7,40k\n7,95k\n" \ "10,2k\n12,2k\n" @@ -3583,7 +3666,7 @@ AMR_TCHF_HELP_STR) { get_amr_from_arg(vty, 1, argv, 1); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_fr_modes2, cfg_bts_amr_fr_modes2_cmd, @@ -3592,7 +3675,7 @@ AMR_TCHF_HELP_STR AMR_TCHF_HELP_STR) { get_amr_from_arg(vty, 2, argv, 1); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_fr_modes3, cfg_bts_amr_fr_modes3_cmd, @@ -3601,7 +3684,7 @@ AMR_TCHF_HELP_STR AMR_TCHF_HELP_STR AMR_TCHF_HELP_STR) { get_amr_from_arg(vty, 3, argv, 1); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_fr_modes4, cfg_bts_amr_fr_modes4_cmd, @@ -3610,7 +3693,7 @@ AMR_TCHF_HELP_STR AMR_TCHF_HELP_STR AMR_TCHF_HELP_STR AMR_TCHF_HELP_STR) { get_amr_from_arg(vty, 4, argv, 1); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_fr_start_mode, cfg_bts_amr_fr_start_mode_cmd, @@ -3618,7 +3701,7 @@ AMR_TEXT "Full Rate\n" AMR_START_TEXT) { get_amr_start_from_arg(vty, argv, 1); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_fr_thres1, cfg_bts_amr_fr_thres1_cmd, @@ -3627,7 +3710,7 @@ AMR_TH_HELP_STR) { get_amr_th_from_arg(vty, 2, argv, 1); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_fr_thres2, cfg_bts_amr_fr_thres2_cmd, @@ -3636,7 +3719,7 @@ AMR_TH_HELP_STR AMR_TH_HELP_STR) { get_amr_th_from_arg(vty, 3, argv, 1); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_fr_thres3, cfg_bts_amr_fr_thres3_cmd, @@ -3645,7 +3728,7 @@ AMR_TH_HELP_STR AMR_TH_HELP_STR AMR_TH_HELP_STR) { get_amr_th_from_arg(vty, 4, argv, 1); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_fr_hyst1, cfg_bts_amr_fr_hyst1_cmd, @@ -3654,7 +3737,7 @@ AMR_HY_HELP_STR) { get_amr_hy_from_arg(vty, 2, argv, 1); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_fr_hyst2, cfg_bts_amr_fr_hyst2_cmd, @@ -3672,7 +3755,7 @@ AMR_HY_HELP_STR AMR_HY_HELP_STR AMR_HY_HELP_STR) { get_amr_hy_from_arg(vty, 4, argv, 1); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_modes1, cfg_bts_amr_hr_modes1_cmd, @@ -3681,7 +3764,7 @@ AMR_TCHH_HELP_STR) { get_amr_from_arg(vty, 1, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_modes2, cfg_bts_amr_hr_modes2_cmd, @@ -3690,7 +3773,7 @@ AMR_TCHH_HELP_STR AMR_TCHH_HELP_STR) { get_amr_from_arg(vty, 2, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_modes3, cfg_bts_amr_hr_modes3_cmd, @@ -3699,7 +3782,7 @@ AMR_TCHH_HELP_STR AMR_TCHH_HELP_STR AMR_TCHH_HELP_STR) { get_amr_from_arg(vty, 3, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_modes4, cfg_bts_amr_hr_modes4_cmd, @@ -3708,7 +3791,7 @@ AMR_TCHH_HELP_STR AMR_TCHH_HELP_STR AMR_TCHH_HELP_STR AMR_TCHH_HELP_STR) { get_amr_from_arg(vty, 4, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_start_mode, cfg_bts_amr_hr_start_mode_cmd, @@ -3716,7 +3799,7 @@ AMR_TEXT "Half Rate\n" AMR_START_TEXT) { get_amr_start_from_arg(vty, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_thres1, cfg_bts_amr_hr_thres1_cmd, @@ -3725,7 +3808,7 @@ AMR_TH_HELP_STR) { get_amr_th_from_arg(vty, 2, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_thres2, cfg_bts_amr_hr_thres2_cmd, @@ -3734,7 +3817,7 @@ AMR_TH_HELP_STR AMR_TH_HELP_STR) { get_amr_th_from_arg(vty, 3, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_thres3, cfg_bts_amr_hr_thres3_cmd, @@ -3743,7 +3826,7 @@ AMR_TH_HELP_STR AMR_TH_HELP_STR AMR_TH_HELP_STR) { get_amr_th_from_arg(vty, 4, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_hyst1, cfg_bts_amr_hr_hyst1_cmd, @@ -3752,7 +3835,7 @@ AMR_HY_HELP_STR) { get_amr_hy_from_arg(vty, 2, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_hyst2, cfg_bts_amr_hr_hyst2_cmd, @@ -3761,7 +3844,7 @@ AMR_HY_HELP_STR AMR_HY_HELP_STR) { get_amr_hy_from_arg(vty, 3, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } DEFUN(cfg_bts_amr_hr_hyst3, cfg_bts_amr_hr_hyst3_cmd, @@ -3770,7 +3853,7 @@ AMR_HY_HELP_STR AMR_HY_HELP_STR AMR_HY_HELP_STR) { get_amr_hy_from_arg(vty, 4, argv, 0); - return CMD_SUCCESS; + return check_amr_config(vty); } #define TRX_TEXT "Radio Transceiver\n" -- To view, visit https://gerrit.osmocom.org/11444 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8b9f69b89a39bbf4800d9790f7abe43ce66aeb71 Gerrit-Change-Number: 11444 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 14:15:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 24 Oct 2018 14:15:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11451 ) Change subject: Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I84d1aa6732f6b748d2bfdeac8f6309023717f267 Gerrit-Change-Number: 11451 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 24 Oct 2018 14:15:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 14:15:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 24 Oct 2018 14:15:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: Use Misc_Helpers.f_shutdown consistently In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11452 ) Change subject: BTS_Tests: Use Misc_Helpers.f_shutdown consistently ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia8b01a1876e969d6f0760ea625e4df83af4f54ca Gerrit-Change-Number: 11452 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 24 Oct 2018 14:15:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 14:16:25 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 24 Oct 2018 14:16:25 +0000 Subject: Change in libosmocore[master]: stats_statsd: Send all stat_items as gauges In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11323 ) Change subject: stats_statsd: Send all stat_items as gauges ...................................................................... Patch Set 1: (1 comment) The stats test actually implements its own srep->send_item, so we couldn't do it through make check easily. We could do with TTCN3, but there's no support for statsd at the moment so we need that first. https://gerrit.osmocom.org/#/c/11323/1/src/stats_statsd.c File src/stats_statsd.c: https://gerrit.osmocom.org/#/c/11323/1/src/stats_statsd.c at 187 PS1, Line 187: const char *unit = desc->unit; > Can you move this into the if below. I should probably just remove this as unit is no longer used and also remove the if (unit ==... check -- To view, visit https://gerrit.osmocom.org/11323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia16270d36c9a14521594de4b99a48c83e4ac07d4 Gerrit-Change-Number: 11323 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 24 Oct 2018 14:16:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 14:17:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 24 Oct 2018 14:17:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RSL_Emulation: Fail explicitly on ASP_IPA_EVENT_DOWN In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11429 ) Change subject: RSL_Emulation: Fail explicitly on ASP_IPA_EVENT_DOWN ...................................................................... Patch Set 4: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11429/4/library/RSL_Emulation.ttcn File library/RSL_Emulation.ttcn: https://gerrit.osmocom.org/#/c/11429/4/library/RSL_Emulation.ttcn at 354 PS4, Line 354: [not bts_role] IPA_PT.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_DOWN}) -> value evt { you can drop "-> value evt" here. -- To view, visit https://gerrit.osmocom.org/11429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idc6565c9de72d98015d56a41e5616c46051c8a8d Gerrit-Change-Number: 11429 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 24 Oct 2018 14:17:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 14:32:28 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 24 Oct 2018 14:32:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling In-Reply-To: References: Message-ID: daniel has submitted this change and it was merged. ( https://gerrit.osmocom.org/11451 ) Change subject: Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling ...................................................................... Add Misc_Helpers.ttcn to centralize TTCN3 shutdown handling This function can now be called from anywhere to try and safely shutdown a testcase. It is not optimal as we can't call "all component.stop" from outside the mtc, but without any proper and orderly shutdown handling of all our emulation components I believe this is the best we can do. To use it: import from Misc_Helpers all; in your module and then call Misc_Helpers.f_shutdown(__BFILE__, __LINE__); You can also pass the function a verdict and a message and it will take care of calling setverdict, but beware of the following: While setverdict would accept any number of arguments as log message and convert them to a log string f_shutdown expects one charstring. It's possible to use the log2str function to use the log arguments in setverdict for f_shutdown, for example setverdict(fail, "Template didn't match: ", tmpl_foo); would become Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Template didn't match: ", tmpl_foo)); Change-Id: I84d1aa6732f6b748d2bfdeac8f6309023717f267 --- M bsc-nat/gen_links.sh M bsc/gen_links.sh M ggsn_tests/gen_links.sh M hlr/gen_links.sh M lapdm/gen_links.sh A library/Misc_Helpers.ttcn M mgw/gen_links.sh M msc/gen_links.sh M pcu/gen_links.sh M sccp/gen_links.sh M selftest/gen_links.sh M sgsn/gen_links.sh M sip/gen_links.sh M sysinfo/gen_links.sh 14 files changed, 41 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/bsc-nat/gen_links.sh b/bsc-nat/gen_links.sh index 453d8ca..1ab54f1 100755 --- a/bsc-nat/gen_links.sh +++ b/bsc-nat/gen_links.sh @@ -47,7 +47,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn BSSMAP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn BSSAP_CodecPort.ttcn" +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn BSSMAP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn BSSAP_CodecPort.ttcn" gen_links $DIR $FILES ignore_pp_results diff --git a/bsc/gen_links.sh b/bsc/gen_links.sh index 88983d7..bf10761 100755 --- a/bsc/gen_links.sh +++ b/bsc/gen_links.sh @@ -67,7 +67,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn BSSMAP_Emulation.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn BSSAP_Adapter.ttcn Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn" +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn BSSMAP_Emulation.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn BSSAP_Adapter.ttcn Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn" gen_links $DIR $FILES ignore_pp_results diff --git a/ggsn_tests/gen_links.sh b/ggsn_tests/gen_links.sh index 4e012ae..82e35d4 100755 --- a/ggsn_tests/gen_links.sh +++ b/ggsn_tests/gen_links.sh @@ -45,7 +45,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn " FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Templates.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " gen_links $DIR $FILES diff --git a/hlr/gen_links.sh b/hlr/gen_links.sh index f9e80c5..872820d 100755 --- a/hlr/gen_links.sh +++ b/hlr/gen_links.sh @@ -36,7 +36,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp GSUP_Types.ttcn GSUP_Emulation.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp GSUP_Types.ttcn GSUP_Emulation.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " FILES+="SS_Templates.ttcn USSD_Helpers.ttcn " diff --git a/lapdm/gen_links.sh b/lapdm/gen_links.sh index 6236edd..12830dd 100755 --- a/lapdm/gen_links.sh +++ b/lapdm/gen_links.sh @@ -14,7 +14,7 @@ DIR=../library -FILES="General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn RLCMAC_CSN1_Types.ttcn Osmocom_Types.ttcn L1CTL_PortType.ttcn L1CTL_PortType_CtrlFunct.ttcn L1CTL_PortType_CtrlFunctDef.cc L1CTL_Types.ttcn LAPDm_RAW_PT.ttcn LAPDm_Types.ttcn RLCMAC_Types.ttcn RLCMAC_EncDec.cc" +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn RLCMAC_CSN1_Types.ttcn Osmocom_Types.ttcn L1CTL_PortType.ttcn L1CTL_PortType_CtrlFunct.ttcn L1CTL_PortType_CtrlFunctDef.cc L1CTL_Types.ttcn LAPDm_RAW_PT.ttcn LAPDm_Types.ttcn RLCMAC_Types.ttcn RLCMAC_EncDec.cc" gen_links $DIR $FILES ignore_pp_results diff --git a/library/Misc_Helpers.ttcn b/library/Misc_Helpers.ttcn new file mode 100644 index 0000000..1ca6491 --- /dev/null +++ b/library/Misc_Helpers.ttcn @@ -0,0 +1,28 @@ +module Misc_Helpers { + +/* Try to properly shutdown a testcase. + * The reliable method to stop a testcase without running into dynamic + * testcase errors due to unconnected ports receiving messages is to call + * all component.stop before terminating. However, this can only be called + * from the mtc! So in case we want to terminate from a component that is not + * the mtc we try to do the next best thing which is calling mtc.stop and + * hoping for the best. + */ +function f_shutdown(charstring file, integer line, verdicttype verdict := none, + charstring text := "") { + if (verdict != none) { + text := file & ":" & int2str(line) & " : " & text + setverdict(verdict, text); + } + + log("Stopping testcase execution from ", file, ":", line) + if (self == mtc) { + /* Properly stop all ports before disconnecting them. This avoids + * running into the dynamic testcase error due to messages arriving on + * unconnected ports. */ + all component.stop; + } + mtc.stop +} + +} diff --git a/mgw/gen_links.sh b/mgw/gen_links.sh index 9e88f17..8b2def7 100755 --- a/mgw/gen_links.sh +++ b/mgw/gen_links.sh @@ -30,7 +30,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn Osmocom_Types.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc " FILES+="RTP_CodecPort.ttcn RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_Emulation.ttcn IuUP_EncDec.cc " gen_links $DIR $FILES diff --git a/msc/gen_links.sh b/msc/gen_links.sh index df646d9..5d73fea 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -86,7 +86,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn MNCC_Types.ttcn MNCC_EncDec.cc MNCC_CodecPort.ttcn mncc.h MNCC_Emulation.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn MNCC_Types.ttcn MNCC_EncDec.cc MNCC_CodecPort.ttcn mncc.h MNCC_Emulation.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc GSUP_Types.ttcn GSUP_Emulation.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn L3_Templates.ttcn L3_Common.ttcn " FILES+="BSSMAP_Emulation.ttcn BSSAP_CodecPort.ttcn BSSMAP_Templates.ttcn BSSAP_Adapter.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_Emulation.ttcn " diff --git a/pcu/gen_links.sh b/pcu/gen_links.sh index 06ed606..6f33433 100755 --- a/pcu/gen_links.sh +++ b/pcu/gen_links.sh @@ -46,7 +46,7 @@ DIR=../library -FILES="General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc L1CTL_Types.ttcn L1CTL_PortType.ttcn L1CTL_PortType_CtrlFunct.ttcn L1CTL_PortType_CtrlFunctDef.cc LAPDm_RAW_PT.ttcn LAPDm_Types.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc L1CTL_Types.ttcn L1CTL_PortType.ttcn L1CTL_PortType_CtrlFunct.ttcn L1CTL_PortType_CtrlFunctDef.cc LAPDm_RAW_PT.ttcn LAPDm_Types.ttcn " FILES+="NS_Emulation.ttcn NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc " FILES+="BSSGP_Emulation.ttcn Osmocom_Gb_Types.ttcn " FILES+="LLC_Templates.ttcn L3_Templates.ttcn L3_Common.ttcn " diff --git a/sccp/gen_links.sh b/sccp/gen_links.sh index faf347c..614e0f1 100755 --- a/sccp/gen_links.sh +++ b/sccp/gen_links.sh @@ -52,7 +52,7 @@ DIR=../library -FILES="General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn " FILES+="Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " diff --git a/selftest/gen_links.sh b/selftest/gen_links.sh index 73b812d..09d2f26 100755 --- a/selftest/gen_links.sh +++ b/selftest/gen_links.sh @@ -39,7 +39,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn BSSAP_CodecPort.ttcn Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn GSUP_Types.ttcn" +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn BSSAP_CodecPort.ttcn Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn GSUP_Types.ttcn" gen_links $DIR $FILES ignore_pp_results diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh index 1c3fb1d..fe09726 100755 --- a/sgsn/gen_links.sh +++ b/sgsn/gen_links.sh @@ -54,7 +54,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc " +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc " FILES+="NS_Emulation.ttcn NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc " FILES+="BSSGP_Emulation.ttcn Osmocom_Gb_Types.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " diff --git a/sip/gen_links.sh b/sip/gen_links.sh index 37c0a70..cf09731 100755 --- a/sip/gen_links.sh +++ b/sip/gen_links.sh @@ -39,7 +39,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn MNCC_Types.ttcn MNCC_EncDec.cc MNCC_CodecPort.ttcn mncc.h MNCC_Emulation.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn MNCC_Types.ttcn MNCC_EncDec.cc MNCC_CodecPort.ttcn mncc.h MNCC_Emulation.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunctDef.cc " diff --git a/sysinfo/gen_links.sh b/sysinfo/gen_links.sh index 314b3b1..f44350a 100755 --- a/sysinfo/gen_links.sh +++ b/sysinfo/gen_links.sh @@ -21,7 +21,7 @@ gen_links $DIR $FILES DIR=../library -FILES="GSMTAP_PortType.ttcn GSMTAP_Types.ttcn GSM_SystemInformation.ttcn GSM_RR_Types.ttcn RLCMAC_CSN1_Types.ttcn GSM_Types.ttcn IPL4_GSMTAP_CtrlFunct.ttcn IPL4_GSMTAP_CtrlFunctDef.cc Osmocom_Types.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn" +FILES="GSMTAP_PortType.ttcn GSMTAP_Types.ttcn GSM_SystemInformation.ttcn GSM_RR_Types.ttcn RLCMAC_CSN1_Types.ttcn GSM_Types.ttcn IPL4_GSMTAP_CtrlFunct.ttcn IPL4_GSMTAP_CtrlFunctDef.cc Osmocom_Types.ttcn Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn" gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/11451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I84d1aa6732f6b748d2bfdeac8f6309023717f267 Gerrit-Change-Number: 11451 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 14:32:28 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 24 Oct 2018 14:32:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: Use Misc_Helpers.f_shutdown consistently In-Reply-To: References: Message-ID: daniel has submitted this change and it was merged. ( https://gerrit.osmocom.org/11452 ) Change subject: BTS_Tests: Use Misc_Helpers.f_shutdown consistently ...................................................................... BTS_Tests: Use Misc_Helpers.f_shutdown consistently Replace all calls to setverdict(fail) with f_shutdown() since I'd rather fail and stop early in case we encounter an error. Only replace setverdict(pass) with f_shutdown() if it is followed by mtc.stop Remove internal function f_shutdown and use the one from Misc_Helpers Change-Id: Ia8b01a1876e969d6f0760ea625e4df83af4f54ca --- M bts/BTS_Tests.ttcn M bts/gen_links.sh 2 files changed, 131 insertions(+), 208 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index fe0a933..5b073ef 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1,5 +1,6 @@ module BTS_Tests { +import from Misc_Helpers all; import from General_Types all; import from GSM_Types all; import from GSM_RR_Types all; @@ -270,8 +271,7 @@ pcu_last_info := sd.data; } [] pt.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(?, ?, ?))) -> value sd { - setverdict(fail, "Invalid PCU Version/BTS Number received"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Invalid PCU Version/BTS Number received"); } } @@ -289,8 +289,7 @@ alt { [] as_pcu_info_ind(pt, pcu_conn_id, pcu_last_info); [] T.timeout { - setverdict(fail, "Timeout waiting for PCU INFO_IND"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for PCU INFO_IND"); } } } @@ -341,8 +340,7 @@ alt { [] RSL_CCHAN.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_UP}); [] T.timeout { - setverdict(fail, "Timeout waiting for ASP_IPA_EVENT_UP"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for ASP_IPA_EVENT_UP"); } } f_sleep(0.5); /* workaround for OS#3000 */ @@ -366,12 +364,6 @@ } } -function f_shutdown() runs on test_CT { - /* mtc.stop cleanly stops testcase execution to avoid unclean shutdown */ - all component.stop; - mtc.stop; -} - /* Attach L1CTL to master test_CT (classic tests, non-handler mode) */ function f_init_l1ctl() runs on test_CT { map(self:L1CTL, system:L1CTL); @@ -415,8 +407,7 @@ private altstep as_Tguard() runs on ConnHdlr { [] g_Tguard.timeout { - setverdict(fail, "Tguard timeout"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Tguard timeout"); } } @@ -430,8 +421,7 @@ res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BB_TRXC, mp_bb_trxc_ip, mp_bb_trxc_port, "", -1, -1, {udp:={}}, {}); if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect to trx-control interface of trxcon, check your configuration"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Could not connect to trx-control interface of trxcon, check your configuration"); } g_bb_trxc_conn_id := res.connId; } @@ -481,15 +471,13 @@ setverdict(pass); } [] T.timeout { - setverdict(fail, "Timeout expecting " & id); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout expecting " & id); } [not ignore_other] as_l1_sacch(); [not ignore_other] as_meas_res(); [not ignore_other] as_l1_dcch(); [not ignore_other] RSL.receive { - setverdict(fail, "Unexpected RSL message received"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected RSL message received"); } [ignore_other] RSL.receive { repeat; } } @@ -566,7 +554,7 @@ f_init(testcasename()); vc_conn := f_start_handler(refers(f_TC_chan_act_stress), pars); vc_conn.done; - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } /* Test if re-activation of an already active channel fails as expected */ @@ -576,8 +564,7 @@ RSL.send(ts_RSL_CHAN_ACT(g_chan_nr, g_pars.chan_mode)); alt { [] RSL.receive(tr_RSL_CHAN_ACT_ACK(g_chan_nr)) { - setverdict(fail, "Unexpected CHAN ACT ACK on double activation"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected CHAN ACT ACK on double activation"); } [] RSL.receive(tr_RSL_CHAN_ACT_NACK(g_chan_nr)) { setverdict(pass); @@ -591,7 +578,7 @@ f_init(); vc_conn := f_start_handler(refers(f_TC_chan_act_react), pars); vc_conn.done; - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } /* Attempt to de-activate a channel that's not active */ @@ -604,8 +591,7 @@ setverdict(pass); } [] T.timeout { - setverdict(fail, "Timeout expecting RF_CHAN_REL_ACK"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout expecting RF_CHAN_REL_ACK"); } } } @@ -614,7 +600,7 @@ f_init(); var ConnHdlr vc_conn := f_start_handler(refers(f_TC_chan_deact_not_active), pars); vc_conn.done; - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } /* attempt to activate channel with wrong RSL Channel Nr IE; expect NACK */ @@ -622,8 +608,7 @@ RSL.send(ts_RSL_CHAN_ACT(g_chan_nr, g_pars.chan_mode)); alt { [] RSL.receive(tr_RSL_CHAN_ACT_ACK(g_chan_nr)) { - setverdict(fail, "Unexpected CHAN ACT ACK"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected CHAN ACT ACK"); } [] RSL.receive(tr_RSL_CHAN_ACT_NACK(g_chan_nr)) { setverdict(pass); @@ -667,7 +652,7 @@ vc_conn := f_start_handler(refers(f_TC_chan_act_wrong_nr), pars); vc_conn.done; } - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } /* execute the same callback function on a variety of logical channels */ @@ -684,7 +669,7 @@ vc_conn.done; } - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } /*********************************************************************** @@ -696,8 +681,7 @@ T_sacch.start; alt { [not exp] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(0))) { - setverdict(fail, "Received SACCH when not expecting it"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Received SACCH when not expecting it"); } [not exp] T_sacch.timeout { setverdict(pass); @@ -706,8 +690,7 @@ setverdict(pass); } [exp] T_sacch.timeout { - setverdict(fail, "Timeout waiting for SACCH on ", g_chan_nr); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Timeout waiting for SACCH on ", g_chan_nr)); } [] L1CTL.receive { repeat; } [] RSL.receive { repeat; } @@ -750,7 +733,7 @@ vc_conn.done; } /* TODO: do the above in parallel, rather than sequentially? */ - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } /* verify that given SACCH payload is present */ @@ -771,8 +754,7 @@ } [] L1CTL.receive { repeat; } [] T_sacch.timeout { - setverdict(fail, "Timeout waiting for SACCH ", l3_exp); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Timeout waiting for SACCH ", l3_exp)); } } } @@ -788,8 +770,7 @@ [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(0))) -> value dl { var octetstring l3 := substr(dl.payload.data_ind.payload, 4, 19); if (match(l3, l3_exp)) { - setverdict(fail, "Received unexpected SACCH ", dl); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received unexpected SACCH ", dl)); } else { repeat; } @@ -832,7 +813,7 @@ vc_conn.done; } /* TODO: do the above in parallel, rather than sequentially? */ - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } /* Test for lchan-specific SACCH INFO MODIFY (TS 48.058 4.12) */ @@ -880,7 +861,7 @@ vc_conn.done; } /* TODO: do the above in parallel, rather than sequentially? */ - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } /* Test SACCH scheduling of multiple different SI message types */ @@ -923,7 +904,7 @@ vc_conn.done; } /* TODO: do the above in parallel, rather than sequentially? */ - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } /* Test if SACH information is modified as expected */ @@ -969,7 +950,7 @@ vc_conn.done; } /* TODO: do the above in parallel, rather than sequentially? */ - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } /* TODO: Test for SACCH information present in RSL CHAN ACT (overrides FILLING) */ @@ -1017,8 +998,7 @@ var OCT1 ra := f_rnd_ra_cs(); var GsmFrameNumber fn := f_L1CTL_RACH(L1CTL, oct2int(ra)); if (fn == fn_last) { - setverdict(fail, "Two RACH in same FN?!?"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Two RACH in same FN?!?"); } fn_last := fn; @@ -1029,18 +1009,16 @@ T.stop; } [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(?, ?, ?))) { - setverdict(fail, "Unexpected CHAN RQD"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected CHAN RQD"); } [] RSL_CCHAN.receive { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for CHAN RQD"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for CHAN RQD"); } } } setverdict(pass); - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } /* Send 1000 RACH Requests (flood ~ 89/s) and count if count(Abis) == count(Um) */ @@ -1055,8 +1033,7 @@ var OCT1 ra := f_rnd_ra_cs(); var GsmFrameNumber fn := f_L1CTL_RACH(L1CTL, oct2int(ra)); if (fn == fn_last) { - setverdict(fail, "Two RACH in same FN?!?"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Two RACH in same FN?!?"); } fn_last := fn; } @@ -1075,9 +1052,9 @@ if (rsl_chrqd == 1000) { setverdict(pass); } else { - setverdict(fail, "Received only ", rsl_chrqd, " out of 1000 RACH"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received only ", rsl_chrqd, " out of 1000 RACH")); } - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } private function f_main_trxc_connect() runs on test_CT { @@ -1086,8 +1063,7 @@ res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BB_TRXC, mp_bb_trxc_ip, mp_bb_trxc_port, "", -1, -1, {udp:={}}, {}); if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect to trx-control interface of trxcon, check your configuration"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Could not connect to trx-control interface of trxcon, check your configuration"); } g_bb_trxc_conn_id := res.connId; } @@ -1110,16 +1086,14 @@ setverdict(pass); } [not expect_pass] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(ra, fn))) { - setverdict(fail, "RACH passed but was expected to be dropped: ", toffs256); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("RACH passed but was expected to be dropped: ", toffs256)); } [] RSL_CCHAN.receive { repeat; } [not expect_pass] T.timeout { setverdict(pass); } [expect_pass] T.timeout { - setverdict(fail, "Timeout waiting for CHAN RQD"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for CHAN RQD"); } } } @@ -1146,7 +1120,7 @@ /* more than 63 bits is not legal / permitted */ f_rach_toffs(64*256, false); f_rach_toffs(127*256, false); - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } /*********************************************************************** @@ -1322,17 +1296,14 @@ g_first_meas_res := false; repeat; } else { - setverdict(fail, "Received unspecific MEAS RES ", rsl); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received unspecific MEAS RES ", rsl)); } } [] RSL.receive(tr_RSL_MEAS_RES(?)) -> value rsl { - setverdict(fail, "Received unexpected MEAS RES ", rsl); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received unexpected MEAS RES ", rsl)); } [g_Tmeas_exp.running] g_Tmeas_exp.timeout { - setverdict(fail, "Didn't receive expected measurement result") - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Didn't receive expected measurement result") } } @@ -1347,7 +1318,9 @@ case (RSL_ALG_ID_A5_6) { return 6; } case (RSL_ALG_ID_A5_7) { return 7; } case else { - setverdict(fail, "Unknwon Algorithm ID"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unknwon Algorithm ID"); + /* Make compiler happy by calling mtc.stop here. It is already + * called in f_shutdown */ mtc.stop; } } @@ -1363,7 +1336,9 @@ case (RSL_ALG_ID_A5_6) { return '101'B; } case (RSL_ALG_ID_A5_7) { return '110'B; } case else { - setverdict(fail, "Unknwon Algorithm ID"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unknwon Algorithm ID"); + /* Make compiler happy by calling mtc.stop here. It is already + * called in f_shutdown */ mtc.stop; } } @@ -1435,13 +1410,12 @@ [] as_l1_dcch(); [] L1CTL.receive { repeat; } [g_Tmeas_exp.running] T.timeout { - /* as_meas_res() would have done setverdict(fail) / mtc.stop in case + /* as_meas_res() would have done Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail) in case * of any earlier errors, so if we reach this timeout, we're good */ setverdict(pass); } [] T.timeout { - setverdict(fail, "No MEAS RES received at all"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "No MEAS RES received at all"); } } f_rsl_chan_deact(); @@ -1457,7 +1431,7 @@ vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars); vc_conn.done; } - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } testcase TC_meas_res_sign_tchh() runs on test_CT { var ConnHdlr vc_conn; @@ -1468,7 +1442,7 @@ vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars); vc_conn.done; } - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } testcase TC_meas_res_sign_sdcch4() runs on test_CT { var ConnHdlr vc_conn; @@ -1479,7 +1453,7 @@ vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars); vc_conn.done; } - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } testcase TC_meas_res_sign_sdcch8() runs on test_CT { var ConnHdlr vc_conn; @@ -1490,7 +1464,7 @@ vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars); vc_conn.done; } - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } testcase TC_meas_res_sign_tchh_toa256() runs on test_CT { var ConnHdlr vc_conn; @@ -1503,7 +1477,7 @@ vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars); vc_conn.done; } - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } @@ -1524,8 +1498,7 @@ } [] RSL.receive { repeat }; [] T.timeout { - setverdict(fail, "No CONN FAIL IND received"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "No CONN FAIL IND received"); } } f_rsl_chan_deact(); @@ -1570,8 +1543,7 @@ fn_check.frame_nr := frame_nr_51; if (bs_ag_blks_res < 0 or bs_ag_blks_res > 7) { - setverdict(fail, "bs_ag_blks_res out of valid range (0..7)"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "bs_ag_blks_res out of valid range (0..7)"); return; } @@ -1600,8 +1572,7 @@ return; } - setverdict(fail, "received paging on AGCH"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "received paging on AGCH"); return; } @@ -1716,8 +1687,7 @@ repeat; } [not cfg.exp_overload] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_PAGING_LOAD_IND(0))) { - setverdict(fail, "Unexpected PCH Overload"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected PCH Overload"); } [cfg.exp_load_ind] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_PAGING_LOAD_IND)) { log("Rx LOAD_IND"); @@ -1775,8 +1745,7 @@ [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_PAGING_LOAD_IND(65535))) { } [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_PAGING_LOAD_IND)) { repeat; } [] T_wait.timeout { - setverdict(fail, "Waiting for empty paging queue"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Waiting for empty paging queue"); } [] as_rsl_res_ind(); } @@ -1802,12 +1771,12 @@ }; var PagingTestState st := f_TC_paging(cfg); if (st.num_paging_sent != st.num_paging_rcv_ids) { - setverdict(fail, "Expected ", st.num_paging_sent, " pagings but have ", - st.num_paging_rcv_ids); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Expected ", st.num_paging_sent, " pagings but have ", + st.num_paging_rcv_ids)); } else { setverdict(pass); } - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } /* Create ~ 80% paging load (TMSI only) sustained for about 20s, verifying that @@ -1826,12 +1795,12 @@ }; var PagingTestState st := f_TC_paging(cfg); if (st.num_paging_sent != st.num_paging_rcv_ids) { - setverdict(fail, "Expected ", st.num_paging_sent, " pagings but have ", - st.num_paging_rcv_ids); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Expected ", st.num_paging_sent, " pagings but have ", + st.num_paging_rcv_ids)); } else { setverdict(pass); } - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } /* Create ~ 200% paging load (IMSI only) sustained for about 20s, verifying that @@ -1853,11 +1822,11 @@ * slots and will fully drain that buffer before returning */ var template integer tpl := (st.num_paging_sent*78/100 .. st.num_paging_sent *85/100); if (not match(st.num_paging_rcv_ids, tpl)) { - setverdict(fail, "Expected ", tpl, " pagings but have ", st.num_paging_rcv_ids); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Expected ", tpl, " pagings but have ", st.num_paging_rcv_ids)); } else { setverdict(pass); } - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } /* Create ~ 200% paging load (TMSI only) sustained for about 20s, verifying that @@ -1879,11 +1848,11 @@ * slots and will fully drain that buffer before returning */ var template integer tpl := (st.num_paging_sent*64/100 .. st.num_paging_sent *72/100); if (not match(st.num_paging_rcv_ids, tpl)) { - setverdict(fail, "Expected ", tpl, " pagings but have ", st.num_paging_rcv_ids); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Expected ", tpl, " pagings but have ", st.num_paging_rcv_ids)); } else { setverdict(pass); } - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } @@ -1946,8 +1915,7 @@ var GsmRrMessage rr := dec_GsmRrMessage(l1_dl.payload.data_ind.payload); if (not match(rr, tr_IMM_ASS(42, ?, 5, ?, ?))) { /* FIXME: Why are we seeing paging requests on PCH/AGCH? */ - //setverdict(fail, "Unexpected IMM-ASS values on AGCH: ", rr); - //mtc.stop; + //Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected IMM-ASS values on AGCH: ", rr)); } else { num_rx := num_rx+1; } @@ -1959,16 +1927,15 @@ res_str := f_fmt_ia_stats(num_tx, num_rx, num_del); log("AGCH test: " & res_str); if (num_rx + num_del != num_tx) { - setverdict(fail, "RX + DEL != TX ?!?: " & res_str); - mtc.stop + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "RX + DEL != TX ?!?: " & res_str); } rx_ratio := int2float(num_rx) / int2float(num_tx); if (rx_ratio < exp_pass*0.8 or rx_ratio > exp_pass*1.2) { - setverdict(fail, "RX ratio ("&float2str(rx_ratio)&") far from expected ("&float2str(exp_pass)&") " & res_str); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "RX ratio ("&float2str(rx_ratio)&") far from expected ("&float2str(exp_pass)&") " & res_str); } else { setverdict(pass); } - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } /* send a long burst of 1000 IMM.ASS with 20ms spacing (50 per s); expect 75% of them to be deleted */ @@ -2021,8 +1988,7 @@ /* ensure a given TC slot of the SI vector contains given SI type at least once at TC */ function f_ensure_si_vec_contains(SystemInformationVectorPerTc arr, integer tc, RrMessageType key, boolean ext_bcch := false) { if (not f_si_vecslot_contains(arr[tc], key, ext_bcch)) { - setverdict(fail, "No ", key, " in TC=", tc, "!"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("No ", key, " in TC=", tc, "!")); } } @@ -2041,8 +2007,7 @@ function f_si_vecslot_contains_n_of_m(SystemInformationVector arr, RrMessageType key, boolean bcch_ext := false, integer n := 1, integer m := 4) return boolean { var integer count := 0; if (sizeof(arr) < m) { - setverdict(fail, "Error: Insufficient SI in array"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Error: Insufficient SI in array"); } for (var integer i:= 0; i < m; i := i + 1) { var integer fn_mod51 := arr[i].frame_number mod 51; @@ -2063,8 +2028,7 @@ /* ensure a given TC slot of the SI vector contains given SI type at least N out of M times at TC */ function f_ensure_si_vec_contains_n_of_m(SystemInformationVectorPerTc arr, integer tc, RrMessageType key, boolean ext_bcch := false, integer n, integer m) { if (not f_si_vecslot_contains_n_of_m(arr[tc], key, ext_bcch, n, m)) { - setverdict(fail, "Not ", n, "/", m, " of ", key, " in TC=", tc, "!"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Not ", n, "/", m, " of ", key, " in TC=", tc, "!")); } } @@ -2085,8 +2049,7 @@ /* ensure a given TC slot of the SI vector contains only given SI type */ function f_ensure_si_vec_contains_only(SystemInformationVectorPerTc arr, integer tc, RrMessageType key, boolean ext_bcch := false) { if (not f_si_vecslot_contains_only(arr[tc], key, ext_bcch)) { - setverdict(fail, "Not all ", key, " in TC=", tc, "!"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Not all ", key, " in TC=", tc, "!")); } } @@ -2115,8 +2078,7 @@ var integer i; for (i := 0; i < sizeof(si_per_tc); i := i + 1) { if (sizeof(si_per_tc[i]) == 0) { - setverdict(fail, "No SI messages for TC=", i); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("No SI messages for TC=", i)); } } if (cfg.si1_present) { @@ -2198,8 +2160,7 @@ f_ensure_si_vec_contains(si_per_tc, 0, SYSTEM_INFORMATION_TYPE_13, true); } if (f_si_vec_contains(si_per_tc, SYSTEM_INFORMATION_TYPE_13alt)) { - setverdict(fail, "Cannot have SI13alt and SI13"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Cannot have SI13alt and SI13"); } } if (cfg.si16_present or cfg.si17_present) { @@ -2209,8 +2170,7 @@ testcase.stop("Error: Cannot have SI16/SI17 and SI22!"); } if (f_si_vec_contains(si_per_tc, SYSTEM_INFORMATION_TYPE_22)) { - setverdict(fail, "Cannot have SI16/SI17 and SI22!"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Cannot have SI16/SI17 and SI22!"); } if (not cfg.bcch_extended) { testcase.stop("Error: SI16/SI17 requires BCCH Extd!"); @@ -2255,8 +2215,7 @@ testcase.stop("Error: Cannot have SI13alt and SI13"); } if (f_si_vec_contains(si_per_tc, SYSTEM_INFORMATION_TYPE_13)) { - setverdict(fail, "Cannot have SI13alt and SI13"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Cannot have SI13alt and SI13"); } if (not cfg.bcch_extended) { f_ensure_si_vec_contains_n_of_m(si_per_tc, 4, SYSTEM_INFORMATION_TYPE_13alt, false, 1, 4); @@ -2287,8 +2246,7 @@ } else { f_ensure_si_vec_contains_n_of_m(si_per_tc, 4, SYSTEM_INFORMATION_TYPE_21, true, 1, 4); if (f_si_vecslot_contains(si_per_tc[4], SYSTEM_INFORMATION_TYPE_21)) { - setverdict(fail, "Cannot have SI21 on BCCH Norm if BCCH Extd enabled!"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Cannot have SI21 on BCCH Norm if BCCH Extd enabled!"); } } } @@ -2302,8 +2260,7 @@ } if (f_si_vec_contains(si_per_tc, SYSTEM_INFORMATION_TYPE_16) or f_si_vec_contains(si_per_tc, SYSTEM_INFORMATION_TYPE_17)) { - setverdict(fail, "Cannot have SI16/SI17 and SI22!"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Cannot have SI16/SI17 and SI22!"); } if (not cfg.bcch_extended) { testcase.stop("Error: SI22 requires BCCH Extd!"); @@ -2375,7 +2332,7 @@ f_init(); /* 2+3+4 are mandatory and set in f_init() */ f_TC_si_sched(); - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } testcase TC_si_sched_1() runs on test_CT { @@ -2383,7 +2340,7 @@ si_cfg.si1_present := true; f_rsl_bcch_fill_raw(RSL_SYSTEM_INFO_1, '5506198fb38000000000000000000000000000e504002b'O); f_TC_si_sched(); - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } testcase TC_si_sched_2bis() runs on test_CT { @@ -2391,7 +2348,7 @@ si_cfg.si2bis_present := true; f_rsl_bcch_fill_raw(RSL_SYSTEM_INFO_2bis, '550602bfe809b3ff00000000000000000000007900002b'O); f_TC_si_sched(); - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } testcase TC_si_sched_2ter() runs on test_CT { @@ -2399,7 +2356,7 @@ si_cfg.si2ter_present := true; f_rsl_bcch_fill_raw(RSL_SYSTEM_INFO_2ter, '010603bf66b0aa0a00000002000000000000002b2b2b2b'O); f_TC_si_sched(); - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } testcase TC_si_sched_2ter_2bis() runs on test_CT { @@ -2409,7 +2366,7 @@ si_cfg.si2ter_present := true; f_rsl_bcch_fill_raw(RSL_SYSTEM_INFO_2ter, '010603bf66b0aa0a00000002000000000000002b2b2b2b'O); f_TC_si_sched(); - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } testcase TC_si_sched_2quater() runs on test_CT { @@ -2417,7 +2374,7 @@ si_cfg.si2quater_present := true; f_rsl_bcch_fill_raw(RSL_SYSTEM_INFO_2quater, '050607a8a0364aa698d72ff424feee0506d5e7fff02043'O); f_TC_si_sched(); - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } testcase TC_si_sched_13() runs on test_CT { @@ -2425,7 +2382,7 @@ si_cfg.si13_present := true; f_rsl_bcch_fill_raw(RSL_SYSTEM_INFO_13, '0106009000185a6fc9e08410ab2b2b2b2b2b2b2b2b2b2b'O); f_TC_si_sched(); - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } testcase TC_si_sched_13_2bis_2ter_2quater() runs on test_CT { @@ -2439,7 +2396,7 @@ si_cfg.si13_present := true; f_rsl_bcch_fill_raw(RSL_SYSTEM_INFO_13, '0106009000185a6fc9e08410ab2b2b2b2b2b2b2b2b2b2b'O); f_TC_si_sched(); - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } @@ -2449,7 +2406,7 @@ //ts_RSL_BCCH_INFO(si_type, info); /* expect no ERROR REPORT after either of them * /* negative test: ensure ERROR REPORT on unsupported types */ - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } /*********************************************************************** @@ -2464,15 +2421,13 @@ setverdict(pass); } [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_ERROR_REPORT(?))) { - setverdict(fail, "Wrong cause in RSL ERR REP"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Wrong cause in RSL ERR REP"); } [] RSL_CCHAN.receive { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for RSL ERR REP"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for RSL ERR REP"); } } } @@ -2618,8 +2573,7 @@ T.start; alt { [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RTS_REQ(bts_nr))) { - setverdict(fail, "PCU RTS.req before PDCH active?"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "PCU RTS.req before PDCH active?"); } [] PCU.receive { repeat; } [] T.timeout { } @@ -2636,17 +2590,14 @@ } [not exp_success] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RTS_REQ(bts_nr, trx_nr, ts_nr))) { - setverdict(fail, "Unexpected RTS.req for supposedly failing activation"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected RTS.req for supposedly failing activation"); } [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RTS_REQ)) { - setverdict(fail, "RTS.req for wrong TRX/TS"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "RTS.req for wrong TRX/TS"); } [] PCU.receive { repeat; } [exp_success] T.timeout { - setverdict(fail, "Timeout waiting for PCU RTS.req"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for PCU RTS.req"); } [not exp_success] T.timeout { setverdict(pass); @@ -2666,8 +2617,7 @@ T.start; alt { [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RTS_REQ(bts_nr, trx_nr, ts_nr))) { - setverdict(fail, "Received unexpected PCU RTS.req"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Received unexpected PCU RTS.req"); } [] PCU.receive { repeat; } [] T.timeout { @@ -2737,8 +2687,7 @@ } [] PCU.receive { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for SI13"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for SI13"); } } } @@ -2771,8 +2720,7 @@ } [] PCU.receive { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for RTS.ind"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for RTS.ind"); } } } @@ -2845,8 +2793,7 @@ } [] L1CTL.receive { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for PCU-originated AGCH block on Um"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for PCU-originated AGCH block on Um"); } } } @@ -2870,8 +2817,7 @@ } [] L1CTL.receive { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for PCU-originated AGCH block on Um"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for PCU-originated AGCH block on Um"); } } } @@ -2887,8 +2833,7 @@ var OCT1 ra := f_rnd_ra_ps(); var GsmFrameNumber fn := f_L1CTL_RACH(L1CTL, oct2int(ra)); if (fn == fn_last) { - setverdict(fail, "Two RACH in same FN?!?"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Two RACH in same FN?!?"); } fn_last := fn; @@ -2899,13 +2844,11 @@ T.stop; } [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RACH_IND)) { - setverdict(fail, "Unexpected RACH IND"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected RACH IND"); } [] PCU.receive { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for RACH IND"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for RACH IND"); } } } @@ -2943,13 +2886,11 @@ [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_PAG_REQ(0, t_mi_lv))) { } [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_PAG_REQ)) { - setverdict(fail, "Unexpected PAGING REQ"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected PAGING REQ"); } [] PCU.receive { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for PAGING REQ"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for PAGING REQ"); } } } @@ -2970,8 +2911,7 @@ alt { [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd { if (substr(sd.data.u.info_ind.trx[trx_nr].pdch_mask, g_chan_nr.tn, 1) != '1'B) { - setverdict(fail, "PCUIF_INFO_IND PDCH_MASK not '1' after PDCH ACT"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "PCUIF_INFO_IND PDCH_MASK not '1' after PDCH ACT"); } } [] PCU.receive { repeat; } @@ -2991,8 +2931,7 @@ alt { [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd { if (substr(sd.data.u.info_ind.trx[trx_nr].pdch_mask, g_chan_nr.tn, 1) != '0'B) { - setverdict(fail, "PCUIF_INFO_IND PDCH_MASK not '0' after PDCH DEACT"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "PCUIF_INFO_IND PDCH_MASK not '0' after PDCH DEACT"); } } [] PCU.receive { repeat; } @@ -3154,8 +3093,7 @@ alt { [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd { if (substr(sd.data.u.info_ind.trx[trx_nr].pdch_mask, g_chan_nr.tn, 1) != '1'B) { - setverdict(fail, "PCUIF_INFO_IND PDCH_MASK not '1' after PDCH ACT"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "PCUIF_INFO_IND PDCH_MASK not '1' after PDCH ACT"); } } [] PCU.receive { repeat; } @@ -3177,8 +3115,7 @@ alt { [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd { if (substr(sd.data.u.info_ind.trx[trx_nr].pdch_mask, g_chan_nr.tn, 1) != '0'B) { - setverdict(fail, "PCUIF_INFO_IND PDCH_MASK not '0' after PDCH DEACT"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "PCUIF_INFO_IND PDCH_MASK not '0' after PDCH DEACT"); } } [] PCU.receive { repeat; } @@ -3263,8 +3200,7 @@ alt { [] RSL.receive(tr_RSL_IPA_PDCH_ACT_NACK(g_chan_nr, ?)); [] RSL.receive(tr_RSL_IPA_PDCH_ACT_ACK(g_chan_nr, ?)) { - setverdict(fail, "Unexpected PDCH ACT ACK"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected PDCH ACT ACK"); } [] RSL.receive { repeat; } } @@ -3373,7 +3309,7 @@ } } - f_shutdown(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } /* test if SABM on Um triggers EST IND (TS 48.058 3.1) */ @@ -3395,23 +3331,20 @@ if (tc.exp) { setverdict(pass); } else { - setverdict(fail, "Unexpected EST IND with L3 in ", tc); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected EST IND with L3 in ", tc)); } } [tc.l3 == ''O] RSL.receive(tr_RSL_EST_IND_NOL3(g_chan_nr, tc.link_id)) { if (tc.exp) { setverdict(pass); } else { - setverdict(fail, "Unexpected EST IND without L3 in ", tc); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected EST IND without L3 in ", tc)); } } /* We also expect to receive the measurements */ [] as_meas_res(verify_meas := false); [tc.exp] T.timeout { - setverdict(fail, "Timeout waiting for EST IND"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for EST IND"); } [not tc.exp] T.timeout { setverdict(pass); @@ -3472,8 +3405,7 @@ } [] L1CTL.receive { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for SABM"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for SABM"); } } @@ -3527,8 +3459,7 @@ T.start; alt { [] T.timeout { - setverdict(fail, "Timeout waiting for LAPDm ", exp); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Timeout waiting for LAPDm ", exp)); } [] as_l1_exp_lapdm(exp); } @@ -3543,8 +3474,7 @@ [l3 != ''O] RSL.receive(tr_RSL_EST_IND(g_chan_nr, link_id, l3)); [l3 == ''O] RSL.receive(tr_RSL_EST_IND_NOL3(g_chan_nr, link_id)); [] RSL.receive(tr_RSL_ERROR_IND(g_chan_nr, link_id, ?)) { - setverdict(fail, "Failing due to RSL_ERROR_IND"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Failing due to RSL_ERROR_IND"); } [] RSL.receive { repeat; } } @@ -3754,8 +3684,7 @@ private altstep as_rsl_any_ind(boolean exp_any) runs on ConnHdlr { [exp_any] RSL.receive { repeat; } [not exp_any] RSL.receive { - setverdict(fail, "Unexpected RSL message!"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected RSL message!"); } } @@ -3777,8 +3706,7 @@ [exp_sacch] as_meas_res(verify_meas := false); [] as_rsl_any_ind(exp_any); [] T.timeout { - setverdict(fail, "Timeout waiting for UNIT_DATA_IND"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for UNIT_DATA_IND"); } } } @@ -3802,8 +3730,7 @@ [exp_sacch] as_meas_res(verify_meas := false); [] as_rsl_any_ind(exp_any); [] T.timeout { - setverdict(fail, "Timeout waiting for DATA_IND"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for DATA_IND"); } } } @@ -3910,14 +3837,12 @@ if (ischosen(exp_match.ab)) { lf.ab := dec_LapdmFrameAB(enc); } else { - setverdict(fail, "unsupported frame type"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "unsupported frame type"); } /* check if decoder result matches expectation */ if (not match(lf, exp_match)) { - setverdict(fail, name, ": decoded LAPDm doesn't match"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str(name, ": decoded LAPDm doesn't match")); } else { log(name, ": matched"); setverdict(pass); @@ -3926,8 +3851,7 @@ /* test if re-encoded frame equals original input */ reenc := enc_LapdmFrame(lf); if (enc != reenc) { - setverdict(fail, name, ": re-encoded LAPDm frame doesn't match"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str(name, ": re-encoded LAPDm frame doesn't match")); } else { setverdict(pass); } @@ -4025,7 +3949,7 @@ T.stop; f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); - setverdict(fail, "Received fill frame on non-TCH/F channel; DTX is only allowed on TCH/F!"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Received fill frame on non-TCH/F channel; DTX is only allowed on TCH/F!"); } if (fn > first_fn + frame_dtx_tchf_mod) { T.stop; @@ -4039,7 +3963,7 @@ if (nfill_frames_sacch + nfill_frames_nonsacch < expected_fill_frames) { log("received only ", nfill_frames_sacch, "+", nfill_frames_nonsacch, " (SACCH+other) out of ", expected_fill_frames, " expected fill frames"); - setverdict(fail, "Not enough fill frames received"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Not enough fill frames received"); } else { setverdict(pass); } @@ -4063,7 +3987,7 @@ " (mod ", block_dtx_tchf_mod, ": ", fn mod block_dtx_tchf_mod, ")"); f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); - setverdict(fail, "Unexpected L2 fill frame received on Um"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected L2 fill frame received on Um"); } } else { if (dl.dl_info.link_id.c == SACCH) { @@ -4086,7 +4010,7 @@ } else { f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); - setverdict(fail, "Unknown channel type"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unknown channel type"); } f_rsl_chan_deact(); @@ -4097,7 +4021,7 @@ } else { log("received only ", nfill_frames_sacch, "+", nfill_frames_nonsacch, " (SACCH+other) out of ", expected_fill_frames, " expected fill frames"); - setverdict(fail, "Not enough fill frames received"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Not enough fill frames received"); } } else { repeat; @@ -4108,8 +4032,7 @@ [] T.timeout { f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); - setverdict(fail, "Timeout waiting for L2 fill frames on Um"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for L2 fill frames on Um"); } } } diff --git a/bts/gen_links.sh b/bts/gen_links.sh index 1ec6153..2a07f16 100755 --- a/bts/gen_links.sh +++ b/bts/gen_links.sh @@ -33,7 +33,7 @@ gen_links $DIR $FILES DIR=../library -FILES="General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_VTY_Functions.ttcn GSM_SystemInformation.ttcn Osmocom_Types.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc L1CTL_Types.ttcn L1CTL_PortType.ttcn L1CTL_PortType_CtrlFunct.ttcn L1CTL_PortType_CtrlFunctDef.cc LAPDm_RAW_PT.ttcn LAPDm_Types.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_VTY_Functions.ttcn GSM_SystemInformation.ttcn Osmocom_Types.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc L1CTL_Types.ttcn L1CTL_PortType.ttcn L1CTL_PortType_CtrlFunct.ttcn L1CTL_PortType_CtrlFunctDef.cc LAPDm_RAW_PT.ttcn LAPDm_Types.ttcn " #FILES+="NS_Emulation.ttcn NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc " #FILES+="BSSGP_Emulation.ttcn Osmocom_Gb_Types.ttcn " FILES+="IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp IPA_CodecPort.ttcn RSL_Types.ttcn RSL_Emulation.ttcn " -- To view, visit https://gerrit.osmocom.org/11452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia8b01a1876e969d6f0760ea625e4df83af4f54ca Gerrit-Change-Number: 11452 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 14:34:47 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 24 Oct 2018 14:34:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RSL_Emulation: Fail explicitly on ASP_IPA_EVENT_DOWN In-Reply-To: References: Message-ID: daniel has uploaded a new patch set (#5) to the change originally created by Pau Espin Pedrol. ( https://gerrit.osmocom.org/11429 ) Change subject: RSL_Emulation: Fail explicitly on ASP_IPA_EVENT_DOWN ...................................................................... RSL_Emulation: Fail explicitly on ASP_IPA_EVENT_DOWN Otherwise RSL layer fails this way when this event is received: RSL_Emulation.ttcn:429 Receive operation on port IPA_PT succeeded, message from TC_chan_act_a51-RSL-IPA(3): @IPA_Emulation.ASP_IPA_Event: { up_down := ASP_IPA_EVENT_DOWN (0) } id 9 - Function main_client was stopped. PTC terminates. RSL_Emulation.ttcn:429 Message with id 9 was extracted from the queue of IPA_PT. RSL_Emulation.ttcn:430 setverdict(fail): none -> fail reason: "Received unknown primitive from IPA", new component reason: "Received unknown primitive from IPA" We now fail with a clearer message "Lost IPA connection!". These failures seem to happen under high load when the BTS doesn't get a steady clock from osmo-trx. Change-Id: Idc6565c9de72d98015d56a41e5616c46051c8a8d --- M library/RSL_Emulation.ttcn 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/11429/5 -- To view, visit https://gerrit.osmocom.org/11429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idc6565c9de72d98015d56a41e5616c46051c8a8d Gerrit-Change-Number: 11429 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 14:37:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 24 Oct 2018 14:37:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RSL_Emulation: Fail explicitly on ASP_IPA_EVENT_DOWN In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11429 ) Change subject: RSL_Emulation: Fail explicitly on ASP_IPA_EVENT_DOWN ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idc6565c9de72d98015d56a41e5616c46051c8a8d Gerrit-Change-Number: 11429 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 24 Oct 2018 14:37:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 14:37:50 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 24 Oct 2018 14:37:50 +0000 Subject: Change in libosmocore[master]: stats_statsd: Send all stat_items as gauges In-Reply-To: References: Message-ID: Hello lynxis lazus, Harald Welte, Jenkins Builder, Holger Freyther, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11323 to look at the new patch set (#2). Change subject: stats_statsd: Send all stat_items as gauges ...................................................................... stats_statsd: Send all stat_items as gauges When sending a statsd metric we need to specify a type which can be a "g"auge, "c"ounter, "t"imer, "h"istogram, and "m"eter. We used to just pass the stat_item unit into this field, but that is the unit of the metric (Seconds for a timer, % for utilization, ...). Change the type field so stat_items are sent as "g"auges. Note that negative values don't seem to be supported by statsd. Change-Id: Ia16270d36c9a14521594de4b99a48c83e4ac07d4 --- M src/stats_statsd.c 1 file changed, 8 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/23/11323/2 -- To view, visit https://gerrit.osmocom.org/11323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia16270d36c9a14521594de4b99a48c83e4ac07d4 Gerrit-Change-Number: 11323 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 14:38:38 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 24 Oct 2018 14:38:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RSL_Emulation: Fail explicitly on ASP_IPA_EVENT_DOWN In-Reply-To: References: Message-ID: daniel has submitted this change and it was merged. ( https://gerrit.osmocom.org/11429 ) Change subject: RSL_Emulation: Fail explicitly on ASP_IPA_EVENT_DOWN ...................................................................... RSL_Emulation: Fail explicitly on ASP_IPA_EVENT_DOWN Otherwise RSL layer fails this way when this event is received: RSL_Emulation.ttcn:429 Receive operation on port IPA_PT succeeded, message from TC_chan_act_a51-RSL-IPA(3): @IPA_Emulation.ASP_IPA_Event: { up_down := ASP_IPA_EVENT_DOWN (0) } id 9 - Function main_client was stopped. PTC terminates. RSL_Emulation.ttcn:429 Message with id 9 was extracted from the queue of IPA_PT. RSL_Emulation.ttcn:430 setverdict(fail): none -> fail reason: "Received unknown primitive from IPA", new component reason: "Received unknown primitive from IPA" We now fail with a clearer message "Lost IPA connection!". These failures seem to happen under high load when the BTS doesn't get a steady clock from osmo-trx. Change-Id: Idc6565c9de72d98015d56a41e5616c46051c8a8d --- M library/RSL_Emulation.ttcn 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn index c56c278..cf02d00 100644 --- a/library/RSL_Emulation.ttcn +++ b/library/RSL_Emulation.ttcn @@ -23,6 +23,7 @@ * (at your option) any later version. */ +import from Misc_Helpers all; import from General_Types all; import from Osmocom_Types all; import from GSM_Types all; @@ -346,6 +347,13 @@ [not bts_role] IPA_PT.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_UP}) -> value evt { CCHAN_PT.send(evt); } + [bts_role] IPA_PT.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_DOWN}) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Lost IPA connection!"); + + } + [not bts_role] IPA_PT.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_DOWN}) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Lost IPA connection!"); + } [bts_role] IPA_PT.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_ID_ACK}) { IPA_PT.send(ts_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0,ts_RSL_PAGING_LOAD_IND(23))); } -- To view, visit https://gerrit.osmocom.org/11429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idc6565c9de72d98015d56a41e5616c46051c8a8d Gerrit-Change-Number: 11429 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 14:40:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 24 Oct 2018 14:40:58 +0000 Subject: Change in docker-playground[master]: bts: jenkins.sh: increase trx-advance in trxcon Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11453 Change subject: bts: jenkins.sh: increase trx-advance in trxcon ...................................................................... bts: jenkins.sh: increase trx-advance in trxcon Otherwise sometimes 4th UL SACCH burst arrives too late and osmo-bts-trx submits a fake ul meas report instead of using actual frame in progress of being received, resulting in rxqual=7. Fixes: OS#3665 Change-Id: I37836024b20305a3f561ef9971838154a511b978 --- M ttcn3-bts-test/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/53/11453/1 diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index fe448f5..3f93400 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -50,7 +50,7 @@ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-trxcon -d \ $REPO_USER/osmocom-bb-host-master \ - /usr/local/bin/trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2 + /usr/local/bin/trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2 -f 21 echo Starting container with BTS testsuite -- To view, visit https://gerrit.osmocom.org/11453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I37836024b20305a3f561ef9971838154a511b978 Gerrit-Change-Number: 11453 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 14:43:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 24 Oct 2018 14:43:57 +0000 Subject: Change in osmo-bts[master]: bts-trx: Try decoding received UL bursts when SACCH frame detected as... In-Reply-To: References: Message-ID: Pau Espin Pedrol has abandoned this change. ( https://gerrit.osmocom.org/11446 ) Change subject: bts-trx: Try decoding received UL bursts when SACCH frame detected as lost ...................................................................... Abandoned Same issue fixed by without need to make code more complex. I agree correct fix is to make sure we don't loss frames in TRX. https://gerrit.osmocom.org/#/c/docker-playground/+/11453/ -- To view, visit https://gerrit.osmocom.org/11446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I910277df181df5082b234c1c97a75eebdffc2cb5 Gerrit-Change-Number: 11446 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Oct 24 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 24 Oct 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#286?= In-Reply-To: <1495820638.171.1540307407327.JavaMail.jenkins@jenkins.osmocom.org> References: <1495820638.171.1540307407327.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <603153875.196.1540393807440.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Oct 24 15:25:25 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 24 Oct 2018 15:25:25 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-sysmo-usim-tool_?= =?UTF-8?Q?=C2=BB_a1=3Ddefault,a2=3Ddefault,a3=3Ddefault,simtester_#75?= Message-ID: <1229339704.197.1540394725245.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [pmaier at sysmocom.de] sysmo_usimsjs1: use correct parameter for 3G auth ------------------------------------------ Started by upstream project "master-sysmo-usim-tool" build number 75 originally caused by: Started by an SCM change Building remotely on simtester in workspace > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.sysmocom.de/sysmo-usim-tool # timeout=10 Fetching upstream changes from git://git.sysmocom.de/sysmo-usim-tool > git --version # timeout=10 > git fetch --tags --progress git://git.sysmocom.de/sysmo-usim-tool +refs/heads/*:refs/remotes/origin/* Checking out Revision 4fb937bf468d53c5dd06a6d1b91dd90fcb5acd3c (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 4fb937bf468d53c5dd06a6d1b91dd90fcb5acd3c Commit message: "sysmo_usimsjs1: use correct parameter for 3G auth" > git rev-list --no-walk b8845748f5f5a5834c47d65983ec196025164ed9 # timeout=10 [simtester] $ /bin/sh -xe /tmp/jenkins5608341372603670905.sh + cd ./tests + ./run-tests ================ PREPARING TEST CARD ================ sysmoUSIM-SJS1 parameterization tool Copyright (c)2017 Sysmocom s.f.m.c. GmbH Initializing smartcard terminal... Detected Card ICCID: 8988211320300000028 Authenticating... * Remaining attempts: 3 * Authenticating... * Authentication successful * Remaining attempts: 3 Detected Card IMSI: 262423203000002 Writing ICCID value... * New ICCID setting: ICCID: 8988211320300000028f * Initalizing... * Programming... Done! sysmoUSIM-SJS1 parameterization tool Copyright (c)2017 Sysmocom s.f.m.c. GmbH Initializing smartcard terminal... Detected Card ICCID: 8988211320300000028 Authenticating... * Remaining attempts: 3 * Authenticating... * Authentication successful * Remaining attempts: 3 Detected Card IMSI: 262423203000002 Writing IMSI value... * New ISMI setting: IMSI: 9262423203000002 * Initalizing... * Programming... Done! ================ TEST CARD PREPARED ================= ==> Executing Testcase 01_auth.sh Test 01_auth.sh passed ==> Executing Testcase 02_mode_read.sh Test 02_mode_read.sh passed ==> Executing Testcase 03_mode_write.sh Test 03_mode_write.sh passed ==> Executing Testcase 04_algo.sh --- 04_algo.out 2018-10-15 15:44:13.097293287 +0200 +++ /tmp/filellbs8m 2018-10-24 17:25:04.109788524 +0200 @@ -62,7 +62,7 @@ Programming Authentication parameters... * New algorithm setting: 2G: 3=COMP128v1 - 3G: 3=COMP128v1 + 3G: 1=MILENAGE * Initalizing... * Programming... @@ -87,7 +87,7 @@ * Reading... * Current algorithm setting: 2G: 3=COMP128v1 - 3G: 3=COMP128v1 + 3G: 1=MILENAGE Done! sysmoUSIM-SJS1 parameterization tool @@ -108,7 +108,7 @@ Programming Authentication parameters... * New algorithm setting: 2G: 4=XOR-2G - 3G: 4=XOR-2G + 3G: 1=MILENAGE * Initalizing... * Programming... @@ -133,7 +133,7 @@ * Reading... * Current algorithm setting: 2G: 4=XOR-2G - 3G: 4=XOR-2G + 3G: 1=MILENAGE Done! sysmoUSIM-SJS1 parameterization tool @@ -154,7 +154,7 @@ Programming Authentication parameters... * New algorithm setting: 2G: 5=GBA - 3G: 5=GBA + 3G: 1=MILENAGE * Initalizing... * Programming... @@ -179,7 +179,7 @@ * Reading... * Current algorithm setting: 2G: 5=GBA - 3G: 5=GBA + 3G: 1=MILENAGE Done! sysmoUSIM-SJS1 parameterization tool @@ -200,7 +200,7 @@ Programming Authentication parameters... * New algorithm setting: 2G: 6=COMP128v2 - 3G: 6=COMP128v2 + 3G: 1=MILENAGE * Initalizing... * Programming... @@ -225,7 +225,7 @@ * Reading... * Current algorithm setting: 2G: 6=COMP128v2 - 3G: 6=COMP128v2 + 3G: 1=MILENAGE Done! sysmoUSIM-SJS1 parameterization tool @@ -246,7 +246,7 @@ Programming Authentication parameters... * New algorithm setting: 2G: 7=COMP128v3 - 3G: 7=COMP128v3 + 3G: 1=MILENAGE * Initalizing... * Programming... @@ -271,7 +271,7 @@ * Reading... * Current algorithm setting: 2G: 7=COMP128v3 - 3G: 7=COMP128v3 + 3G: 1=MILENAGE Done! sysmoUSIM-SJS1 parameterization tool @@ -292,7 +292,7 @@ Programming Authentication parameters... * New algorithm setting: 2G: 9=CIS-B - 3G: 9=CIS-B + 3G: 1=MILENAGE * Initalizing... * Programming... @@ -317,7 +317,7 @@ * Reading... * Current algorithm setting: 2G: 9=CIS-B - 3G: 9=CIS-B + 3G: 1=MILENAGE Done! sysmoUSIM-SJS1 parameterization tool @@ -338,7 +338,7 @@ Programming Authentication parameters... * New algorithm setting: 2G: 5=GBA - 3G: 5=GBA + 3G: 8=XOR-3G * Initalizing... * Programming... @@ -363,7 +363,7 @@ * Reading... * Current algorithm setting: 2G: 5=GBA - 3G: 5=GBA + 3G: 8=XOR-3G Done! sysmoUSIM-SJS1 parameterization tool @@ -384,7 +384,7 @@ Programming Authentication parameters... * New algorithm setting: 2G: 3=COMP128v1 - 3G: 3=COMP128v1 + 3G: 8=XOR-3G * Initalizing... * Programming... @@ -409,7 +409,7 @@ * Reading... * Current algorithm setting: 2G: 3=COMP128v1 - 3G: 3=COMP128v1 + 3G: 8=XOR-3G Done! sysmoUSIM-SJS1 parameterization tool Test 04_algo.sh FAILED! ==> Executing Testcase 05_milenage_par.sh Test 05_milenage_par.sh passed ==> Executing Testcase 06_op_opc.sh Test 06_op_opc.sh passed ==> Executing Testcase 07_ki.sh Test 07_ki.sh passed ==> Executing Testcase 08_seq.sh Test 08_seq.sh passed Summary: 1 Tests failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Oct 24 15:39:17 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 24 Oct 2018 15:39:17 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-sysmo-usim-?= =?UTF-8?Q?tool_=C2=BB_a1=3Ddefault,a2=3Ddefau?= =?UTF-8?Q?lt,a3=3Ddefault,simtester_#76?= In-Reply-To: <1229339704.197.1540394725245.JavaMail.jenkins@jenkins.osmocom.org> References: <1229339704.197.1540394725245.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <50103386.198.1540395557328.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Oct 24 15:51:25 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 24 Oct 2018 15:51:25 +0000 Subject: Change in osmocom-bb[master]: mobile: display MS IMSI in vty In-Reply-To: References: Message-ID: Max has abandoned this change. ( https://gerrit.osmocom.org/11440 ) Change subject: mobile: display MS IMSI in vty ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Id05f4f5f3416dcdb9ce2fd24f9360f5e6faaf654 Gerrit-Change-Number: 11440 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: fixeria -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 16:21:34 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 24 Oct 2018 16:21:34 +0000 Subject: Change in osmo-bts[master]: common/scheduler.c: track TDMA frame loss per logical channels In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10309 ) Change subject: common/scheduler.c: track TDMA frame loss per logical channels ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I70d05b67a35ddcbdd1b6394dbd7198404a440e76 Gerrit-Change-Number: 10309 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 24 Oct 2018 16:21:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 16:42:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 24 Oct 2018 16:42:31 +0000 Subject: Change in osmo-bts[master]: common/scheduler.c: track TDMA frame loss per logical channels In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10309 ) Change subject: common/scheduler.c: track TDMA frame loss per logical channels ...................................................................... Patch Set 4: Code-Review+1 +1, It has been tested locally by Vadim and I can take over from it and do some improvements from here. -- To view, visit https://gerrit.osmocom.org/10309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I70d05b67a35ddcbdd1b6394dbd7198404a440e76 Gerrit-Change-Number: 10309 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 24 Oct 2018 16:42:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 18:33:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 24 Oct 2018 18:33:58 +0000 Subject: Change in libosmocore[master]: GSUP/SM: (WIP) introduce new SRI_FOR_SM message In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/11068 ) Change subject: GSUP/SM: (WIP) introduce new SRI_FOR_SM message ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I4303dc817a5f8ee97b78d840672c443a6eddb332 Gerrit-Change-Number: 11068 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 18:34:11 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 24 Oct 2018 18:34:11 +0000 Subject: Change in libosmocore[master]: GSUP/SM: (WIP) introduce MO/MT FORWARD_SM messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/11069 ) Change subject: GSUP/SM: (WIP) introduce MO/MT FORWARD_SM messages ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Gerrit-Change-Number: 11069 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 18:45:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 24 Oct 2018 18:45:27 +0000 Subject: Change in osmo-bts[master]: common/scheduler.c: track TDMA frame loss per logical channels In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10309 ) Change subject: common/scheduler.c: track TDMA frame loss per logical channels ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I70d05b67a35ddcbdd1b6394dbd7198404a440e76 Gerrit-Change-Number: 10309 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 24 Oct 2018 18:45:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 18:46:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 24 Oct 2018 18:46:38 +0000 Subject: Change in libosmocore[master]: stats_statsd: Send all stat_items as gauges In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11323 ) Change subject: stats_statsd: Send all stat_items as gauges ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia16270d36c9a14521594de4b99a48c83e4ac07d4 Gerrit-Change-Number: 11323 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 24 Oct 2018 18:46:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 18:46:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 24 Oct 2018 18:46:40 +0000 Subject: Change in libosmocore[master]: stats_statsd: Send all stat_items as gauges In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11323 ) Change subject: stats_statsd: Send all stat_items as gauges ...................................................................... stats_statsd: Send all stat_items as gauges When sending a statsd metric we need to specify a type which can be a "g"auge, "c"ounter, "t"imer, "h"istogram, and "m"eter. We used to just pass the stat_item unit into this field, but that is the unit of the metric (Seconds for a timer, % for utilization, ...). Change the type field so stat_items are sent as "g"auges. Note that negative values don't seem to be supported by statsd. Change-Id: Ia16270d36c9a14521594de4b99a48c83e4ac07d4 --- M src/stats_statsd.c 1 file changed, 8 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/stats_statsd.c b/src/stats_statsd.c index 5ae2570..c3f739e 100644 --- a/src/stats_statsd.c +++ b/src/stats_statsd.c @@ -184,20 +184,17 @@ const struct osmo_stat_item_group *statg, const struct osmo_stat_item_desc *desc, int64_t value) { - const char *unit = desc->unit; - - if (unit == OSMO_STAT_ITEM_NO_UNIT) { - unit = "g"; - if (value < 0) - osmo_stats_reporter_statsd_send(srep, + if (value < 0) { + return osmo_stats_reporter_statsd_send(srep, statg->desc->group_name_prefix, statg->idx, - desc->name, 0, unit); + desc->name, 0, "g"); + } else { + return osmo_stats_reporter_statsd_send(srep, + statg->desc->group_name_prefix, + statg->idx, + desc->name, value, "g"); } - return osmo_stats_reporter_statsd_send(srep, - statg->desc->group_name_prefix, - statg->idx, - desc->name, value, unit); } #endif /* !EMBEDDED */ -- To view, visit https://gerrit.osmocom.org/11323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia16270d36c9a14521594de4b99a48c83e4ac07d4 Gerrit-Change-Number: 11323 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 18:46:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 24 Oct 2018 18:46:49 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: generate proper multirate configuration IE on RSL In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11445 ) Change subject: lchan_fsm: generate proper multirate configuration IE on RSL ...................................................................... lchan_fsm: generate proper multirate configuration IE on RSL During the generation of the multirate configuration IE in the channel activation message that is sent over RSL, all AMR rates except the highest one are trimmed. This was to ensure that the multirate configuration IE only contains one codec rate per active set. Lets fix that and generate a proper IE with threshold and hysteresis values. - extend lchan_mr_config so that it can generate a full multirate configuration IE Change-Id: I7f9f8e8d9e2724cbe3ce2f3599bc0e5185fd8453 Related: OS#3529 --- M src/osmo-bsc/lchan_fsm.c M tests/handover/handover_test.c 2 files changed, 72 insertions(+), 58 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 39edaff..915b62a 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -36,6 +36,8 @@ #include #include #include +#include + static struct osmo_fsm lchan_fsm; @@ -402,66 +404,71 @@ osmo_fsm_inst_dispatch(lchan->ts->fi, TS_EV_LCHAN_UNUSED, lchan); } -/*! Configure the multirate setting on this channel. */ -void lchan_mr_config(struct gsm_lchan *lchan, struct gsm48_multi_rate_conf *mr_conf) +/* Configure the multirate setting on this channel. */ +static int lchan_mr_config(struct gsm_lchan *lchan, const struct gsm48_multi_rate_conf *mr_conf) { - struct gsm48_multi_rate_conf *ms_conf, *bts_conf; bool full_rate = (lchan->type == GSM_LCHAN_TCH_F); + struct gsm_bts *bts = lchan->ts->trx->bts; + struct bsc_msc_data *msc = lchan->conn->sccp.msc; + struct amr_multirate_conf *mr; + int rc; + int rc_rate; + struct gsm48_multi_rate_conf mr_conf_filtered; + const struct gsm48_multi_rate_conf *mr_conf_bts; - /* initialize the data structure */ - lchan->mr_ms_lv[0] = sizeof(*ms_conf); - lchan->mr_bts_lv[0] = sizeof(*bts_conf); - ms_conf = (struct gsm48_multi_rate_conf *) &lchan->mr_ms_lv[1]; - bts_conf = (struct gsm48_multi_rate_conf *) &lchan->mr_bts_lv[1]; + /* There are two different active sets, depending on the channel rate, + * make sure the appropate one is selected. */ + if (full_rate) + mr = &bts->mr_full; + else + mr = &bts->mr_half; - *ms_conf = *bts_conf = (struct gsm48_multi_rate_conf){ - .ver = 1, - .icmi = 1, - .m4_75 = mr_conf->m4_75, - .m5_15 = mr_conf->m5_15, - .m5_90 = mr_conf->m5_90, - .m6_70 = mr_conf->m6_70, - .m7_40 = mr_conf->m7_40, - .m7_95 = mr_conf->m7_95, - .m10_2 = full_rate? mr_conf->m10_2 : 0, - .m12_2 = full_rate? mr_conf->m12_2 : 0, - }; -} - -/* Mask all rates instead of the highest possible */ -static void lchan_mr_config_mask(struct gsm48_multi_rate_conf *mr_conf) -{ - unsigned int i; - bool highest_seen = false; - uint8_t *_mr_conf = (uint8_t *) mr_conf; - - /* FIXME: At the moment we can not support multiple codec rates in one - * struct gsm48_multi_rate_conf, because the struct lacks the fields - * for Threshold and Hysteresis. Those fields are not needed when only - * a single codec rate is in place, but as soon as multiple codec - * rates are used the parameters are mandatory. The layout for the - * struct would then also be different because each rate needs its - * own Threshold and Hysteresis value. (See also 3GPP TS 04.08, - * chapter 10.5.2.21aa MultiRate configuration). - * - * Since we are unable to signal multiple codec rates properly, we just - * remove all codec rates from the active set, except the highest - * possible. Doing so we lack the functionality to switch towards the - * other, lower codec rates that were offered by the MSC, but it is - * still guaranteed that a rate is selected that is supported by all - * entities. - * - * To fix this problem, we should implement a proper encoder for - * struct gsm48_multi_rate_conf, in libosmocore and use it here. - * struct amr_mode already seems to have members for threshold and - * hysteresis we can use. */ - - for (i = 7; i > 0; i--) { - if (_mr_conf[1] & (1 << i) && highest_seen == false) { - highest_seen = true; - } else if (highest_seen) - _mr_conf[1] &= ~(1 << i); + /* The VTY allows to forbid certain codec rates. Unfortunately we can + * not articulate all of the prohibitions on through S0-S15 on the A + * interface. To ensure that the VTY settings are observed we create + * a manipulated copy of the mr_conf that ensures forbidden codec rates + * are not used in the multirate configuration IE. */ + rc_rate = calc_amr_rate_intersection(&mr_conf_filtered, &msc->amr_conf, mr_conf); + if (rc_rate < 0) { + LOG_LCHAN(lchan, LOGL_ERROR, + "can not encode multirate configuration (invalid amr rate setting, MSC)\n"); + return -EINVAL; } + + /* The two last codec rates which are defined for AMR do only work with + * full rate channels. We will pinch off those rates f?r half-rate + * channels to ensure they are not included accidently. */ + if (!full_rate) { + if (mr_conf_filtered.m10_2 || mr_conf_filtered.m12_2) + LOG_LCHAN(lchan, LOGL_ERROR, "ignoring unsupported amr codec rates\n"); + mr_conf_filtered.m10_2 = 0; + mr_conf_filtered.m12_2 = 0; + } + + /* Ensure that the resulting filtered conf is coherent with the + * configuration that is set for the BTS and the specified rate */ + mr_conf_bts = (struct gsm48_multi_rate_conf *)mr->gsm48_ie; + rc_rate = calc_amr_rate_intersection(&mr_conf_filtered, mr_conf_bts, &mr_conf_filtered); + if (rc_rate < 0) { + LOG_LCHAN(lchan, LOGL_ERROR, + "can not encode multirate configuration (invalid amr rate setting, BTS)\n"); + return -EINVAL; + } + + /* Proceed with the generation of the multirate configuration IE + * (MS and BTS) */ + rc = gsm48_multirate_config(lchan->mr_ms_lv, &mr_conf_filtered, mr->ms_mode, mr->num_modes); + if (rc != 0) { + LOG_LCHAN(lchan, LOGL_ERROR, "can not encode multirate configuration (MS)\n"); + return -EINVAL; + } + rc = gsm48_multirate_config(lchan->mr_bts_lv, &mr_conf_filtered, mr->bts_mode, mr->num_modes); + if (rc != 0) { + LOG_LCHAN(lchan, LOGL_ERROR, "can not encode multirate configuration (BTS)\n"); + return -EINVAL; + } + + return 0; } static void lchan_fsm_unused(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -511,9 +518,10 @@ if (info->chan_mode == GSM48_CMODE_SPEECH_AMR) { gsm48_mr_cfg_from_gsm0808_sc_cfg(&mr_conf, info->s15_s0); - /* FIXME: See above. */ - lchan_mr_config_mask(&mr_conf); - lchan_mr_config(lchan, &mr_conf); + if (lchan_mr_config(lchan, &mr_conf) < 0) { + lchan_fail("Can not generate multirate configuration IE\n"); + return; + } } switch (info->chan_mode) { diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 76e5fe1..7cb4086 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -224,6 +224,12 @@ struct gsm_network *net = lchan->ts->trx->bts->network; struct gsm_subscriber_connection *conn; struct mgcp_client *fake_mgcp_client = (void*)talloc_zero(net, int); + uint8_t *amr_conf; + + /* HACK: lchan_fsm.c requires some AMR codec rates to be enabled, + * lets pretend that all AMR codec rates are allowed */ + amr_conf = (uint8_t*) &fake_msc_data.amr_conf; + amr_conf[1] = 0xff; conn = bsc_subscr_con_allocate(net); -- To view, visit https://gerrit.osmocom.org/11445 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7f9f8e8d9e2724cbe3ce2f3599bc0e5185fd8453 Gerrit-Change-Number: 11445 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 18:49:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 24 Oct 2018 18:49:53 +0000 Subject: Change in osmo-bsc[master]: cosmetic: fix spec ref for gsm0808_cipher_mode() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11437 ) Change subject: cosmetic: fix spec ref for gsm0808_cipher_mode() ...................................................................... Patch Set 1: > What am I missing? That this code has nothing to do with the 04.08 (Mobile Layer 3), but with BSSAP/BSSMAP specified in 08.08. It's nice that some other spec also mentions something about what that layer of the stack / that interface has to do in case of a cipher mode set. But that still doesn't make it apply here. You have to find the related section in 08.08 (or these days, 48.008). -- To view, visit https://gerrit.osmocom.org/11437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I359caf1dd30f033c0b606040ccf27aa4c5a9d2c6 Gerrit-Change-Number: 11437 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 24 Oct 2018 18:49:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Oct 24 18:54:13 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 24 Oct 2018 18:54:13 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_norma?= =?UTF-8?Q?l_:_master-osmo-ggsn_=C2=BB_--disabl?= =?UTF-8?Q?e-gtp-linux,a2=3Ddefault,a3=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#1023?= In-Reply-To: <820247162.189.1540380810035.JavaMail.jenkins@jenkins.osmocom.org> References: <820247162.189.1540380810035.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <37928107.199.1540407253635.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Oct 24 19:28:47 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 24 Oct 2018 19:28:47 +0000 Subject: Change in osmo-trx[master]: sigProcLib: introduce both TS1 and TS2 RACH synch. sequences In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11390 ) Change subject: sigProcLib: introduce both TS1 and TS2 RACH synch. sequences ...................................................................... sigProcLib: introduce both TS1 and TS2 RACH synch. sequences According to 3GPP TS 05.02, section 5.2.7, there are three synch. sequences for Access Bursts: - TS0: GSM, GMSK (default), - TS1: EGPRS, 8-PSK, - TS2: EGPRS, GMSK. Let's prepare everythyng to be able to detect all TS0-3 synch. sequences, but keep detection of both TS1 and TS2 disabled until the corresponding VTY option is introduced. Change-Id: I838c21db29c54f1924dd478c2b34b46b70aab2cd Related: OS#3054 --- M GSM/GSMCommon.cpp M GSM/GSMCommon.h M Transceiver52M/radioInterface.cpp M Transceiver52M/sigProcLib.cpp 4 files changed, 31 insertions(+), 19 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/GSM/GSMCommon.cpp b/GSM/GSMCommon.cpp index 8aba3be..711ca70 100644 --- a/GSM/GSMCommon.cpp +++ b/GSM/GSMCommon.cpp @@ -54,7 +54,10 @@ const BitVector GSM::gDummyBurst("0001111101101110110000010100100111000001001000100000001111100011100010111000101110001010111010010100011001100111001111010011111000100101111101010000"); -const BitVector GSM::gRACHSynchSequence("01001011011111111001100110101010001111000"); +/* 3GPP TS 05.02, section 5.2.7 "Access burst (AB)", synch. sequence bits */ +const BitVector GSM::gRACHSynchSequenceTS0("01001011011111111001100110101010001111000"); /* GSM, GMSK (default) */ +const BitVector GSM::gRACHSynchSequenceTS1("01010100111110001000011000101111001001101"); /* EGPRS, 8-PSK */ +const BitVector GSM::gRACHSynchSequenceTS2("11101111001001110101011000001101101110111"); /* EGPRS, GMSK */ // |-head-||---------midamble----------------------||--------------data----------------||t| const BitVector GSM::gRACHBurst("0011101001001011011111111001100110101010001111000110111101111110000111001001010110011000"); diff --git a/GSM/GSMCommon.h b/GSM/GSMCommon.h index 8b8d5e8..f703c30 100644 --- a/GSM/GSMCommon.h +++ b/GSM/GSMCommon.h @@ -52,7 +52,9 @@ extern const BitVector gDummyBurst; /** Random access burst synch. sequence */ -extern const BitVector gRACHSynchSequence; +extern const BitVector gRACHSynchSequenceTS0; +extern const BitVector gRACHSynchSequenceTS1; +extern const BitVector gRACHSynchSequenceTS2; /** Random access burst synch. sequence, GSM 05.02 5.2.7 */ extern const BitVector gRACHBurst; diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index 0f949d7..6245cfc 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -245,7 +245,7 @@ * Pre-allocate head room for the largest correlation size * so we can later avoid a re-allocation and copy * */ - size_t head = GSM::gRACHSynchSequence.size(); + size_t head = GSM::gRACHSynchSequenceTS0.size(); /* * Form receive bursts and pass up to transceiver. Use repeating diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp index 692fbe0..072fb3b 100644 --- a/Transceiver52M/sigProcLib.cpp +++ b/Transceiver52M/sigProcLib.cpp @@ -132,7 +132,7 @@ static CorrelationSequence *gMidambles[] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; static CorrelationSequence *gEdgeMidambles[] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; -static CorrelationSequence *gRACHSequence = NULL; +static CorrelationSequence *gRACHSequences[] = {NULL,NULL,NULL}; static PulseSequence *GSMPulse1 = NULL; static PulseSequence *GSMPulse4 = NULL; @@ -150,11 +150,15 @@ delayFilters[i] = NULL; } + for (int i = 0; i < 3; i++) { + delete gRACHSequences[i]; + gRACHSequences[i] = NULL; + } + delete GMSKRotation1; delete GMSKReverseRotation1; delete GMSKRotation4; delete GMSKReverseRotation4; - delete gRACHSequence; delete GSMPulse1; delete GSMPulse4; delete dnsampler; @@ -163,7 +167,6 @@ GMSKRotation4 = NULL; GMSKReverseRotation4 = NULL; GMSKReverseRotation1 = NULL; - gRACHSequence = NULL; GSMPulse1 = NULL; GSMPulse4 = NULL; } @@ -1332,7 +1335,7 @@ return seq; } -static bool generateRACHSequence(int sps) +static bool generateRACHSequence(CorrelationSequence **seq, const BitVector &bv, int sps) { bool status = true; float toa; @@ -1340,13 +1343,14 @@ signalVector *autocorr = NULL; signalVector *seq0 = NULL, *seq1 = NULL, *_seq1 = NULL; - delete gRACHSequence; + if (*seq != NULL) + delete *seq; - seq0 = modulateBurst(gRACHSynchSequence, 0, sps, false); + seq0 = modulateBurst(bv, 0, sps, false); if (!seq0) return false; - seq1 = modulateBurst(gRACHSynchSequence.segment(0, 40), 0, sps, true); + seq1 = modulateBurst(bv.segment(0, 40), 0, sps, true); if (!seq1) { status = false; goto release; @@ -1366,19 +1370,19 @@ goto release; } - gRACHSequence = new CorrelationSequence; - gRACHSequence->sequence = _seq1; - gRACHSequence->buffer = data; - gRACHSequence->gain = peakDetect(*autocorr, &toa, NULL); + *seq = new CorrelationSequence; + (*seq)->sequence = _seq1; + (*seq)->buffer = data; + (*seq)->gain = peakDetect(*autocorr, &toa, NULL); /* For 1 sps only * (Half of correlation length - 1) + midpoint of pulse shaping filer * 20.5 = (40 / 2 - 1) + 1.5 */ if (sps == 1) - gRACHSequence->toa = toa - 20.5; + (*seq)->toa = toa - 20.5; else - gRACHSequence->toa = 0.0; + (*seq)->toa = 0.0; release: delete autocorr; @@ -1388,7 +1392,7 @@ if (!status) { delete _seq1; free(data); - gRACHSequence = NULL; + *seq = NULL; } return status; @@ -1606,7 +1610,7 @@ target = 8 + 40; head = 8; tail = 8 + max_toa; - sync = gRACHSequence; + sync = gRACHSequences[0]; rc = detectGeneralBurst(burst, threshold, sps, amplitude, toa, target, head, tail, sync); @@ -1858,7 +1862,10 @@ GSMPulse1 = generateGSMPulse(1); GSMPulse4 = generateGSMPulse(4); - generateRACHSequence(1); + generateRACHSequence(&gRACHSequences[0], gRACHSynchSequenceTS0, 1); + generateRACHSequence(&gRACHSequences[1], gRACHSynchSequenceTS1, 1); + generateRACHSequence(&gRACHSequences[2], gRACHSynchSequenceTS2, 1); + for (int tsc = 0; tsc < 8; tsc++) { generateMidamble(1, tsc); gEdgeMidambles[tsc] = generateEdgeMidamble(tsc); -- To view, visit https://gerrit.osmocom.org/11390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I838c21db29c54f1924dd478c2b34b46b70aab2cd Gerrit-Change-Number: 11390 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Tom Tsou Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 19:28:48 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 24 Oct 2018 19:28:48 +0000 Subject: Change in osmo-trx[master]: sigProcLib: add a CorrType for extended (11-bit) RACH In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11422 ) Change subject: sigProcLib: add a CorrType for extended (11-bit) RACH ...................................................................... sigProcLib: add a CorrType for extended (11-bit) RACH This is a preparatory change that enables a possibility to choose the amount of synch. sequences to be used for Access Burst (RACH) detection. The VTY flag will be introduced in further changes. There are two correlation types now: - RACH (default) - TS0 only; - EXT_RACH - all TS0, TS1, and TS2 together. Change-Id: Ia4f20524350bb8c380d7e10360758eddae8b03e9 Related: OS#3054 --- M Transceiver52M/sigProcLib.cpp M Transceiver52M/sigProcLib.h 2 files changed, 12 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp index 072fb3b..28c4ded 100644 --- a/Transceiver52M/sigProcLib.cpp +++ b/Transceiver52M/sigProcLib.cpp @@ -1602,18 +1602,22 @@ * tail: Search 8 symbols + maximum expected delay */ static int detectRACHBurst(const signalVector &burst, float threshold, int sps, - complex &litude, float &toa, unsigned max_toa) + complex &litude, float &toa, unsigned max_toa, bool ext) { int rc, target, head, tail; - CorrelationSequence *sync; + int i, num_seq; target = 8 + 40; head = 8; tail = 8 + max_toa; - sync = gRACHSequences[0]; + num_seq = ext ? 3 : 1; - rc = detectGeneralBurst(burst, threshold, sps, amplitude, toa, - target, head, tail, sync); + for (i = 0; i < num_seq; i++) { + rc = detectGeneralBurst(burst, threshold, sps, amplitude, toa, + target, head, tail, gRACHSequences[i]); + if (rc > 0) + break; + } return rc; } @@ -1682,9 +1686,10 @@ rc = analyzeTrafficBurst(burst, tsc, threshold, sps, amp, toa, max_toa); break; + case EXT_RACH: case RACH: rc = detectRACHBurst(burst, threshold, sps, amp, toa, - max_toa); + max_toa, type == EXT_RACH); break; default: LOG(ERR) << "Invalid correlation type"; diff --git a/Transceiver52M/sigProcLib.h b/Transceiver52M/sigProcLib.h index 9bc7e10..79a5c3f 100644 --- a/Transceiver52M/sigProcLib.h +++ b/Transceiver52M/sigProcLib.h @@ -29,6 +29,7 @@ enum CorrType{ OFF, ///< timeslot is off TSC, ///< timeslot should contain a normal burst + EXT_RACH, ///< timeslot should contain an extended access burst RACH, ///< timeslot should contain an access burst EDGE, ///< timeslot should contain an EDGE burst IDLE ///< timeslot is an idle (or dummy) burst -- To view, visit https://gerrit.osmocom.org/11422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia4f20524350bb8c380d7e10360758eddae8b03e9 Gerrit-Change-Number: 11422 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 19:29:15 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 24 Oct 2018 19:29:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: implement SRI_FOR_SM message In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/11061 ) Change subject: library/GSUP_Types.ttcn: implement SRI_FOR_SM message ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I7c1a882748d82ed5ef0b22cf1ae5764da5e874a0 Gerrit-Change-Number: 11061 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 20:43:03 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 24 Oct 2018 20:43:03 +0000 Subject: Change in libosmocore[master]: GSUP/SM: (WIP) introduce MO/MT FORWARD_SM messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has restored this change. ( https://gerrit.osmocom.org/11069 ) Change subject: GSUP/SM: (WIP) introduce MO/MT FORWARD_SM messages ...................................................................... Restored -- To view, visit https://gerrit.osmocom.org/11069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: restore Gerrit-Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Gerrit-Change-Number: 11069 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 21:24:10 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 24 Oct 2018 21:24:10 +0000 Subject: Change in libosmocore[master]: stats_statsd: Send all stat_items as gauges In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/11323 ) Change subject: stats_statsd: Send all stat_items as gauges ...................................................................... Patch Set 2: > We could do with TTCN3, but there's no support for statsd at the > moment so we need that first. Not everything needs to be an integration test. ;) -- To view, visit https://gerrit.osmocom.org/11323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia16270d36c9a14521594de4b99a48c83e4ac07d4 Gerrit-Change-Number: 11323 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 24 Oct 2018 21:24:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 24 21:25:11 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 24 Oct 2018 21:25:11 +0000 Subject: Change in libosmocore[master]: stats_statsd: Send all stat_items as gauges In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/11323 ) Change subject: stats_statsd: Send all stat_items as gauges ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11323/2/src/stats_statsd.c File src/stats_statsd.c: https://gerrit.osmocom.org/#/c/11323/2/src/stats_statsd.c at 196 PS2, Line 196: value What is the difference between the two branches? value vs. 0? Could you use max(value, 0) then and simplify it further? -- To view, visit https://gerrit.osmocom.org/11323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia16270d36c9a14521594de4b99a48c83e4ac07d4 Gerrit-Change-Number: 11323 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 24 Oct 2018 21:25:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 08:15:51 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 25 Oct 2018 08:15:51 +0000 Subject: Change in osmo-bsc[master]: cosmetic: fix spec ref for gsm0808_cipher_mode() In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11437 to look at the new patch set (#2). Change subject: cosmetic: fix spec ref for gsm0808_cipher_mode() ...................................................................... cosmetic: fix spec ref for gsm0808_cipher_mode() Change-Id: I359caf1dd30f033c0b606040ccf27aa4c5a9d2c6 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/37/11437/2 -- To view, visit https://gerrit.osmocom.org/11437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I359caf1dd30f033c0b606040ccf27aa4c5a9d2c6 Gerrit-Change-Number: 11437 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 08:18:08 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 25 Oct 2018 08:18:08 +0000 Subject: Change in osmo-bsc[master]: cosmetic: fix spec ref for gsm0808_cipher_mode() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11437 ) Change subject: cosmetic: fix spec ref for gsm0808_cipher_mode() ...................................................................... Patch Set 2: > You have to find the related section in 08.08 (or these days, 48.008). Done, it's 08.08 ? 3.1.14. -- To view, visit https://gerrit.osmocom.org/11437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I359caf1dd30f033c0b606040ccf27aa4c5a9d2c6 Gerrit-Change-Number: 11437 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 25 Oct 2018 08:18:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 08:43:20 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 25 Oct 2018 08:43:20 +0000 Subject: Change in simtrace2[master]: cardem: add more debug information for TPDU state In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11361 to look at the new patch set (#2). Change subject: cardem: add more debug information for TPDU state ...................................................................... cardem: add more debug information for TPDU state this just adds the name of the TPDU state on top of the state number. the ISO state is cleaned up accordingly Change-Id: Id5104a2c3579dedb092c179748e9ed525673841c --- M firmware/libcommon/source/card_emu.c 1 file changed, 79 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/61/11361/2 -- To view, visit https://gerrit.osmocom.org/11361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id5104a2c3579dedb092c179748e9ed525673841c Gerrit-Change-Number: 11361 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 09:10:00 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 25 Oct 2018 09:10:00 +0000 Subject: Change in simtrace2[master]: cardem: add more debug information for TPDU state In-Reply-To: References: Message-ID: K?vin Redon has posted comments on this change. ( https://gerrit.osmocom.org/11361 ) Change subject: cardem: add more debug information for TPDU state ...................................................................... Patch Set 2: fixed both valid comments, and updated a related debugging output -- To view, visit https://gerrit.osmocom.org/11361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5104a2c3579dedb092c179748e9ed525673841c Gerrit-Change-Number: 11361 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Thu, 25 Oct 2018 09:10:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 09:41:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 25 Oct 2018 09:41:58 +0000 Subject: Change in osmo-bts[master]: common/scheduler.c: track TDMA frame loss per logical channels In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10309 ) Change subject: common/scheduler.c: track TDMA frame loss per logical channels ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I70d05b67a35ddcbdd1b6394dbd7198404a440e76 Gerrit-Change-Number: 10309 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 25 Oct 2018 09:41:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 09:59:16 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 25 Oct 2018 09:59:16 +0000 Subject: Change in libosmocore[master]: cosmetic: fix typo (soocket -> socket) Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11454 Change subject: cosmetic: fix typo (soocket -> socket) ...................................................................... cosmetic: fix typo (soocket -> socket) Change-Id: I2184bf12398902d933f3744bc094418cc6961e86 --- M src/socket.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/54/11454/1 diff --git a/src/socket.c b/src/socket.c index a85edb7..bb5505f 100644 --- a/src/socket.c +++ b/src/socket.c @@ -682,7 +682,7 @@ return osmo_fd_init_ofd(ofd, osmo_sock_unix_init(type, proto, socket_path, flags)); } -/*! Get address/port information on soocket in dyn-alloc string +/*! Get address/port information on socket in dyn-alloc string * \param[in] ctx talloc context from which to allocate string buffer * \param[in] fd file descriptor of socket * \returns string identifying the connection of this socket -- To view, visit https://gerrit.osmocom.org/11454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2184bf12398902d933f3744bc094418cc6961e86 Gerrit-Change-Number: 11454 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 09:59:17 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 25 Oct 2018 09:59:17 +0000 Subject: Change in libosmocore[master]: add osmo_sock_get_{local, remote}_ip{, _port}() Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11455 Change subject: add osmo_sock_get_{local,remote}_ip{,_port}() ...................................................................... add osmo_sock_get_{local,remote}_ip{,_port}() Return only the IP or port of either the local or remote connection, not the whole set of IP and port of both the local and remote connection like osmo_sock_get_name() does it. This is needed for OS#2841, where we only want to print the remote IP. Related: OS#2841 Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/55/11455/1 diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index f23a243..6f3de0f 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -56,6 +56,11 @@ const char *socket_path, unsigned int flags); char *osmo_sock_get_name(void *ctx, int fd); +char *osmo_sock_get_name2(void *ctx, int fd, bool local, bool port); +#define osmo_sock_get_local_ip(ctx, fd) osmo_sock_get_name2(ctx, fd, false, false) +#define osmo_sock_get_local_ip_port(ctx, fd) osmo_sock_get_name2(ctx, fd, false, true) +#define osmo_sock_get_remote_ip(ctx, fd) osmo_sock_get_name2(ctx, fd, true, false) +#define osmo_sock_get_remote_ip_port(ctx, fd) osmo_sock_get_name2(ctx, fd, true, true) int osmo_sock_mcast_loop_set(int fd, bool enable); int osmo_sock_mcast_ttl_set(int fd, uint8_t ttl); diff --git a/src/socket.c b/src/socket.c index bb5505f..dedf2b6 100644 --- a/src/socket.c +++ b/src/socket.c @@ -682,6 +682,36 @@ return osmo_fd_init_ofd(ofd, osmo_sock_unix_init(type, proto, socket_path, flags)); } +/*! Get one IP or port number on socket in dyn-alloc string. This is + * for internal usage. Convenience wrappers: osmo_sock_get_local_ip(), + * osmo_sock_get_local_ip_port(), osmo_sock_get_remote_ip() and + * osmo_sock_get_remote_ip_port(). + * \param[in] ctx talloc context from which to allocate string buffer + * \param[in] fd file descriptor of socket + * \param[in] local (true) or remote (false) name will get looked at + * \param[in] port (true) or ip address (false) will be returned + * \returns string with IP or port + */ +char *osmo_sock_get_name2(void *ctx, int fd, bool local, bool port) +{ + struct sockaddr sa; + socklen_t len = sizeof(sa); + char hostbuf[64], portbuf[16]; + int rc; + + rc = local ? getsockname(fd, &sa, &len) : getpeername(fd, &sa, &len); + if (rc < 0) + return NULL; + + rc = getnameinfo(&sa, len, hostbuf, sizeof(hostbuf), + portbuf, sizeof(portbuf), + NI_NUMERICHOST | NI_NUMERICSERV); + if (rc < 0) + return NULL; + + return talloc_strdup(ctx, port ? portbuf : hostbuf); +} + /*! Get address/port information on socket in dyn-alloc string * \param[in] ctx talloc context from which to allocate string buffer * \param[in] fd file descriptor of socket -- To view, visit https://gerrit.osmocom.org/11455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 Gerrit-Change-Number: 11455 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 13:02:40 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 25 Oct 2018 13:02:40 +0000 Subject: Change in libosmocore[master]: cosmetic: fix typo (soocket -> socket) In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11454 ) Change subject: cosmetic: fix typo (soocket -> socket) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2184bf12398902d933f3744bc094418cc6961e86 Gerrit-Change-Number: 11454 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Thu, 25 Oct 2018 13:02:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 13:07:08 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 25 Oct 2018 13:07:08 +0000 Subject: Change in libosmocore[master]: add osmo_sock_get_{local, remote}_ip{, _port}() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11455 ) Change subject: add osmo_sock_get_{local,remote}_ip{,_port}() ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11455/1/include/osmocom/core/socket.h File include/osmocom/core/socket.h: https://gerrit.osmocom.org/#/c/11455/1/include/osmocom/core/socket.h at 59 PS1, Line 59: char *osmo_sock_get_name2(void *ctx, int fd, bool local, bool port); If that's meant for internal use (as per comment in .c) than why do we add it to public API? https://gerrit.osmocom.org/#/c/11455/1/src/socket.c File src/socket.c: https://gerrit.osmocom.org/#/c/11455/1/src/socket.c at 714 PS1, Line 714: There seems to be some code duplication with osmo_sock_get_name() - any chance to unify that? -- To view, visit https://gerrit.osmocom.org/11455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 Gerrit-Change-Number: 11455 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max Gerrit-Comment-Date: Thu, 25 Oct 2018 13:07:08 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 13:41:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 25 Oct 2018 13:41:43 +0000 Subject: Change in libosmocore[master]: cosmetic: fix typo (soocket -> socket) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11454 ) Change subject: cosmetic: fix typo (soocket -> socket) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2184bf12398902d933f3744bc094418cc6961e86 Gerrit-Change-Number: 11454 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 25 Oct 2018 13:41:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 13:41:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 25 Oct 2018 13:41:45 +0000 Subject: Change in libosmocore[master]: cosmetic: fix typo (soocket -> socket) In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11454 ) Change subject: cosmetic: fix typo (soocket -> socket) ...................................................................... cosmetic: fix typo (soocket -> socket) Change-Id: I2184bf12398902d933f3744bc094418cc6961e86 --- M src/socket.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Max: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/src/socket.c b/src/socket.c index a85edb7..bb5505f 100644 --- a/src/socket.c +++ b/src/socket.c @@ -682,7 +682,7 @@ return osmo_fd_init_ofd(ofd, osmo_sock_unix_init(type, proto, socket_path, flags)); } -/*! Get address/port information on soocket in dyn-alloc string +/*! Get address/port information on socket in dyn-alloc string * \param[in] ctx talloc context from which to allocate string buffer * \param[in] fd file descriptor of socket * \returns string identifying the connection of this socket -- To view, visit https://gerrit.osmocom.org/11454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2184bf12398902d933f3744bc094418cc6961e86 Gerrit-Change-Number: 11454 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 15:01:17 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 25 Oct 2018 15:01:17 +0000 Subject: Change in libosmocore[master]: add osmo_sock_get_{local, remote}_ip{, _port}() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11455 ) Change subject: add osmo_sock_get_{local,remote}_ip{,_port}() ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11455/1/include/osmocom/core/socket.h File include/osmocom/core/socket.h: https://gerrit.osmocom.org/#/c/11455/1/include/osmocom/core/socket.h at 59 PS1, Line 59: char *osmo_sock_get_name2(void *ctx, int fd, bool local, bool port); > If that's meant for internal use (as per comment in . [?] I thought that was necessary to use it with the defines below. How do we not make it public, add an underscore in front of the function? https://gerrit.osmocom.org/#/c/11455/1/src/socket.c File src/socket.c: https://gerrit.osmocom.org/#/c/11455/1/src/socket.c at 714 PS1, Line 714: > There seems to be some code duplication with osmo_sock_get_name() - any chance to unify that? Good question. I'll try it out tomorrow by adding hostbuf and portbuf arguments to osmo_sock_get_name2, and if they are not NULL, write the results into them. Then it's possible to use osmo_sock_get_name2() from the function below and make it a bit less redundant. -- To view, visit https://gerrit.osmocom.org/11455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 Gerrit-Change-Number: 11455 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Thu, 25 Oct 2018 15:01:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 15:05:14 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 25 Oct 2018 15:05:14 +0000 Subject: Change in osmocom-bb[master]: mobile: cleanup app init In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11456 ) Change subject: mobile: cleanup app init ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idc38feb03656bd9a52aa29095ff7423e0e6ad53b Gerrit-Change-Number: 11456 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 25 Oct 2018 15:05:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 15:05:24 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 25 Oct 2018 15:05:24 +0000 Subject: Change in osmocom-bb[master]: mobile: fix vty bind ip override In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11457 ) Change subject: mobile: fix vty bind ip override ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32517567847fd5c54b1742f18bf409ff81e316fa Gerrit-Change-Number: 11457 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 25 Oct 2018 15:05:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Oct 25 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 25 Oct 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#287?= In-Reply-To: <603153875.196.1540393807440.JavaMail.jenkins@jenkins.osmocom.org> References: <603153875.196.1540393807440.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1545962033.214.1540480207306.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Oct 25 15:32:59 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 25 Oct 2018 15:32:59 +0000 Subject: Change in libosmocore[master]: add osmo_sock_get_{local, remote}_ip{, _port}() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11455 ) Change subject: add osmo_sock_get_{local,remote}_ip{,_port}() ...................................................................... Patch Set 1: Not sure how can we make this function - maybe we can somehow use OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE to discourage public use of the function. Not sure how to make it work with #define wrappers though. Alternatively, we can just adjust the comment and make it regular public function. -- To view, visit https://gerrit.osmocom.org/11455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 Gerrit-Change-Number: 11455 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Thu, 25 Oct 2018 15:32:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 15:35:27 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 25 Oct 2018 15:35:27 +0000 Subject: Change in osmo-bsc[master]: cosmetic: fix spec ref for gsm0808_cipher_mode() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11437 ) Change subject: cosmetic: fix spec ref for gsm0808_cipher_mode() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I359caf1dd30f033c0b606040ccf27aa4c5a9d2c6 Gerrit-Change-Number: 11437 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 25 Oct 2018 15:35:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 16:19:27 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 25 Oct 2018 16:19:27 +0000 Subject: Change in osmo-msc[master]: Update VLR test helper In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11458 ) Change subject: Update VLR test helper ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf507d094319123c6667ba963db1d385df4d4f92 Gerrit-Change-Number: 11458 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 25 Oct 2018 16:19:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 16:19:31 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 25 Oct 2018 16:19:31 +0000 Subject: Change in osmo-msc[master]: Fix VLR test macro In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/6296 ) Change subject: Fix VLR test macro ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/6296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I36ae1f9bb395921dc2c5a39e35fbb8040ba47213 Gerrit-Change-Number: 6296 Gerrit-PatchSet: 7 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 25 Oct 2018 16:19:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 16:32:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 25 Oct 2018 16:32:46 +0000 Subject: Change in osmo-gsm-tester[master]: process: Make sure sync process is terminated if ogt is stopped Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11459 Change subject: process: Make sure sync process is terminated if ogt is stopped ...................................................................... process: Make sure sync process is terminated if ogt is stopped Change-Id: Iecdac96ea576a312be2a6c6b6799e249074687ef --- M src/osmo_gsm_tester/process.py 1 file changed, 13 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/59/11459/1 diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py index 534cdba..fb5c6f6 100644 --- a/src/osmo_gsm_tester/process.py +++ b/src/osmo_gsm_tester/process.py @@ -236,25 +236,26 @@ ' '.join(self.popen_args))] self.dbg(self.popen_args, dir=self.run_dir, conf=self.popen_kwargs) +def run_proc_sync(proc): + try: + proc.launch() + proc.wait() + except Exception as e: + proc.terminate() + raise e + if proc.result != 0: + log.ctx(proc) + raise log.Error('Exited in error') def run_local_sync(run_dir, name, popen_args): run_dir =run_dir.new_dir(name) proc = Process(name, run_dir, popen_args) - proc.launch() - proc.wait() - if proc.result != 0: - log.ctx(proc) - raise log.Error('Exited in error') + run_proc_sync(proc) def run_remote_sync(run_dir, remote_user, remote_addr, name, popen_args, remote_cwd=None): run_dir = run_dir.new_dir(name) - proc = RemoteProcess(name, run_dir, remote_user, remote_addr, remote_cwd, - popen_args) - proc.launch() - proc.wait() - if proc.result != 0: - log.ctx(proc) - raise log.Error('Exited in error') + proc = RemoteProcess(name, run_dir, remote_user, remote_addr, remote_cwd, popen_args) + run_proc_sync(proc) def scp(run_dir, remote_user, remote_addr, name, local_path, remote_path): run_local_sync(run_dir, name, ('scp', '-r', local_path, '%s@%s:%s' % (remote_user, remote_addr, remote_path))) -- To view, visit https://gerrit.osmocom.org/11459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iecdac96ea576a312be2a6c6b6799e249074687ef Gerrit-Change-Number: 11459 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 16:34:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 25 Oct 2018 16:34:54 +0000 Subject: Change in osmo-gsm-tester[master]: utils: Introduce modem-netns-setup.py Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11461 Change subject: utils: Introduce modem-netns-setup.py ...................................................................... utils: Introduce modem-netns-setup.py Used to quickly set modem net interfaces into their own net namespace (named after modem USB ID path). The idea is that since osmo-gsm-tester ofono modem.py knowns the USB path from a modem (path yml attr), it can infer the netns from it and run a ping process inside it. Related: OS#2308 Change-Id: Iadb2df2974e132044fba1f1bc2db8b559912e4e1 --- A utils/modem-netns-setup.py 1 file changed, 87 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/61/11461/1 diff --git a/utils/modem-netns-setup.py b/utils/modem-netns-setup.py new file mode 100755 index 0000000..e0645d1 --- /dev/null +++ b/utils/modem-netns-setup.py @@ -0,0 +1,87 @@ +#!/usr/bin/env python3 +# Pau Espin Pedrol +# MIT + +# manage netns for ofono modems + +import os +import sys +import subprocess +import usb.core +import usb.util +from pprint import pprint + +def get_path_ids(bus, port_numbers): + port_numbers = [str(port) for port in port_numbers] + ports = '.'.join(port_numbers) + return '{}-{}'.format(bus, ports) + +def get_usb_dir(bus, port_numbers): + return '/sys/bus/usb/devices/' + get_path_ids(bus, port_numbers) + '/' + +def get_net_from_usb(bus, port_numbers): + net_ifaces = [] + path = get_usb_dir(bus, port_numbers) + path_ids = get_path_ids(bus, port_numbers) + + usb_interfaces = [f for f in os.listdir(path) if f.startswith(path_ids)] + for usb_iface in usb_interfaces: + listdir = [f for f in os.listdir(path + usb_iface) if f == ('net')] + if listdir: + # found a net iface + net_ifaces += os.listdir(path + usb_iface + '/net/') + return net_ifaces + +def move_modem_to_netns(usb_path_id, net_li): + + if len(net_li) == 0: + print("%s: Device has no net ifaces, skipping" %(usb_path_id)) + return + + if not os.path.exists("/var/run/netns/%s" % usb_path_id): + print("%s: Creating netns" % (usb_path_id)) + subprocess.check_call(["ip", "netns", "add", usb_path_id]) + else: + print("%s: netns already exists" % (usb_path_id)) + + for netif in net_li: + print("%s: Moving iface %s to netns" % (usb_path_id, netif)) + subprocess.check_call(["ip", "link", "set", netif, "netns", usb_path_id]) + # iface Must be set up AFTER pdp ctx is activated, otherwise we get no DHCP response. + #print("%s: Setting up iface %s" % (usb_path_id, netif)) + #subprocess.check_call(["ip", "netns", "exec", usb_path_id, "ip", "link", "set", "dev", netif, "up"]) + #subprocess.check_call(["ip", "netns", "exec", usb_path_id, "udhcpc", "-i", netif]) + +def delete_modem_netns(usb_path_id): + if os.path.exists("/var/run/netns/%s" % usb_path_id): + print("%s: Deleting netns" % (usb_path_id)) + subprocess.check_call(["ip", "netns", "delete", usb_path_id]) + else: + print("%s: netns doesn't exist" % (usb_path_id)) + +def print_help(): + print("Usage: %s start|stop" % sys.argv[0]) + exit(1) + + +if __name__ == '__main__': + + if len(sys.argv) != 2: + print_help() + + USB_DEVS = [dev for dev in usb.core.find(find_all=True)] + RESULT = {} + for device in USB_DEVS: + result = {} + if not device.port_numbers: + continue + + usb_path_id = get_path_ids(device.bus, device.port_numbers) + net_li = get_net_from_usb(device.bus, device.port_numbers) + + if sys.argv[1] == "start": + move_modem_to_netns(usb_path_id, net_li) + elif sys.argv[1] == "stop": + delete_modem_netns(usb_path_id) + else: + print_help() -- To view, visit https://gerrit.osmocom.org/11461 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iadb2df2974e132044fba1f1bc2db8b559912e4e1 Gerrit-Change-Number: 11461 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 16:34:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 25 Oct 2018 16:34:54 +0000 Subject: Change in osmo-gsm-tester[master]: utils: Introduce show_usb_device.py Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11460 Change subject: utils: Introduce show_usb_device.py ...................................................................... utils: Introduce show_usb_device.py This is a small script written by Alexander Couzens that is useful to list modems and its properties in a quick and easy way in osmo-gsm-tester setup. Change-Id: Iec049e2d56d61ecd50b65b64d95d69641fa0f8be --- A utils/show_usb_device.py 1 file changed, 97 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/60/11460/1 diff --git a/utils/show_usb_device.py b/utils/show_usb_device.py new file mode 100755 index 0000000..9136234 --- /dev/null +++ b/utils/show_usb_device.py @@ -0,0 +1,97 @@ +#!/usr/bin/env python3 +# Alexander Couzens +# MIT + +# show usb device with their net and serial devices + +import os +import usb.core +import usb.util +from pprint import pprint + +def get_path_ids(bus, port_numbers): + port_numbers = [str(port) for port in port_numbers] + ports = '.'.join(port_numbers) + return '{}-{}'.format(bus, ports) + +def get_usb_dir(bus, port_numbers): + return '/sys/bus/usb/devices/' + get_path_ids(bus, port_numbers) + '/' + +def get_usbmisc_from_usb(bus, port_numbers): + usbmisc_ifaces = [] + path = get_usb_dir(bus, port_numbers) + path_ids = get_path_ids(bus, port_numbers) + + usb_interfaces = [f for f in os.listdir(path) if f.startswith(path_ids)] + for usb_iface in usb_interfaces: + listdir = [f for f in os.listdir(path + usb_iface) if f == ('usbmisc')] + if listdir: + # found a net iface + usbmisc_ifaces += os.listdir(path + usb_iface + '/usbmisc/') + return usbmisc_ifaces + +def get_net_from_usb(bus, port_numbers): + net_ifaces = [] + path = get_usb_dir(bus, port_numbers) + path_ids = get_path_ids(bus, port_numbers) + + usb_interfaces = [f for f in os.listdir(path) if f.startswith(path_ids)] + for usb_iface in usb_interfaces: + listdir = [f for f in os.listdir(path + usb_iface) if f == ('net')] + if listdir: + # found a net iface + net_ifaces += os.listdir(path + usb_iface + '/net/') + return net_ifaces + +def get_serial_from_usb(bus, port_numbers): + serial_ifaces = [] + path = get_usb_dir(bus, port_numbers) + path_ids = get_path_ids(bus, port_numbers) + + usb_interfaces = [f for f in os.listdir(path) if f.startswith(path_ids)] + for usb_iface in usb_interfaces: + serial_ifaces += [f for f in os.listdir(path + usb_iface) if f.startswith('tty')] + return serial_ifaces + +def get_product(bus, port_numbers): + usb_dir = get_usb_dir(bus, port_numbers) + try: + product = open(os.path.join(usb_dir, 'product')).read().strip() + except OSError as exp: + product = "Unknown" + return product + +def get_manuf(bus, port_numbers): + usb_dir = get_usb_dir(bus, port_numbers) + try: + manuf = open(os.path.join(usb_dir, 'manufacturer')).read().strip() + except OSError: + manuf = "Unknown" + return manuf + +def get_name(bus, port_numbers): + manuf = get_manuf(bus, port_numbers) + product = get_product(bus, port_numbers) + return "%s %s" % (manuf, product) + +if __name__ == '__main__': + USB_DEVS = [dev for dev in usb.core.find(find_all=True)] + RESULT = {} + for device in USB_DEVS: + result = {} + if not device.port_numbers: + continue + + # retrieve manuf + product from /sys because non-root user can not ask the usb device + result['name'] = get_name(device.bus, device.port_numbers) + result['path'] = get_usb_dir(device.bus, device.port_numbers) + result['net'] = get_net_from_usb(device.bus, device.port_numbers) + result['cdc'] = get_usbmisc_from_usb(device.bus, device.port_numbers) + result['serial'] = get_serial_from_usb(device.bus, device.port_numbers) + + # only show device which have serial or net devices + if result['net'] or result['serial']: + RESULT[device] = result + + pprint(RESULT) + -- To view, visit https://gerrit.osmocom.org/11460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iec049e2d56d61ecd50b65b64d95d69641fa0f8be Gerrit-Change-Number: 11460 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 16:34:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 25 Oct 2018 16:34:54 +0000 Subject: Change in osmo-gsm-tester[master]: WIP: gprs Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11462 Change subject: WIP: gprs ...................................................................... WIP: gprs Change-Id: Icb06bdfcdd37c797be95ab5addb28da2d9f6681c --- A example/scenarios/modem-ec20.conf M src/osmo_gsm_tester/modem.py M src/osmo_gsm_tester/process.py M src/osmo_gsm_tester/suite.py M suites/gprs/ping.py A utils/osmo-gsm-tester_netns_exec.sh 6 files changed, 47 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/62/11462/1 diff --git a/example/scenarios/modem-ec20.conf b/example/scenarios/modem-ec20.conf new file mode 100644 index 0000000..c6dc8f9 --- /dev/null +++ b/example/scenarios/modem-ec20.conf @@ -0,0 +1,3 @@ +resources: + modem: + - label: ec20 diff --git a/src/osmo_gsm_tester/modem.py b/src/osmo_gsm_tester/modem.py index d0bbf23..f7acd8c 100644 --- a/src/osmo_gsm_tester/modem.py +++ b/src/osmo_gsm_tester/modem.py @@ -17,13 +17,14 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from . import log, util, sms +from . import log, util, sms, process from .event_loop import MainLoop from pydbus import SystemBus, Variant import time import pprint import sys +import os # Required for Gio.Cancellable. # See https://lazka.github.io/pgi-docs/Gio-2.0/classes/Cancellable.html#Gio.Cancellable @@ -326,15 +327,17 @@ CTX_PROT_IPv6 = 'ipv6' CTX_PROT_IPv46 = 'dual' - def __init__(self, conf): + def __init__(self, suite_run, conf): + self.suite_run = suite_run self.conf = conf self.syspath = conf.get('path') self.dbuspath = get_dbuspath_from_syspath(self.syspath) super().__init__(log.C_TST, self.dbuspath) - self.dbg('creating from syspath %s', self.syspath) + self.dbg('creating from syspath %s' % self.syspath) self.msisdn = None self._ki = None self._imsi = None + self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name().strip('/'))) self.sms_received_list = [] self.dbus = ModemDbusInteraction(self.dbuspath) self.register_attempts = 0 @@ -361,6 +364,9 @@ self.dbus.cleanup() self.dbus = None + def netns(self): + return os.path.basename(self.syspath.rstrip('/')) + def properties(self, *args, **kwargs): '''Return a dict of properties on this modem. For the actual arguments, see ModemDbusInteraction.properties(), which this function calls. The @@ -630,6 +636,23 @@ connmgr.RemoveContext(ctx_id) self.log('context deactivated', path=ctx_id) + def run_netns_wait(self, name, popen_args): + proc = process.NetNSProcess(name, self.run_dir.new_dir(name), self.netns(), popen_args, + env={}) + process.run_proc_sync(proc) + + def setup_context_data_plane(self, ctx_id): + self.dbg('setup_context_data', path=ctx_id) + ctx = systembus_get(ctx_id) + ctx_settings = ctx.GetProperties().get('Settings', None) + if not ctx_settings: + raise log.Error('%s no Settings found! No way to get iface!' % ctx_id) + iface = ctx_settings.get('Interface', None) + if not iface: + raise log.Error('%s Settings contains no iface! %r' % (ctx_id, repr(ctx_settings))) + self.run_netns_wait('ifup', ('ip', 'link', 'set', 'dev', iface, 'up')) + self.run_netns_wait('dhcp', ('udhcpc', '-q', '-i', iface)) + def sms_send(self, to_msisdn_or_modem, *tokens): if isinstance(to_msisdn_or_modem, Modem): to_msisdn = to_msisdn_or_modem.msisdn diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py index fb5c6f6..3764409 100644 --- a/src/osmo_gsm_tester/process.py +++ b/src/osmo_gsm_tester/process.py @@ -274,4 +274,12 @@ scp(run_dir, remote_user, remote_addr, 'scp-cfg-to-remote', cfg_file_name, remote_config_file) return remote_inst +class NetNSProcess(Process): + NETNS_EXEC_BIN = 'osmo-gsm-tester_netns_exec.sh' + def __init__(self, name, run_dir, netns, popen_args, **popen_kwargs): + super().__init__(name, run_dir, popen_args, **popen_kwargs) + self.netns = netns + + self.popen_args = ['sudo', self.NETNS_EXEC_BIN, self.netns] + list(popen_args) + self.dbg(self.popen_args, dir=self.run_dir, conf=self.popen_kwargs) # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index 3a49574..bf8156d 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -323,7 +323,7 @@ def modem(self, specifics=None): conf = self.reserved_resources.get(resource.R_MODEM, specifics=specifics) self.dbg('create Modem object', conf=conf) - ms = modem.Modem(conf) + ms = modem.Modem(self, conf) self.register_for_cleanup(ms) return ms diff --git a/suites/gprs/ping.py b/suites/gprs/ping.py index 1647445..5a821fe 100755 --- a/suites/gprs/ping.py +++ b/suites/gprs/ping.py @@ -48,8 +48,10 @@ # We need to use inet46 since ofono qmi only uses ipv4v6 eua (OS#2713) ctx_id_v4 = ms.activate_context(apn='inet46', protocol=ms.CTX_PROT_IPv4) -sleep(5) -# TODO: send ping to server or open TCP conn with a socket in python +print("Setting up data plan for %r" % repr(ctx_id_v4)) +ms.setup_context_data_plane(ctx_id_v4) +print("Running 10 ping requrests for %r" % repr(ctx_id_v4)) +ms.run_netns_wait('ping', ('ping', '-c', '10', ggsn.addr())) ms.deactivate_context(ctx_id_v4) # We need to use inet46 since ofono qmi only uses ipv4v6 eua (OS#2713) diff --git a/utils/osmo-gsm-tester_netns_exec.sh b/utils/osmo-gsm-tester_netns_exec.sh new file mode 100755 index 0000000..336b746 --- /dev/null +++ b/utils/osmo-gsm-tester_netns_exec.sh @@ -0,0 +1,5 @@ +#!/bin/bash +netns="$1" +shift +#TODO: Later on I may want to call myself with specific ENV and calling sudo in order to run inside the netns but with dropped privileges +ip netns exec $netns "$@" -- To view, visit https://gerrit.osmocom.org/11462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icb06bdfcdd37c797be95ab5addb28da2d9f6681c Gerrit-Change-Number: 11462 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 16:43:24 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 25 Oct 2018 16:43:24 +0000 Subject: Change in osmo-mgw[master]: add MGCP CRCX command statistics to osmo-mgw Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11463 Change subject: add MGCP CRCX command statistics to osmo-mgw ...................................................................... add MGCP CRCX command statistics to osmo-mgw Add a counter group for CRCX commands. The group contains counters for successful connection processing as well as various error conditions. This provides a quick overview of CRCX failures on each trunk throughout the lifetime of the osmo-mgw process. For example, after running the TTCN3 mgw test suite, the counters show the following values: OsmoMGW> show rate-counters crxc statistics for trunk 0: crcx:success: 88 (0/s 88/m 0/h 0/d) CRCX command processed successfully. crcx:bad_action: 0 (0/s 0/m 0/h 0/d) bad action in CRCX command. crcx:unhandled_param: 1 (0/s 1/m 0/h 0/d) unhandled parameter in CRCX command. crcx:missing_callid: 1 (0/s 1/m 0/h 0/d) missing CallId in CRCX command. crcx:invalid_mode: 1 (0/s 1/m 0/h 0/d) connection invalid mode in CRCX command. crcx:limit_exceeded: 0 (0/s 0/m 0/h 0/d) limit of concurrent connections was reached. crcx:unkown_callid: 0 (0/s 0/m 0/h 0/d) unknown CallId in CRCX command. crcx:alloc_conn_fail: 0 (0/s 0/m 0/h 0/d) connection allocation failure. crcx:no_remote_conn_desc: 1 (0/s 1/m 0/h 0/d) no opposite end specified for connection. crcx:start_rtp_failure: 0 (0/s 0/m 0/h 0/d) failure to start RTP processing. crcx:conn_rejected: 0 (0/s 0/m 0/h 0/d) connection rejected by policy. OsmoMGW> With input from Philipp Maier. Change-Id: Ida82fc340d5c66180e5fe9a0d195e9be6dc64c61 Depends: I027644f4b913e1f966c11b081e9027e61591a224 Related: OS#2660 --- M include/osmocom/mgcp/mgcp.h M src/libosmo-mgcp/mgcp_protocol.c 2 files changed, 78 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/63/11463/1 diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index bdc86fc..f9f0ac7 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -118,6 +118,21 @@ #define MGCP_KEEPALIVE_ONCE (-1) #define MGCP_KEEPALIVE_NEVER 0 +/* Global MCGP CRCX related rate counters */ +enum { + MGCP_CRCX_SUCCESS, + MGCP_CRCX_FAIL_BAD_ACTION, + MGCP_CRCX_FAIL_UNHANDLED_PARAM, + MGCP_CRCX_FAIL_MISSING_CALLID, + MGCP_CRCX_FAIL_INVALID_MODE, + MGCP_CRCX_FAIL_LIMIT_EXCEEDED, + MGCP_CRCX_FAIL_UNKNOWN_CALLID, + MGCP_CRCX_FAIL_ALLOC_CONN, + MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC, + MGCP_CRCX_FAIL_START_RTP, + MGCP_CRCX_FAIL_REJECTED_BY_POLICY, +}; + struct mgcp_trunk_config { struct llist_head entry; @@ -155,6 +170,9 @@ unsigned int number_endpoints; int vty_number_endpoints; struct mgcp_endpoint *endpoints; + + /* rate counters */ + struct rate_ctr_group *mgcp_crcx_ctr_group; }; enum mgcp_role { diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index e17bdae..63e76cd 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -51,6 +52,28 @@ #define MGCP_REQUEST(NAME, REQ, DEBUG_NAME) \ { .name = NAME, .handle_request = REQ, .debug_name = DEBUG_NAME }, +static const struct rate_ctr_desc mgcp_crcx_ctr_desc[] = { + [MGCP_CRCX_SUCCESS] = {"crcx:success", "CRCX command processed successfully."}, + [MGCP_CRCX_FAIL_BAD_ACTION] = {"crcx:bad_action", "bad action in CRCX command."}, + [MGCP_CRCX_FAIL_UNHANDLED_PARAM] = {"crcx:unhandled_param", "unhandled parameter in CRCX command."}, + [MGCP_CRCX_FAIL_MISSING_CALLID] = {"crcx:missing_callid", "missing CallId in CRCX command."}, + [MGCP_CRCX_FAIL_INVALID_MODE] = {"crcx:invalid_mode", "connection invalid mode in CRCX command."}, + [MGCP_CRCX_FAIL_LIMIT_EXCEEDED] = {"crcx:limit_exceeded", "limit of concurrent connections was reached."}, + [MGCP_CRCX_FAIL_UNKNOWN_CALLID] = {"crcx:unkown_callid", "unknown CallId in CRCX command."}, + [MGCP_CRCX_FAIL_ALLOC_CONN] = {"crcx:alloc_conn_fail", "connection allocation failure."}, + [MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC] = {"crcx:no_remote_conn_desc", "no opposite end specified for connection."}, + [MGCP_CRCX_FAIL_START_RTP] = {"crcx:start_rtp_failure", "failure to start RTP processing."}, + [MGCP_CRCX_FAIL_REJECTED_BY_POLICY] = {"crcx:conn_rejected", "connection rejected by policy."}, +}; + +const static struct rate_ctr_group_desc mgcp_crcx_ctr_group_desc = { + .group_name_prefix = "crcx", + .group_description = "crxc statistics", + .class_id = OSMO_STATS_CLASS_GLOBAL, + .num_ctr = ARRAY_SIZE(mgcp_crcx_ctr_desc), + .ctr_desc = mgcp_crcx_ctr_desc +}; + static struct msgb *handle_audit_endpoint(struct mgcp_parse_data *data); static struct msgb *handle_create_con(struct mgcp_parse_data *data); static struct msgb *handle_delete_con(struct mgcp_parse_data *data); @@ -701,7 +724,7 @@ /* CRCX command handler, processes the received command */ static struct msgb *handle_create_con(struct mgcp_parse_data *p) { - struct mgcp_trunk_config *tcfg; + struct mgcp_trunk_config *tcfg = p->endp->tcfg; struct mgcp_endpoint *endp = p->endp; int error_code = 400; @@ -733,6 +756,7 @@ /* It is illegal to send a connection identifier * together with a CRCX, the MGW will assign the * connection identifier by itself on CRCX */ + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_BAD_ACTION]); return create_err_response(NULL, 523, "CRCX", p->trans); break; case 'M': @@ -759,19 +783,19 @@ LOGP(DLMGCP, LOGL_NOTICE, "CRCX: endpoint:%x unhandled option: '%c'/%d\n", ENDPOINT_NUMBER(endp), *line, *line); + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_UNHANDLED_PARAM]); return create_err_response(NULL, 539, "CRCX", p->trans); break; } } mgcp_header_done: - tcfg = p->endp->tcfg; - /* Check parameters */ if (!callid) { LOGP(DLMGCP, LOGL_ERROR, "CRCX: endpoint:%x insufficient parameters, missing callid\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_MISSING_CALLID]); return create_err_response(endp, 516, "CRCX", p->trans); } @@ -779,6 +803,7 @@ LOGP(DLMGCP, LOGL_ERROR, "CRCX: endpoint:%x insufficient parameters, missing mode\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_INVALID_MODE]); return create_err_response(endp, 517, "CRCX", p->trans); } @@ -795,6 +820,7 @@ } else { /* There is no more room for a connection, leave * everything as it is and return with an error */ + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_LIMIT_EXCEEDED]); return create_err_response(endp, 540, "CRCX", p->trans); } } @@ -812,6 +838,7 @@ else { /* This is not our call, leave everything as it is and * return with an error. */ + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_UNKNOWN_CALLID]); return create_err_response(endp, 400, "CRCX", p->trans); } } @@ -827,6 +854,7 @@ LOGP(DLMGCP, LOGL_ERROR, "CRCX: endpoint:0x%x unable to allocate RTP connection\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_ALLOC_CONN]); goto error2; } @@ -890,6 +918,7 @@ "CRCX: endpoint:%x selected connection mode type requires an opposite end!\n", ENDPOINT_NUMBER(endp)); error_code = 527; + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC]); goto error2; } @@ -901,6 +930,7 @@ LOGP(DLMGCP, LOGL_ERROR, "CRCX: endpoint:0x%x could not start RTP processing!\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_START_RTP]); goto error2; } @@ -915,6 +945,7 @@ "CRCX: endpoint:0x%x CRCX rejected by policy\n", ENDPOINT_NUMBER(endp)); mgcp_endp_release(endp); + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_REJECTED_BY_POLICY]); return create_err_response(endp, 400, "CRCX", p->trans); break; case MGCP_POLICY_DEFER: @@ -942,6 +973,7 @@ LOGP(DLMGCP, LOGL_NOTICE, "CRCX: endpoint:0x%x connection successfully created\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_SUCCESS]); return create_response_with_sdp(endp, conn, "CRCX", p->trans, true); error2: mgcp_endp_release(endp); @@ -1439,6 +1471,25 @@ return cfg; } +static void alloc_mgcp_crxc_rate_counters(struct mgcp_trunk_config *trunk, void *ctx) +{ + /* FIXME: Each new rate counter group requires a unique index. At the + * moment we generate an index using a counter, but perhaps there is + * a better way of assigning indices? */ + static unsigned int rate_ctr_index = 0; + struct rate_ctr_group_desc *rate_ctrs; + + rate_ctrs = talloc(ctx, struct rate_ctr_group_desc); + OSMO_ASSERT(rate_ctrs); + memcpy(rate_ctrs, &mgcp_crcx_ctr_group_desc, sizeof(*rate_ctrs)); + rate_ctrs->group_description = talloc_asprintf(ctx, "%s for trunk %d", + mgcp_crcx_ctr_group_desc.group_description, trunk->trunk_nr); + OSMO_ASSERT(rate_ctrs->group_description); + trunk->mgcp_crcx_ctr_group = rate_ctr_group_alloc(ctx, rate_ctrs, rate_ctr_index); + OSMO_ASSERT(trunk->mgcp_crcx_ctr_group); + rate_ctr_index++; +} + /*! allocate configuration with default values. * (called once at startup by VTY) * \param[in] cfg mgcp configuration @@ -1465,6 +1516,9 @@ trunk->omit_rtcp = 0; mgcp_trunk_set_keepalive(trunk, MGCP_KEEPALIVE_ONCE); llist_add_tail(&trunk->entry, &cfg->trunks); + + alloc_mgcp_crxc_rate_counters(trunk, trunk); + return trunk; } @@ -1509,6 +1563,9 @@ } tcfg->number_endpoints = tcfg->vty_number_endpoints; + + alloc_mgcp_crxc_rate_counters(tcfg, tcfg->cfg); + return 0; } -- To view, visit https://gerrit.osmocom.org/11463 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ida82fc340d5c66180e5fe9a0d195e9be6dc64c61 Gerrit-Change-Number: 11463 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 17:08:21 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 25 Oct 2018 17:08:21 +0000 Subject: Change in osmo-mgw[master]: add MGCP CRCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11463 to look at the new patch set (#2). Change subject: add MGCP CRCX command statistics to osmo-mgw ...................................................................... add MGCP CRCX command statistics to osmo-mgw Add a counter group for CRCX commands. The group contains counters for successful connection processing as well as various error conditions. This provides a quick overview of CRCX failures on each trunk throughout the lifetime of the osmo-mgw process. For example, after running the TTCN3 mgw test suite, the counters show the following values: OsmoMGW> show rate-counters crxc statistics for trunk 0: crcx:success: 88 (0/s 88/m 0/h 0/d) CRCX command processed successfully. crcx:bad_action: 0 (0/s 0/m 0/h 0/d) bad action in CRCX command. crcx:unhandled_param: 1 (0/s 1/m 0/h 0/d) unhandled parameter in CRCX command. crcx:missing_callid: 1 (0/s 1/m 0/h 0/d) missing CallId in CRCX command. crcx:invalid_mode: 1 (0/s 1/m 0/h 0/d) connection invalid mode in CRCX command. crcx:limit_exceeded: 0 (0/s 0/m 0/h 0/d) limit of concurrent connections was reached. crcx:unkown_callid: 0 (0/s 0/m 0/h 0/d) unknown CallId in CRCX command. crcx:alloc_conn_fail: 0 (0/s 0/m 0/h 0/d) connection allocation failure. crcx:no_remote_conn_desc: 1 (0/s 1/m 0/h 0/d) no opposite end specified for connection. crcx:start_rtp_failure: 0 (0/s 0/m 0/h 0/d) failure to start RTP processing. crcx:conn_rejected: 0 (0/s 0/m 0/h 0/d) connection rejected by policy. OsmoMGW> With input from Philipp Maier. Change-Id: Ida82fc340d5c66180e5fe9a0d195e9be6dc64c61 Depends: I027644f4b913e1f966c11b081e9027e61591a224 Related: OS#2660 --- M include/osmocom/mgcp/mgcp.h M src/libosmo-mgcp/mgcp_protocol.c 2 files changed, 89 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/63/11463/2 -- To view, visit https://gerrit.osmocom.org/11463 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ida82fc340d5c66180e5fe9a0d195e9be6dc64c61 Gerrit-Change-Number: 11463 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 17:49:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 25 Oct 2018 17:49:44 +0000 Subject: Change in osmo-mgw[master]: use a dynamic name for rtp connection rate counters In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11439 ) Change subject: use a dynamic name for rtp connection rate counters ...................................................................... Patch Set 1: Code-Review-1 this is not really how rate counter groups were intended to be used. The point is that you have one const group descriptor, and then multiple rate counter groups allocated from that descriptor. If thre's a problem with displaying the counters, then that needs to be solved on an infrastructure level, and not by "hacking" around with a copy of the group descriptor, sorry. -- To view, visit https://gerrit.osmocom.org/11439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I027644f4b913e1f966c11b081e9027e61591a224 Gerrit-Change-Number: 11439 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 25 Oct 2018 17:49:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 17:50:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 25 Oct 2018 17:50:36 +0000 Subject: Change in osmo-bsc[master]: cosmetic: fix spec ref for gsm0808_cipher_mode() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11437 ) Change subject: cosmetic: fix spec ref for gsm0808_cipher_mode() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I359caf1dd30f033c0b606040ccf27aa4c5a9d2c6 Gerrit-Change-Number: 11437 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 25 Oct 2018 17:50:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 17:50:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 25 Oct 2018 17:50:40 +0000 Subject: Change in osmo-bsc[master]: cosmetic: fix spec ref for gsm0808_cipher_mode() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11437 ) Change subject: cosmetic: fix spec ref for gsm0808_cipher_mode() ...................................................................... cosmetic: fix spec ref for gsm0808_cipher_mode() Change-Id: I359caf1dd30f033c0b606040ccf27aa4c5a9d2c6 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Max: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index a20d5d0..48af06b 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -415,7 +415,7 @@ } /* - * GSM 08.08 ? 3.4.7 cipher mode handling. We will have to pick + * GSM 08.08 ? 3.1.14 cipher mode handling. We will have to pick * the cipher to be used for this. In case we are already using * a cipher we will have to send cipher mode reject to the MSC, * otherwise we will have to pick something that we and the MS -- To view, visit https://gerrit.osmocom.org/11437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I359caf1dd30f033c0b606040ccf27aa4c5a9d2c6 Gerrit-Change-Number: 11437 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 17:50:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 25 Oct 2018 17:50:40 +0000 Subject: Change in osmo-bsc[master]: cipher mode reject: send proper cause codes In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11438 ) Change subject: cipher mode reject: send proper cause codes ...................................................................... cipher mode reject: send proper cause codes bssmap_handle_cipher_mode() had code paths doing "goto reject" without setting a meaningful cause value. Related: OS#3186 Change-Id: Ia608fa34a6a2d3035a66d05fbc38553ac5186804 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 48af06b..6b7a682 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -444,6 +444,7 @@ if (conn->ciphering_handled) { LOGP(DMSC, LOGL_ERROR, "Already seen ciphering command. Protocol Error.\n"); + reject_cause = GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC; goto reject; } @@ -452,6 +453,7 @@ tlv_parse(&tp, gsm0808_att_tlvdef(), msg->l4h + 1, payload_length - 1, 0, 0); if (!TLVP_PRESENT(&tp, GSM0808_IE_ENCRYPTION_INFORMATION)) { LOGP(DMSC, LOGL_ERROR, "IE Encryption Information missing.\n"); + reject_cause = GSM0808_CAUSE_INFORMATION_ELEMENT_OR_FIELD_MISSING; goto reject; } @@ -464,6 +466,7 @@ len = TLVP_LEN(&tp, GSM0808_IE_ENCRYPTION_INFORMATION); if (len < 1) { LOGP(DMSC, LOGL_ERROR, "IE Encryption Information is too short.\n"); + reject_cause = GSM0808_CAUSE_INCORRECT_VALUE; goto reject; } -- To view, visit https://gerrit.osmocom.org/11438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia608fa34a6a2d3035a66d05fbc38553ac5186804 Gerrit-Change-Number: 11438 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 17:51:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 25 Oct 2018 17:51:20 +0000 Subject: Change in simtrace2[master]: cardem: add more debug information for TPDU state In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11361 ) Change subject: cardem: add more debug information for TPDU state ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5104a2c3579dedb092c179748e9ed525673841c Gerrit-Change-Number: 11361 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Thu, 25 Oct 2018 17:51:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 17:51:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 25 Oct 2018 17:51:22 +0000 Subject: Change in simtrace2[master]: cardem: add more debug information for TPDU state In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11361 ) Change subject: cardem: add more debug information for TPDU state ...................................................................... cardem: add more debug information for TPDU state this just adds the name of the TPDU state on top of the state number. the ISO state is cleaned up accordingly Change-Id: Id5104a2c3579dedb092c179748e9ed525673841c --- M firmware/libcommon/source/card_emu.c 1 file changed, 79 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 75910c1..b7d0e1f 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -55,14 +55,38 @@ }; const struct value_string iso7816_3_card_state_names[] = { - OSMO_VALUE_STRING(ISO_S_WAIT_POWER), - OSMO_VALUE_STRING(ISO_S_WAIT_CLK), - OSMO_VALUE_STRING(ISO_S_WAIT_RST), - OSMO_VALUE_STRING(ISO_S_WAIT_ATR), - OSMO_VALUE_STRING(ISO_S_IN_ATR), - OSMO_VALUE_STRING(ISO_S_IN_PTS), - OSMO_VALUE_STRING(ISO_S_WAIT_TPDU), - OSMO_VALUE_STRING(ISO_S_IN_TPDU), + { + .value = ISO_S_WAIT_POWER, + .str = "WAIT_POWER", + }, + { + .value = ISO_S_WAIT_CLK, + .str = "WAIT_CLK", + }, + { + .value = ISO_S_WAIT_RST, + .str = "WAIT_RST", + }, + { + .value = ISO_S_WAIT_ATR, + .str = "WAIT_ATR", + }, + { + .value = ISO_S_IN_ATR, + .str = "IN_ATR", + }, + { + .value = ISO_S_IN_PTS, + .str = "IN_PTS", + }, + { + .value = ISO_S_WAIT_TPDU, + .str = "WAIT_TPDU", + }, + { + .value = ISO_S_IN_TPDU, + .str = "IN_TPDU", + }, { .value = 0, .str = NULL, @@ -86,6 +110,7 @@ PTS_S_WAIT_RESP_PCK = PTS_S_WAIT_REQ_PCK | 0x10, }; +/* PTS field byte index */ #define _PTSS 0 #define _PTS0 1 #define _PTS1 2 @@ -105,6 +130,46 @@ TPDU_S_WAIT_TX, /* waiting for more data to reader */ }; +const struct value_string tpdu_state_names[] = { + { + .value = TPDU_S_WAIT_CLA, + .str = "WAIT_CLA", + }, + { + .value = TPDU_S_WAIT_INS, + .str = "WAIT_INS", + }, + { + .value = TPDU_S_WAIT_P1, + .str = "WAIT_P1", + }, + { + .value = TPDU_S_WAIT_P2, + .str = "WAIT_P2", + }, + { + .value = TPDU_S_WAIT_P3, + .str = "WAIT_P3", + }, + { + .value = TPDU_S_WAIT_PB, + .str = "WAIT_PB", + }, + { + .value = TPDU_S_WAIT_RX, + .str = "WAIT_RX", + }, + { + .value = TPDU_S_WAIT_TX, + .str = "WAIT_TX", + }, + { + .value = 0, + .str = NULL, + }, +}; + +/* TPDU field byte index */ #define _CLA 0 #define _INS 1 #define _P1 2 @@ -304,9 +369,9 @@ if (ch->state == new_state) return; - TRACE_DEBUG("%u: 7816 card state %u (%s) -> %u (%s)\r\n", ch->num, - ch->state, get_value_string(iso7816_3_card_state_names, ch->state), - new_state, get_value_string(iso7816_3_card_state_names, new_state)); + TRACE_DEBUG("%u: 7816 card state %s -> %s\r\n", ch->num, + get_value_string(iso7816_3_card_state_names, ch->state), + get_value_string(iso7816_3_card_state_names, new_state)); ch->state = new_state; switch (new_state) { @@ -651,9 +716,9 @@ if (ch->tpdu.state == new_ts) return; - TRACE_DEBUG("%u: 7816 TPDU state %u -> %u\r\n", ch->num, - ch->tpdu.state, new_ts); - + TRACE_DEBUG("%u: 7816 TPDU state %s -> %s\r\n", ch->num, + get_value_string(tpdu_state_names, ch->tpdu.state), + get_value_string(tpdu_state_names, new_ts)); ch->tpdu.state = new_ts; switch (new_ts) { -- To view, visit https://gerrit.osmocom.org/11361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id5104a2c3579dedb092c179748e9ed525673841c Gerrit-Change-Number: 11361 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 17:51:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 25 Oct 2018 17:51:33 +0000 Subject: Change in osmo-bts[master]: common/scheduler.c: track TDMA frame loss per logical channels In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10309 ) Change subject: common/scheduler.c: track TDMA frame loss per logical channels ...................................................................... common/scheduler.c: track TDMA frame loss per logical channels This change modifies the logic of TDMA frame loss tracking. To be more precise, the tracking logic was moved from per timeslot level to per logical channel level, what makes OsmoBTS more accurate in its measurements. But before getting into details, it's important to clarify some things about the Uplink burst processing in transceiver (OsmoTRX). If an Uplink burst is detected, OsmoTRX demodulates it and sends to OsmoBTS. If nothing is detected on a particular timeslot, OsmoTRX will do nothing. In other words, it will not notify OsmoBTS about this. Meanwhile, there are usually a few logical channels mapped to a single TDMA timeslot. Let's use SDCCH8 channel configuration as an example (simplified layout): /* SDCCH/8 (ss=0), subscriber A (active) */ { TRXC_SDCCH8_0, bid=0 }, { TRXC_SDCCH8_0, bid=1 }, { TRXC_SDCCH8_0, bid=2 }, { TRXC_SDCCH8_0, bid=3 }, // <-- last_fn=X /* SDCCH/8 (ss=1), subscriber B (inactive) */ { TRXC_SDCCH8_1, bid=0 }, { TRXC_SDCCH8_1, bid=1 }, { TRXC_SDCCH8_1, bid=2 }, { TRXC_SDCCH8_1, bid=3 }, /* SDCCH/8 (ss=2), subscriber C (active) */ { TRXC_SDCCH8_2, bid=0 }, // <-- current_fn=X+5 { TRXC_SDCCH8_2, bid=1 }, { TRXC_SDCCH8_2, bid=2 }, { TRXC_SDCCH8_2, bid=3 }, SDCCH8 has 8 sub-slots, so up to 8 subscribers can use a single timeslot. Let's imagine there are three subscribers: A, B, and C. Both A and C are active subscribers, i.e. they are continuously transmitting UL bursts, while B is not using ss=1 anymore. The original way of TDMA frame loss tracking was the following: - when an UL burst is received, store it's frame number in the timeslot state structure (last_fn); - when the next UL burst is received on same timeslot, compute how many frames elapsed since the last_fn; - if elapsed = (current_fn - last_fn) is lower than 10, then iterate from (last_fn + 1) until the current_fn and send dummy zero-filled bursts to the higher layers; - otherwise (elapsed > 10), process the current burst, and do nothing :/ According to our example, subscriber A is sending 4 bursts, then nobody is sending anything, and then subscriber C is sending 4 bursts. So, there is a 4 frames long gap between the both transmissions, which is being substituted by dummy bursts. But, as the logical channel on ss=1 is not active, they are dropped. This is not that scary, but the current algorithm produces lots of false-positives, and moreover is not able to track real frame drops in longer periods (i.e. >10). So, tracking the frame loss per individual logical channels makes much more sense. Let's finally drop this hackish 'while (42) { ... }', and track the amount of lost / received TDMA frames (bursts) individually per logical channels. Let's also use the multiframe period as the loss detection period, instead of hardcoded 10. And finally, let's print more informative debug messages. Also, it makes sense to use the amount of lost / received bursts during the calculation of the measurement reports, instead of sending dummy bursts, but let's do this separately. Change-Id: I70d05b67a35ddcbdd1b6394dbd7198404a440e76 Related: OS#3428 --- M include/osmo-bts/scheduler.h M src/common/scheduler.c 2 files changed, 142 insertions(+), 65 deletions(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h index 32d6e91..f9d9962 100644 --- a/include/osmo-bts/scheduler.h +++ b/include/osmo-bts/scheduler.h @@ -80,6 +80,9 @@ /* loss detection */ uint8_t lost_frames; /* how many L2 frames were lost */ + uint32_t last_tdma_fn; /* last processed TDMA frame number */ + uint32_t proc_tdma_fs; /* how many TDMA frames were processed */ + uint32_t lost_tdma_fs; /* how many TDMA frames were lost */ /* mode */ uint8_t rsl_cmode, tch_mode; /* mode for TCH channels */ @@ -124,7 +127,6 @@ struct l1sched_ts { uint8_t mf_index; /* selected multiframe index */ - uint32_t mf_last_fn; /* last received frame number */ uint8_t mf_period; /* period of multiframe */ const struct trx_sched_frame *mf_frames; /* pointer to frame layout */ diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 65ece7f..f705ddf 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -222,7 +222,6 @@ struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn); l1ts->mf_index = 0; - l1ts->mf_last_fn = 0; INIT_LLIST_HEAD(&l1ts->dl_prims); for (i = 0; i < ARRAY_SIZE(l1ts->chan_state); i++) { struct l1sched_chan_state *chan_state; @@ -853,8 +852,115 @@ return bits; } +#define TDMA_FN_SUM(a, b) \ + ((a + GSM_HYPERFRAME + b) % GSM_HYPERFRAME) + +#define TDMA_FN_SUB(a, b) \ + ((a + GSM_HYPERFRAME - b) % GSM_HYPERFRAME) + +static int trx_sched_calc_frame_loss(struct l1sched_trx *l1t, + struct l1sched_chan_state *l1cs, uint8_t tn, uint32_t fn) +{ + const struct trx_sched_frame *frame_head; + const struct trx_sched_frame *frame; + struct l1sched_ts *l1ts; + uint32_t elapsed_fs; + uint8_t offset, i; + uint32_t fn_i; + + /** + * When a channel is just activated, the MS needs some time + * to synchronize and start burst transmission, + * so let's wait until the first UL burst... + */ + if (l1cs->proc_tdma_fs == 0) + return 0; + + /* Get current TDMA frame info */ + l1ts = l1sched_trx_get_ts(l1t, tn); + offset = fn % l1ts->mf_period; + frame_head = l1ts->mf_frames + offset; + + /* Not applicable for some logical channels */ + switch (frame_head->ul_chan) { + case TRXC_IDLE: + case TRXC_RACH: + case TRXC_PDTCH: + case TRXC_PTCCH: + return 0; + default: + /* No applicable if we are waiting for handover RACH */ + if (l1cs->ho_rach_detect) + return 0; + } + + /* How many frames elapsed since the last one? */ + elapsed_fs = TDMA_FN_SUB(fn, l1cs->last_tdma_fn); + if (elapsed_fs > l1ts->mf_period) { /* Too many! */ + LOGL1S(DL1P, LOGL_ERROR, l1t, tn, frame_head->ul_chan, fn, + "Too many (>%u) contiguous TDMA frames=%u elapsed " + "since the last processed fn=%u\n", l1ts->mf_period, + elapsed_fs, l1cs->last_tdma_fn); + /* FIXME: how should this affect the measurements? */ + return -EINVAL; + } + + /** + * There are several TDMA frames between the last processed + * frame and currently received one. Let's walk through this + * path and count potentially lost frames, i.e. for which + * we didn't receive the corresponsing UL bursts. + * + * Start counting from the last_fn + 1. + */ + for (i = 1; i < elapsed_fs; i++) { + fn_i = TDMA_FN_SUM(l1cs->last_tdma_fn, i); + offset = fn_i % l1ts->mf_period; + frame = l1ts->mf_frames + offset; + + if (frame->ul_chan == frame_head->ul_chan) + l1cs->lost_tdma_fs++; + } + + if (l1cs->lost_tdma_fs > 0) { + LOGL1S(DL1P, LOGL_NOTICE, l1t, tn, frame_head->ul_chan, fn, + "At least %u TDMA frames were lost since the last " + "processed fn=%u\n", l1cs->lost_tdma_fs, l1cs->last_tdma_fn); + + /** + * HACK: substitute lost bursts by zero-filled ones + * + * Instead of doing this, it makes sense to use the + * amount of lost frames in measurement calculations. + */ + static sbit_t zero_burst[GSM_BURST_LEN] = { 0 }; + trx_sched_ul_func *func; + + for (i = 1; i < elapsed_fs; i++) { + fn_i = TDMA_FN_SUM(l1cs->last_tdma_fn, i); + offset = fn_i % l1ts->mf_period; + frame = l1ts->mf_frames + offset; + func = trx_chan_desc[frame->ul_chan].ul_fn; + + if (frame->ul_chan != frame_head->ul_chan) + continue; + + LOGL1S(DL1P, LOGL_NOTICE, l1t, tn, frame->ul_chan, fn, + "Substituting lost TDMA frame=%u by all-zero " + "dummy burst\n", fn_i); + + func(l1t, tn, fn_i, frame->ul_chan, frame->ul_bid, + zero_burst, GSM_BURST_LEN, -128, 0); + + l1cs->lost_tdma_fs--; + } + } + + return 0; +} + /* process uplink burst */ -int trx_sched_ul_burst(struct l1sched_trx *l1t, uint8_t tn, uint32_t current_fn, +int trx_sched_ul_burst(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn, sbit_t *bits, uint16_t nbits, int8_t rssi, int16_t toa256) { struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn); @@ -863,82 +969,51 @@ uint8_t offset, period, bid; trx_sched_ul_func *func; enum trx_chan_type chan; - uint32_t fn, elapsed; if (!l1ts->mf_index) return -EINVAL; - /* calculate how many frames have been elapsed */ - elapsed = (current_fn + GSM_HYPERFRAME - l1ts->mf_last_fn) % GSM_HYPERFRAME; + /* get frame from multiframe */ + period = l1ts->mf_period; + offset = fn % period; + frame = l1ts->mf_frames + offset; - /* start counting from last fn + 1, but only if not too many fn have - * been elapsed */ - if (elapsed < 10) { - fn = (l1ts->mf_last_fn + 1) % GSM_HYPERFRAME; - } else { - LOGPFN(DL1P, LOGL_NOTICE, current_fn, - "Too many contiguous elapsed fn, dropping %u\n", elapsed); - fn = current_fn; - } + chan = frame->ul_chan; + bid = frame->ul_bid; + l1cs = &l1ts->chan_state[chan]; + func = trx_chan_desc[chan].ul_fn; - while (42) { - /* get frame from multiframe */ - period = l1ts->mf_period; - offset = fn % period; - frame = l1ts->mf_frames + offset; + /* check if channel is active */ + if (!trx_chan_desc[chan].auto_active && !l1cs->active) + return -EINVAL; - chan = frame->ul_chan; - bid = frame->ul_bid; - func = trx_chan_desc[chan].ul_fn; + /* omit bursts which have no handler, like IDLE bursts */ + if (!func) + return -EINVAL; - l1cs = &l1ts->chan_state[chan]; + /* calculate how many TDMA frames were potentially lost */ + trx_sched_calc_frame_loss(l1t, l1cs, tn, fn); - /* check if channel is active */ - if (!trx_chan_desc[chan].auto_active && !l1cs->active) - goto next_frame; + /* update TDMA frame counters */ + l1cs->last_tdma_fn = fn; + l1cs->proc_tdma_fs++; - /* omit bursts which have no handler, like IDLE bursts */ - if (!func) - goto next_frame; + /* decrypt */ + if (bits && l1cs->ul_encr_algo) { + ubit_t ks[114]; + int i; - /* put burst to function */ - if (fn == current_fn) { - /* decrypt */ - if (bits && l1cs->ul_encr_algo) { - ubit_t ks[114]; - int i; - - osmo_a5(l1cs->ul_encr_algo, - l1cs->ul_encr_key, - fn, NULL, ks); - for (i = 0; i < 57; i++) { - if (ks[i]) - bits[i + 3] = - bits[i + 3]; - if (ks[i + 57]) - bits[i + 88] = - bits[i + 88]; - } - } - - func(l1t, tn, fn, chan, bid, bits, nbits, rssi, toa256); - } else if (chan != TRXC_RACH && !l1cs->ho_rach_detect) { - sbit_t spare[GSM_BURST_LEN]; - memset(spare, 0, GSM_BURST_LEN); - /* We missed a couple of frame numbers (system overload?) and are now - * substituting some zero-filled bursts for those bursts we missed */ - LOGPFN(DL1P, LOGL_ERROR, fn, "Substituting all-zero burst (current_fn=%u, " - "elapsed=%u\n", current_fn, elapsed); - func(l1t, tn, fn, chan, bid, spare, GSM_BURST_LEN, -128, 0); + osmo_a5(l1cs->ul_encr_algo, l1cs->ul_encr_key, fn, NULL, ks); + for (i = 0; i < 57; i++) { + if (ks[i]) + bits[i + 3] = - bits[i + 3]; + if (ks[i + 57]) + bits[i + 88] = - bits[i + 88]; } - -next_frame: - /* reached current fn */ - if (fn == current_fn) - break; - - fn = (fn + 1) % GSM_HYPERFRAME; } - l1ts->mf_last_fn = fn; + /* put burst to function */ + func(l1t, tn, fn, chan, bid, bits, nbits, rssi, toa256); return 0; } -- To view, visit https://gerrit.osmocom.org/10309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I70d05b67a35ddcbdd1b6394dbd7198404a440e76 Gerrit-Change-Number: 10309 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 17:53:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 25 Oct 2018 17:53:46 +0000 Subject: Change in osmocom-bb[master]: mobile: cleanup app init In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11456 ) Change subject: mobile: cleanup app init ...................................................................... Patch Set 1: Code-Review+1 (3 comments) https://gerrit.osmocom.org/#/c/11456/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11456/1//COMMIT_MSG at 9 PS1, Line 9: remove redundant printf ok, fine. https://gerrit.osmocom.org/#/c/11456/1//COMMIT_MSG at 10 PS1, Line 10: use boolean where appropriate this is exactly the kind of "clean up" which I saw at times in the past and kept wondering: Which particular task/ticket/work-item does this address? Is that really worth our valuable and quite limited time and resources? https://gerrit.osmocom.org/#/c/11456/1/src/host/layer23/src/mobile/main.c File src/host/layer23/src/mobile/main.c: https://gerrit.osmocom.org/#/c/11456/1/src/host/layer23/src/mobile/main.c at 92 PS1, Line 92: replacing tabs with spaces? -- To view, visit https://gerrit.osmocom.org/11456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idc38feb03656bd9a52aa29095ff7423e0e6ad53b Gerrit-Change-Number: 11456 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 25 Oct 2018 17:53:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 17:54:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 25 Oct 2018 17:54:08 +0000 Subject: Change in osmocom-bb[master]: mobile: fix vty bind ip override In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11457 ) Change subject: mobile: fix vty bind ip override ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32517567847fd5c54b1742f18bf409ff81e316fa Gerrit-Change-Number: 11457 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 25 Oct 2018 17:54:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 17:57:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 25 Oct 2018 17:57:51 +0000 Subject: Change in libosmocore[master]: add osmo_sock_get_{local, remote}_ip{, _port}() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11455 ) Change subject: add osmo_sock_get_{local,remote}_ip{,_port}() ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/11455/1/include/osmocom/core/socket.h File include/osmocom/core/socket.h: https://gerrit.osmocom.org/#/c/11455/1/include/osmocom/core/socket.h at 59 PS1, Line 59: char *osmo_sock_get_name2(void *ctx, int fd, bool local, bool port); > I thought that was necessary to use it with the defines below. [?] just don't try to prematurely optimzie with #defines and make those defines below public functions/symbols. at that point you can have the osmo_sock_get_name2() function static and not declare it in the header here. https://gerrit.osmocom.org/#/c/11455/1/src/socket.c File src/socket.c: https://gerrit.osmocom.org/#/c/11455/1/src/socket.c at 712 PS1, Line 712: talloc_strdup(ctx, port ? portbuf : hostbuf) I thought the point was that you wanted to avoid returning a heap-allocated buffer with those new functions? -- To view, visit https://gerrit.osmocom.org/11455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 Gerrit-Change-Number: 11455 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Thu, 25 Oct 2018 17:57:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 17:58:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 25 Oct 2018 17:58:41 +0000 Subject: Change in osmo-msc[master]: Update VLR test helper In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11458 ) Change subject: Update VLR test helper ...................................................................... Patch Set 1: Code-Review+2 nice, but again one of those patches where I'm wondering "why spend time on this now?" -- To view, visit https://gerrit.osmocom.org/11458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf507d094319123c6667ba963db1d385df4d4f92 Gerrit-Change-Number: 11458 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 25 Oct 2018 17:58:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 18:00:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 25 Oct 2018 18:00:38 +0000 Subject: Change in osmo-msc[master]: Fix VLR test macro In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/6296 ) Change subject: Fix VLR test macro ...................................................................... Patch Set 7: are the tests ever likely going to have more than one "conn" they want to match on? If no, using a global varialbe is perfectly ok. To me, this seems to be another "let's change something for the purpose of changing something" kind of commits. You can find as many arguments against that change as you can find for it, I find it highly questionable to spend time on it, sorry. -- To view, visit https://gerrit.osmocom.org/6296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I36ae1f9bb395921dc2c5a39e35fbb8040ba47213 Gerrit-Change-Number: 6296 Gerrit-PatchSet: 7 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 25 Oct 2018 18:00:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 18:01:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 25 Oct 2018 18:01:22 +0000 Subject: Change in osmo-gsm-tester[master]: First round of clean-ups of imports and unused variables In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11067 ) Change subject: First round of clean-ups of imports and unused variables ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I02f1d89078dfdf37d53e2e20811bf36fb14ec3b0 Gerrit-Change-Number: 11067 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 25 Oct 2018 18:01:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 18:02:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 25 Oct 2018 18:02:40 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add docker_images_require() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11365 ) Change subject: jenkins-common.sh: add docker_images_require() ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0afdf3400282634fca9b31d57eaeedd6b5c28aa1 Gerrit-Change-Number: 11365 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 25 Oct 2018 18:02:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 18:03:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 25 Oct 2018 18:03:18 +0000 Subject: Change in docker-playground[master]: rename m3ua-test, sua-test to nplab-*-test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11368 ) Change subject: rename m3ua-test, sua-test to nplab-*-test ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de Gerrit-Change-Number: 11368 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Thu, 25 Oct 2018 18:03:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 18:04:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 25 Oct 2018 18:04:44 +0000 Subject: Change in docker-playground[master]: Remove top-level Makefile In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11369 ) Change subject: Remove top-level Makefile ...................................................................... Patch Set 7: I think this change in usage (shell script vs makefile) should be documented in a readme file. Add one in case there's none yet. -- To view, visit https://gerrit.osmocom.org/11369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff Gerrit-Change-Number: 11369 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Thu, 25 Oct 2018 18:04:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 18:05:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 25 Oct 2018 18:05:10 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: Log fake_trx output to file In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11431 ) Change subject: ttcn3-bts-test: Log fake_trx output to file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82a80b045e6f298e5254f42f51dbf8c84013f45c Gerrit-Change-Number: 11431 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 25 Oct 2018 18:05:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 18:05:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 25 Oct 2018 18:05:35 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: Log fake_trx output to file In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11431 ) Change subject: ttcn3-bts-test: Log fake_trx output to file ...................................................................... ttcn3-bts-test: Log fake_trx output to file Change-Id: I82a80b045e6f298e5254f42f51dbf8c84013f45c --- M ttcn3-bts-test/jenkins.sh 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 1cd06e7..fe448f5 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -17,6 +17,8 @@ mkdir $VOL_BASE_DIR/unix +mkdir $VOL_BASE_DIR/fake_trx + echo Starting container with BSC docker run --rm \ --network $NET_NAME --ip 172.18.9.11 \ @@ -37,9 +39,10 @@ echo Starting container with fake_trx docker run --rm \ --network $NET_NAME --ip 172.18.9.21 \ + -v $VOL_BASE_DIR/fake_trx:/data \ --name ${BUILD_TAG}-fake_trx -d \ $REPO_USER/osmocom-bb-host-master \ - /tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py -R 172.18.9.20 -r 172.18.9.22 + bash -c "/tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py -R 172.18.9.20 -r 172.18.9.22 >/data/fake_trx.log 2>&1" echo Starting container with trxcon docker run --rm \ -- To view, visit https://gerrit.osmocom.org/11431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I82a80b045e6f298e5254f42f51dbf8c84013f45c Gerrit-Change-Number: 11431 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 18:06:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 25 Oct 2018 18:06:40 +0000 Subject: Change in osmo-mgw[master]: check_rtp_origin(): Don't memcmp sockadd_in and in_addr In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11402 ) Change subject: check_rtp_origin(): Don't memcmp sockadd_in and in_addr ...................................................................... check_rtp_origin(): Don't memcmp sockadd_in and in_addr We were comparing 16 bytes (sockaddr_in) in memcmp() rather than using four bytes (struct in_addr in mgcp conn end). This is a good example why we should actually simply use the == (equals) operator rather than using memcmp which treats everything as void. Change-Id: Ic64256619ef893d625400e8b1b573ea2c629ed9c Fixes: Coverity CID#188874 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index d769ef3..fe63f1e 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -874,7 +874,7 @@ endp = conn->conn->endp; struct sockaddr_in zero_addr = {}; - if (memcmp(&zero_addr, &conn->end.addr, sizeof(zero_addr)) == 0) { + if (memcmp(&zero_addr.sin_addr, &conn->end.addr, sizeof(zero_addr.sin_addr)) == 0) { switch (conn->conn->mode) { case MGCP_CONN_LOOPBACK: /* HACK: for IuUP, we want to reply with an IuUP Initialization ACK upon the first RTP -- To view, visit https://gerrit.osmocom.org/11402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic64256619ef893d625400e8b1b573ea2c629ed9c Gerrit-Change-Number: 11402 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 25 18:06:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 25 Oct 2018 18:06:40 +0000 Subject: Change in osmo-mgw[master]: check_rtp_origin(): Avoid using memcmp for comparing integer types In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11403 ) Change subject: check_rtp_origin(): Avoid using memcmp for comparing integer types ...................................................................... check_rtp_origin(): Avoid using memcmp for comparing integer types in_addr consists only of s_addr, which is an integer type that can be compared directly. By avoiding memcmp() here we would have been able to catch Coverity CID#188874 even without Coverity, and make the code more compact... Change-Id: Ic6105d39ae2fb4b301f87448b16763fe9f695621 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index fe63f1e..de34cc6 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -872,9 +872,8 @@ { struct mgcp_endpoint *endp; endp = conn->conn->endp; - struct sockaddr_in zero_addr = {}; - if (memcmp(&zero_addr.sin_addr, &conn->end.addr, sizeof(zero_addr.sin_addr)) == 0) { + if (conn->end.addr.s_addr == 0) { switch (conn->conn->mode) { case MGCP_CONN_LOOPBACK: /* HACK: for IuUP, we want to reply with an IuUP Initialization ACK upon the first RTP @@ -904,8 +903,7 @@ /* Note: Check if the inbound RTP data comes from the same host to * which we send our outgoing RTP traffic. */ - if (memcmp(&addr->sin_addr, &conn->end.addr, sizeof(addr->sin_addr)) - != 0) { + if (conn->end.addr.s_addr != addr->sin_addr.s_addr) { LOGP(DRTP, LOGL_ERROR, "endpoint:0x%x data from wrong address: %s, ", ENDPOINT_NUMBER(endp), inet_ntoa(addr->sin_addr)); -- To view, visit https://gerrit.osmocom.org/11403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic6105d39ae2fb4b301f87448b16763fe9f695621 Gerrit-Change-Number: 11403 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 08:11:42 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Oct 2018 08:11:42 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add docker_images_require() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11365 ) Change subject: jenkins-common.sh: add docker_images_require() ...................................................................... Patch Set 4: Verified+1 -- To view, visit https://gerrit.osmocom.org/11365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0afdf3400282634fca9b31d57eaeedd6b5c28aa1 Gerrit-Change-Number: 11365 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 26 Oct 2018 08:11:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 08:11:44 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Oct 2018 08:11:44 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add docker_images_require() In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11365 ) Change subject: jenkins-common.sh: add docker_images_require() ...................................................................... jenkins-common.sh: add docker_images_require() This new function can be used on top of each *-test/jenkins.sh to automatically build the required Docker images before starting a testsuite. The top-level Makefile should also be able to build all Docker images on which a job depends. But in that Makefile the list of dependencies can not be specified dynamically, as it will be necessary for OS#3268: ttcn3-mgw-test may depend on osmo-mgw-latest or on osmo-mgw-master. This will be used by Idbb708ab16cb71bab5069127945b63388222369e. Related: OS#3268 Change-Id: I0afdf3400282634fca9b31d57eaeedd6b5c28aa1 --- M jenkins-common.sh 1 file changed, 19 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved osmith: Verified diff --git a/jenkins-common.sh b/jenkins-common.sh index 515479f..f3d6c61 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -1,3 +1,22 @@ +docker_image_exists() { + test -n "$(docker images -q "$REPO_USER/$1")" +} + +docker_images_require() { + for i in $@; do + # Trigger image build (cache will be used when up-to-date) + if [ -z "$NO_DOCKER_IMAGE_BUILD" ]; then + echo "Building image: $i (export NO_DOCKER_IMAGE_BUILD=1 to prevent this)" + make -C "../$i" + fi + + # Detect missing images (build skipped/failure) + if ! docker_image_exists "$i"; then + echo "ERROR: missing image: $i" + exit 1 + fi + done +} network_create() { NET=$1 -- To view, visit https://gerrit.osmocom.org/11365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0afdf3400282634fca9b31d57eaeedd6b5c28aa1 Gerrit-Change-Number: 11365 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 08:19:26 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Oct 2018 08:19:26 +0000 Subject: Change in docker-playground[master]: jenkins.sh: IMAGE_SUFFIX, docker_images_require() In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11366 to look at the new patch set (#6). Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require() ...................................................................... jenkins.sh: IMAGE_SUFFIX, docker_images_require() Default value "master" of the IMAGE_SUFFIX environment variable can be changed to "latest" to test the latest stable builds instead of the nightly ones. Use docker_images_require() to make sure that the required images are existing and up-to-date before running the tests. Related: OS#3268 Change-Id: Idbb708ab16cb71bab5069127945b63388222369e --- M m3ua-test/jenkins.sh M sua-test/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh 11 files changed, 97 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/66/11366/6 -- To view, visit https://gerrit.osmocom.org/11366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e Gerrit-Change-Number: 11366 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 08:50:19 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 26 Oct 2018 08:50:19 +0000 Subject: Change in osmocom-bb[master]: mobile: fix vty bind ip override In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11457 ) Change subject: mobile: fix vty bind ip override ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11457/1/src/host/layer23/src/mobile/main.c File src/host/layer23/src/mobile/main.c: https://gerrit.osmocom.org/#/c/11457/1/src/host/layer23/src/mobile/main.c at 254 PS1, Line 254: use_custom_vty_ip You could just check 'vty_ip' against NULL. There is no need to introduce additional 'use_custom_vty_ip'... -- To view, visit https://gerrit.osmocom.org/11457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32517567847fd5c54b1742f18bf409ff81e316fa Gerrit-Change-Number: 11457 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 26 Oct 2018 08:50:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 10:16:57 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Oct 2018 10:16:57 +0000 Subject: Change in docker-playground[master]: Remove top-level Makefile, explain why in README In-Reply-To: References: Message-ID: Hello Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11369 to look at the new patch set (#9). Change subject: Remove top-level Makefile, explain why in README ...................................................................... Remove top-level Makefile, explain why in README Obsoleted by docker_images_require(). The top-level Makefile had the following drawbacks: * it was not maintained: many targets were missing, and some of the existing ones did not build anymore * make targets have the same names as the folders, so if they are not listed in the Makefile, it will assume that the target has been built already (prone to making mistakes) Extend README.md to describe how to run tests, container caching, how container dependencies are resolved now and the reasoning for doing it that way instead of using a top-level Makefile. Related: OS#3268 Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff --- D Makefile M README.md 2 files changed, 69 insertions(+), 84 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/69/11369/9 -- To view, visit https://gerrit.osmocom.org/11369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff Gerrit-Change-Number: 11369 Gerrit-PatchSet: 9 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 10:18:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 10:18:51 +0000 Subject: Change in osmo-gsm-tester[master]: First round of clean-ups of imports and unused variables In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11067 ) Change subject: First round of clean-ups of imports and unused variables ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I02f1d89078dfdf37d53e2e20811bf36fb14ec3b0 Gerrit-Change-Number: 11067 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 26 Oct 2018 10:18:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 10:18:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 10:18:52 +0000 Subject: Change in osmo-gsm-tester[master]: First round of clean-ups of imports and unused variables In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11067 ) Change subject: First round of clean-ups of imports and unused variables ...................................................................... First round of clean-ups of imports and unused variables Run pyflakes src/osmo_gsm_tester and then address the first round of problems. Change-Id: I02f1d89078dfdf37d53e2e20811bf36fb14ec3b0 --- M src/osmo_gsm_tester/bts.py M src/osmo_gsm_tester/bts_nanobts.py M src/osmo_gsm_tester/bts_octphy.py M src/osmo_gsm_tester/bts_osmo.py M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/esme.py M src/osmo_gsm_tester/modem.py M src/osmo_gsm_tester/pcu_osmo.py M src/osmo_gsm_tester/report.py M src/osmo_gsm_tester/smsc.py M src/osmo_gsm_tester/suite.py 11 files changed, 11 insertions(+), 25 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py index f05a1ba..6b0331e 100644 --- a/src/osmo_gsm_tester/bts.py +++ b/src/osmo_gsm_tester/bts.py @@ -17,12 +17,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import os -import pprint -import tempfile import copy from abc import ABCMeta, abstractmethod -from . import log, config, util, template, process, schema, pcu_osmo +from . import log, config, schema class Bts(log.Origin, metaclass=ABCMeta): diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py index a18f205..bec2433 100644 --- a/src/osmo_gsm_tester/bts_nanobts.py +++ b/src/osmo_gsm_tester/bts_nanobts.py @@ -18,11 +18,8 @@ # along with this program. If not, see . import os -import pprint -import tempfile import re -from abc import ABCMeta, abstractmethod -from . import log, config, util, template, process, pcap_recorder, bts, pcu +from . import log, config, util, process, pcap_recorder, bts, pcu from . import powersupply from .event_loop import MainLoop diff --git a/src/osmo_gsm_tester/bts_octphy.py b/src/osmo_gsm_tester/bts_octphy.py index f1a0ce8..a1dd494 100644 --- a/src/osmo_gsm_tester/bts_octphy.py +++ b/src/osmo_gsm_tester/bts_octphy.py @@ -19,8 +19,7 @@ import os import pprint -import tempfile -from . import log, config, util, template, process, pcu_osmo, bts_osmo +from . import log, config, util, template, process, bts_osmo class OsmoBtsOctphy(bts_osmo.OsmoBtsMainUnit): diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py index 89572ec..9105c28 100644 --- a/src/osmo_gsm_tester/bts_osmo.py +++ b/src/osmo_gsm_tester/bts_osmo.py @@ -18,10 +18,9 @@ # along with this program. If not, see . import os -import pprint import tempfile from abc import ABCMeta, abstractmethod -from . import log, config, util, template, process, bts, pcu_osmo +from . import log, bts, pcu_osmo class OsmoBts(bts.Bts, metaclass=ABCMeta): diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 92b726c..86afeec 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -20,9 +20,8 @@ import os import stat import pprint -import tempfile from abc import ABCMeta, abstractmethod -from . import log, config, util, template, process, pcu_osmo, bts_osmo +from . import log, config, util, template, process, bts_osmo from .event_loop import MainLoop class OsmoBtsTrx(bts_osmo.OsmoBtsMainUnit): diff --git a/src/osmo_gsm_tester/esme.py b/src/osmo_gsm_tester/esme.py index 9653fbf..de3ac16 100644 --- a/src/osmo_gsm_tester/esme.py +++ b/src/osmo_gsm_tester/esme.py @@ -23,7 +23,7 @@ import smpplib.consts import smpplib.exceptions -from . import log, util, sms +from . import log from .event_loop import MainLoop # if you want to know what's happening inside python-smpplib diff --git a/src/osmo_gsm_tester/modem.py b/src/osmo_gsm_tester/modem.py index d0bbf23..21b208c 100644 --- a/src/osmo_gsm_tester/modem.py +++ b/src/osmo_gsm_tester/modem.py @@ -21,9 +21,6 @@ from .event_loop import MainLoop from pydbus import SystemBus, Variant -import time -import pprint -import sys # Required for Gio.Cancellable. # See https://lazka.github.io/pgi-docs/Gio-2.0/classes/Cancellable.html#Gio.Cancellable diff --git a/src/osmo_gsm_tester/pcu_osmo.py b/src/osmo_gsm_tester/pcu_osmo.py index ad8ebce..767264c 100644 --- a/src/osmo_gsm_tester/pcu_osmo.py +++ b/src/osmo_gsm_tester/pcu_osmo.py @@ -19,8 +19,7 @@ import os import pprint -import tempfile -from . import log, config, util, template, process, pcu +from . import config, util, template, process, pcu class OsmoPcu(pcu.Pcu): diff --git a/src/osmo_gsm_tester/report.py b/src/osmo_gsm_tester/report.py index a53504b..224cc46 100644 --- a/src/osmo_gsm_tester/report.py +++ b/src/osmo_gsm_tester/report.py @@ -17,11 +17,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import os import math from datetime import datetime import xml.etree.ElementTree as et -from . import log, suite, test +from . import test def trial_to_junit_write(trial, junit_path): elements = et.ElementTree(element=trial_to_junit(trial)) @@ -53,7 +52,7 @@ testcase.set('name', t.name()) testcase.set('time', str(math.ceil(t.duration))) if t.status == test.Test.SKIP: - skip = et.SubElement(testcase, 'skipped') + et.SubElement(testcase, 'skipped') elif t.status == test.Test.FAIL: failure = et.SubElement(testcase, 'failure') failure.set('type', t.fail_type or 'failure') diff --git a/src/osmo_gsm_tester/smsc.py b/src/osmo_gsm_tester/smsc.py index 1a0859c..d154801 100644 --- a/src/osmo_gsm_tester/smsc.py +++ b/src/osmo_gsm_tester/smsc.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from . import log, config, util, template, process +from . import log, config class Smsc: diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index 3a49574..932a6ab 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -21,7 +21,7 @@ import sys import time import pprint -from . import config, log, template, util, resource, schema, test +from . import config, log, util, resource, test from .event_loop import MainLoop from . import osmo_nitb, osmo_hlr, osmo_mgcpgw, osmo_mgw, osmo_msc, osmo_bsc, osmo_stp, osmo_ggsn, osmo_sgsn, modem, esme, osmocon -- To view, visit https://gerrit.osmocom.org/11067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I02f1d89078dfdf37d53e2e20811bf36fb14ec3b0 Gerrit-Change-Number: 11067 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 10:19:13 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Oct 2018 10:19:13 +0000 Subject: Change in docker-playground[master]: Remove top-level Makefile, explain why in README In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11369 ) Change subject: Remove top-level Makefile, explain why in README ...................................................................... Patch Set 9: > I think this change in usage (shell script vs makefile) should be documented in a readme file. Add one in case there's none yet. Done. -- To view, visit https://gerrit.osmocom.org/11369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff Gerrit-Change-Number: 11369 Gerrit-PatchSet: 9 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Fri, 26 Oct 2018 10:19:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 10:24:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 10:24:57 +0000 Subject: Change in osmo-gsm-tester[master]: process: Make sure sync process is terminated if ogt is stopped In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11459 ) Change subject: process: Make sure sync process is terminated if ogt is stopped ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iecdac96ea576a312be2a6c6b6799e249074687ef Gerrit-Change-Number: 11459 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 26 Oct 2018 10:24:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 10:24:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 10:24:59 +0000 Subject: Change in osmo-gsm-tester[master]: process: Make sure sync process is terminated if ogt is stopped In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11459 ) Change subject: process: Make sure sync process is terminated if ogt is stopped ...................................................................... process: Make sure sync process is terminated if ogt is stopped Change-Id: Iecdac96ea576a312be2a6c6b6799e249074687ef --- M src/osmo_gsm_tester/process.py 1 file changed, 13 insertions(+), 12 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py index 534cdba..fb5c6f6 100644 --- a/src/osmo_gsm_tester/process.py +++ b/src/osmo_gsm_tester/process.py @@ -236,25 +236,26 @@ ' '.join(self.popen_args))] self.dbg(self.popen_args, dir=self.run_dir, conf=self.popen_kwargs) +def run_proc_sync(proc): + try: + proc.launch() + proc.wait() + except Exception as e: + proc.terminate() + raise e + if proc.result != 0: + log.ctx(proc) + raise log.Error('Exited in error') def run_local_sync(run_dir, name, popen_args): run_dir =run_dir.new_dir(name) proc = Process(name, run_dir, popen_args) - proc.launch() - proc.wait() - if proc.result != 0: - log.ctx(proc) - raise log.Error('Exited in error') + run_proc_sync(proc) def run_remote_sync(run_dir, remote_user, remote_addr, name, popen_args, remote_cwd=None): run_dir = run_dir.new_dir(name) - proc = RemoteProcess(name, run_dir, remote_user, remote_addr, remote_cwd, - popen_args) - proc.launch() - proc.wait() - if proc.result != 0: - log.ctx(proc) - raise log.Error('Exited in error') + proc = RemoteProcess(name, run_dir, remote_user, remote_addr, remote_cwd, popen_args) + run_proc_sync(proc) def scp(run_dir, remote_user, remote_addr, name, local_path, remote_path): run_local_sync(run_dir, name, ('scp', '-r', local_path, '%s@%s:%s' % (remote_user, remote_addr, remote_path))) -- To view, visit https://gerrit.osmocom.org/11459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iecdac96ea576a312be2a6c6b6799e249074687ef Gerrit-Change-Number: 11459 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 10:34:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 10:34:52 +0000 Subject: Change in docker-playground[master]: Remove top-level Makefile, explain why in README In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11369 ) Change subject: Remove top-level Makefile, explain why in README ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff Gerrit-Change-Number: 11369 Gerrit-PatchSet: 9 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Fri, 26 Oct 2018 10:34:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 10:34:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 10:34:54 +0000 Subject: Change in docker-playground[master]: Remove top-level Makefile, explain why in README In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11369 ) Change subject: Remove top-level Makefile, explain why in README ...................................................................... Patch Set 9: Verified+1 -- To view, visit https://gerrit.osmocom.org/11369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff Gerrit-Change-Number: 11369 Gerrit-PatchSet: 9 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Fri, 26 Oct 2018 10:34:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 10:35:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 10:35:07 +0000 Subject: Change in docker-playground[master]: rename m3ua-test, sua-test to nplab-*-test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11368 ) Change subject: rename m3ua-test, sua-test to nplab-*-test ...................................................................... Patch Set 8: Verified+1 -- To view, visit https://gerrit.osmocom.org/11368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de Gerrit-Change-Number: 11368 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Fri, 26 Oct 2018 10:35:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 10:35:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 10:35:10 +0000 Subject: Change in docker-playground[master]: symlinks: ttcn3-bsc-test-sccplite In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11367 ) Change subject: symlinks: ttcn3-bsc-test-sccplite ...................................................................... Patch Set 6: Verified+1 -- To view, visit https://gerrit.osmocom.org/11367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1d1d277475090cd615a0e2d07a42b2032cdefb9c Gerrit-Change-Number: 11367 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 26 Oct 2018 10:35:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 10:35:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 10:35:42 +0000 Subject: Change in docker-playground[master]: jenkins.sh: IMAGE_SUFFIX, docker_images_require() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11366 ) Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require() ...................................................................... Patch Set 6: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e Gerrit-Change-Number: 11366 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 26 Oct 2018 10:35:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 10:35:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 10:35:46 +0000 Subject: Change in docker-playground[master]: jenkins.sh: IMAGE_SUFFIX, docker_images_require() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11366 ) Change subject: jenkins.sh: IMAGE_SUFFIX, docker_images_require() ...................................................................... jenkins.sh: IMAGE_SUFFIX, docker_images_require() Default value "master" of the IMAGE_SUFFIX environment variable can be changed to "latest" to test the latest stable builds instead of the nightly ones. Use docker_images_require() to make sure that the required images are existing and up-to-date before running the tests. Related: OS#3268 Change-Id: Idbb708ab16cb71bab5069127945b63388222369e --- M m3ua-test/jenkins.sh M sua-test/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh 11 files changed, 97 insertions(+), 18 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/m3ua-test/jenkins.sh b/m3ua-test/jenkins.sh index 61f7c05..e69e827 100755 --- a/m3ua-test/jenkins.sh +++ b/m3ua-test/jenkins.sh @@ -1,6 +1,12 @@ #!/bin/sh . ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "debian-jessie-build" \ + "osmo-stp-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "m3ua-test" mkdir $VOL_BASE_DIR/m3ua-tester cp m3ua-param-testtool.scm all-sgp-tests.txt $VOL_BASE_DIR/m3ua-tester/ @@ -16,7 +22,7 @@ --network $NET_NAME --ip 172.18.7.200 \ -v $VOL_BASE_DIR/stp:/data \ --name ${BUILD_TAG}-stp \ - -d $REPO_USER/osmo-stp-master + -d $REPO_USER/osmo-stp-$IMAGE_SUFFIX # start docker container with tests docker run --rm \ diff --git a/sua-test/jenkins.sh b/sua-test/jenkins.sh index 0f87b4e..5e8d4cb 100755 --- a/sua-test/jenkins.sh +++ b/sua-test/jenkins.sh @@ -1,6 +1,13 @@ #!/bin/sh . ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "debian-jessie-build" \ + "osmo-stp-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "sigtran-tests" \ + "sua-test" mkdir $VOL_BASE_DIR/sua-tester cp sua-param-testtool-sgp.scm some-sua-sgp-tests.txt $VOL_BASE_DIR/sua-tester/ @@ -16,7 +23,7 @@ --network $NET_NAME --ip 172.18.6.200 \ -v $VOL_BASE_DIR/stp:/data \ --name ${BUILD_TAG}-stp \ - -d $REPO_USER/osmo-stp-master + -d $REPO_USER/osmo-stp-$IMAGE_SUFFIX # start docker container with tests docker run --rm \ diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index bceb0ec..0a6ecf3 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -1,6 +1,13 @@ #!/bin/sh . ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "debian-jessie-build" \ + "osmo-bsc-$IMAGE_SUFFIX" \ + "osmo-bts-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "ttcn3-bsc-test" #Make sure NET_NAME doesn't clash with the AoIP BSC test NET_NAME=ttcn3-bsc_sccplite-test @@ -18,14 +25,17 @@ --network $NET_NAME --ip 172.18.12.20 \ -v $VOL_BASE_DIR/bsc:/data \ --name ${BUILD_TAG}-bsc -d \ - $REPO_USER/osmo-bsc-master + $REPO_USER/osmo-bsc-$IMAGE_SUFFIX for i in `seq 0 2`; do echo Starting container with OML for BTS$i docker run --rm \ --network $NET_NAME --ip 172.18.12.10$i \ --name ${BUILD_TAG}-bts$i -d \ - $REPO_USER/osmo-bts-master /usr/local/bin/respawn.sh osmo-bts-omldummy 172.18.12.20 $((i + 1234)) 1 + $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ + /usr/local/bin/respawn.sh \ + osmo-bts-omldummy \ + 172.18.12.20 $((i + 1234)) 1 done echo Starting container with BSC testsuite diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 7536396..ec8c23e 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -1,6 +1,14 @@ #!/bin/sh . ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "debian-jessie-build" \ + "osmo-stp-$IMAGE_SUFFIX" \ + "osmo-bsc-$IMAGE_SUFFIX" \ + "osmo-bts-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "ttcn3-bsc-test" mkdir $VOL_BASE_DIR/bsc-tester cp BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ @@ -18,21 +26,23 @@ --network $NET_NAME --ip 172.18.2.200 \ -v $VOL_BASE_DIR/stp:/data \ --name ${BUILD_TAG}-stp -d \ - $REPO_USER/osmo-stp-master + $REPO_USER/osmo-stp-$IMAGE_SUFFIX echo Starting container with BSC docker run --rm \ --network $NET_NAME --ip 172.18.2.20 \ -v $VOL_BASE_DIR/bsc:/data \ --name ${BUILD_TAG}-bsc -d \ - $REPO_USER/osmo-bsc-master + $REPO_USER/osmo-bsc-$IMAGE_SUFFIX for i in `seq 0 2`; do echo Starting container with OML for BTS$i docker run --rm \ --network $NET_NAME --ip 172.18.2.10$i \ --name ${BUILD_TAG}-bts$i -d \ - $REPO_USER/osmo-bts-master /usr/local/bin/respawn.sh osmo-bts-omldummy 172.18.2.20 $((i + 1234)) 1 + $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ + /usr/local/bin/respawn.sh \ + osmo-bts-omldummy 172.18.2.20 $((i + 1234)) 1 done echo Starting container with BSC testsuite diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index fe448f5..e527cd7 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -1,6 +1,15 @@ #!/bin/sh . ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +# NOTE: there is no osmocom-bb-host-latest, hence always use master! +docker_images_require \ + "debian-jessie-build" \ + "osmo-bsc-$IMAGE_SUFFIX" \ + "osmo-bts-$IMAGE_SUFFIX" \ + "osmocom-bb-host-master" \ + "debian-stretch-titan" \ + "ttcn3-bts-test" network_create 172.18.9.0/24 @@ -24,7 +33,7 @@ --network $NET_NAME --ip 172.18.9.11 \ -v $VOL_BASE_DIR/bsc:/data \ --name ${BUILD_TAG}-bsc -d \ - $REPO_USER/osmo-bsc-master \ + $REPO_USER/osmo-bsc-$IMAGE_SUFFIX \ /usr/local/bin/osmo-bsc -c /data/osmo-bsc.cfg echo Starting container with BTS @@ -33,7 +42,7 @@ -v $VOL_BASE_DIR/bts:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-bts -d \ - $REPO_USER/osmo-bts-master \ + $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ /usr/local/bin/respawn.sh /usr/local/bin/osmo-bts-trx -c /data/osmo-bts.cfg -i 172.18.9.10 echo Starting container with fake_trx @@ -41,7 +50,7 @@ --network $NET_NAME --ip 172.18.9.21 \ -v $VOL_BASE_DIR/fake_trx:/data \ --name ${BUILD_TAG}-fake_trx -d \ - $REPO_USER/osmocom-bb-host-master \ + $REPO_USER/osmocom-bb-host-$IMAGE_SUFFIX \ bash -c "/tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py -R 172.18.9.20 -r 172.18.9.22 >/data/fake_trx.log 2>&1" echo Starting container with trxcon @@ -49,7 +58,7 @@ --network $NET_NAME --ip 172.18.9.22 \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-trxcon -d \ - $REPO_USER/osmocom-bb-host-master \ + $REPO_USER/osmocom-bb-host-$IMAGE_SUFFIX \ /usr/local/bin/trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2 diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 2da6aed..40f3227 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -1,6 +1,12 @@ #!/bin/sh . ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "debian-jessie-build" \ + "osmo-ggsn-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "ttcn3-ggsn-test" mkdir $VOL_BASE_DIR/ggsn-tester cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ @@ -18,7 +24,7 @@ --network $NET_NAME --ip 172.18.3.201 \ -v $VOL_BASE_DIR/ggsn:/data \ --name ${BUILD_TAG}-ggsn -d \ - $REPO_USER/osmo-ggsn-master + $REPO_USER/osmo-ggsn-$IMAGE_SUFFIX # start docker container with testsuite in foreground docker run --rm \ diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index 5d208df..89669eb 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -1,6 +1,12 @@ #!/bin/sh . ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "debian-jessie-build" \ + "osmo-hlr-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "ttcn3-hlr-test" network_create 172.18.10.0/24 @@ -15,7 +21,7 @@ --network $NET_NAME --ip 172.18.10.20 \ -v $VOL_BASE_DIR/hlr:/data \ --name ${BUILD_TAG}-hlr -d \ - $REPO_USER/osmo-hlr-master \ + $REPO_USER/osmo-hlr-$IMAGE_SUFFIX \ /usr/local/bin/osmo-hlr echo Starting container with HLR testsuite diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index ee624b9..4f836b7 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -1,6 +1,12 @@ #!/bin/sh . ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "debian-jessie-build" \ + "osmo-mgw-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "ttcn3-mgw-test" mkdir $VOL_BASE_DIR/mgw-tester cp MGCP_Test.cfg $VOL_BASE_DIR/mgw-tester/ @@ -15,7 +21,7 @@ --network $NET_NAME --ip 172.18.4.180 \ -v $VOL_BASE_DIR/mgw:/data \ --name ${BUILD_TAG}-mgw -d \ - $REPO_USER/osmo-mgw-master + $REPO_USER/osmo-mgw-$IMAGE_SUFFIX # start docker container with testsuite in foreground docker run --rm \ diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index 560eea7..662c377 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -1,6 +1,13 @@ #!/bin/sh . ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "debian-jessie-build" \ + "osmo-stp-$IMAGE_SUFFIX" \ + "osmo-msc-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "ttcn3-msc-test" network_create 172.18.1.0/24 @@ -22,7 +29,7 @@ --network $NET_NAME --ip 172.18.1.200 \ -v $VOL_BASE_DIR/stp:/data \ --name ${BUILD_TAG}-stp -d \ - $REPO_USER/osmo-stp-master + $REPO_USER/osmo-stp-$IMAGE_SUFFIX echo Starting container with MSC docker run --rm \ @@ -30,7 +37,7 @@ -v $VOL_BASE_DIR/msc:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-msc -d \ - $REPO_USER/osmo-msc-master \ + $REPO_USER/osmo-msc-$IMAGE_SUFFIX \ /usr/local/bin/osmo-msc -M /data/unix/mncc echo Starting container with MSC testsuite diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index f1481b1..9243e2b 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -1,6 +1,12 @@ #!/bin/sh . ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "debian-jessie-build" \ + "osmo-sgsn-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "ttcn3-sgsn-test" network_create 172.18.8.0/24 @@ -17,7 +23,7 @@ --network $NET_NAME --ip 172.18.8.10 \ -v $VOL_BASE_DIR/sgsn:/data \ --name ${BUILD_TAG}-sgsn -d \ - $REPO_USER/osmo-sgsn-master \ + $REPO_USER/osmo-sgsn-$IMAGE_SUFFIX \ /usr/local/bin/osmo-sgsn echo Starting container with SGSN testsuite diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index 37a8e95..2dfd281 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -1,6 +1,12 @@ #!/bin/sh . ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "debian-jessie-build" \ + "osmo-sip-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "ttcn3-sip-test" network_create 172.18.11.0/24 @@ -20,7 +26,7 @@ -v $VOL_BASE_DIR/sip:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-sip-connector -d \ - $REPO_USER/osmo-sip-master \ + $REPO_USER/osmo-sip-$IMAGE_SUFFIX \ /usr/local/bin/osmo-sip-connector -M /data/unix/mncc echo Starting container with SIP testsuite -- To view, visit https://gerrit.osmocom.org/11366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idbb708ab16cb71bab5069127945b63388222369e Gerrit-Change-Number: 11366 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 10:35:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 10:35:46 +0000 Subject: Change in docker-playground[master]: symlinks: ttcn3-bsc-test-sccplite In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11367 ) Change subject: symlinks: ttcn3-bsc-test-sccplite ...................................................................... symlinks: ttcn3-bsc-test-sccplite Create the ttcn3-bsc-test-sccplite folder, with symlinks to ttcn3-bsc-test/jenkins-sccplite.sh and ttcn3-bsc-test/sccplite. This allows writing the jenkins job builder config files in a generic way. Related: OS#3268 Change-Id: I1d1d277475090cd615a0e2d07a42b2032cdefb9c --- A ttcn3-bsc-test-sccplite/jenkins.sh A ttcn3-bsc-test-sccplite/sccplite 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/ttcn3-bsc-test-sccplite/jenkins.sh b/ttcn3-bsc-test-sccplite/jenkins.sh new file mode 120000 index 0000000..9a6da0f --- /dev/null +++ b/ttcn3-bsc-test-sccplite/jenkins.sh @@ -0,0 +1 @@ +../ttcn3-bsc-test/jenkins-sccplite.sh \ No newline at end of file diff --git a/ttcn3-bsc-test-sccplite/sccplite b/ttcn3-bsc-test-sccplite/sccplite new file mode 120000 index 0000000..9a5b492 --- /dev/null +++ b/ttcn3-bsc-test-sccplite/sccplite @@ -0,0 +1 @@ +../ttcn3-bsc-test/sccplite \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/11367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1d1d277475090cd615a0e2d07a42b2032cdefb9c Gerrit-Change-Number: 11367 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 10:35:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 10:35:47 +0000 Subject: Change in docker-playground[master]: rename m3ua-test, sua-test to nplab-*-test In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11368 ) Change subject: rename m3ua-test, sua-test to nplab-*-test ...................................................................... rename m3ua-test, sua-test to nplab-*-test Allows writing a generic Jenkins Job Builder config by renaming the container folders to match the job names. This needs changes in the Jenkins jobs, as done in Ie433925ee81a61c5788b4a6f2bc5b89c2689d251. Related: OS#3268 Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de --- R nplab-m3ua-test/.release R nplab-m3ua-test/Dockerfile R nplab-m3ua-test/Makefile R nplab-m3ua-test/all-sgp-tests.txt R nplab-m3ua-test/dotguile R nplab-m3ua-test/jenkins.sh R nplab-m3ua-test/m3ua-param-testtool.scm R nplab-m3ua-test/osmo-stp.cfg R nplab-sua-test/.release R nplab-sua-test/Dockerfile R nplab-sua-test/Makefile R nplab-sua-test/dotguile R nplab-sua-test/jenkins.sh R nplab-sua-test/osmo-stp.cfg R nplab-sua-test/some-sua-sgp-tests.txt R nplab-sua-test/sua-param-testtool-sgp.scm 16 files changed, 4 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/m3ua-test/.release b/nplab-m3ua-test/.release similarity index 100% rename from m3ua-test/.release rename to nplab-m3ua-test/.release diff --git a/m3ua-test/Dockerfile b/nplab-m3ua-test/Dockerfile similarity index 100% rename from m3ua-test/Dockerfile rename to nplab-m3ua-test/Dockerfile diff --git a/m3ua-test/Makefile b/nplab-m3ua-test/Makefile similarity index 100% rename from m3ua-test/Makefile rename to nplab-m3ua-test/Makefile diff --git a/m3ua-test/all-sgp-tests.txt b/nplab-m3ua-test/all-sgp-tests.txt similarity index 100% rename from m3ua-test/all-sgp-tests.txt rename to nplab-m3ua-test/all-sgp-tests.txt diff --git a/m3ua-test/dotguile b/nplab-m3ua-test/dotguile similarity index 100% rename from m3ua-test/dotguile rename to nplab-m3ua-test/dotguile diff --git a/m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh similarity index 90% rename from m3ua-test/jenkins.sh rename to nplab-m3ua-test/jenkins.sh index e69e827..800c5b2 100755 --- a/m3ua-test/jenkins.sh +++ b/nplab-m3ua-test/jenkins.sh @@ -6,7 +6,7 @@ "debian-jessie-build" \ "osmo-stp-$IMAGE_SUFFIX" \ "debian-stretch-titan" \ - "m3ua-test" + "nplab-m3ua-test" mkdir $VOL_BASE_DIR/m3ua-tester cp m3ua-param-testtool.scm all-sgp-tests.txt $VOL_BASE_DIR/m3ua-tester/ @@ -29,7 +29,7 @@ --network $NET_NAME --ip 172.18.7.2 \ -v $VOL_BASE_DIR/m3ua-tester:/data \ --name ${BUILD_TAG}-m3ua-test \ - $REPO_USER/m3ua-test > $WORKSPACE/logs/junit-xml-m3ua.log + $REPO_USER/nplab-m3ua-test > $WORKSPACE/logs/junit-xml-m3ua.log docker container stop -t 1 ${BUILD_TAG}-stp diff --git a/m3ua-test/m3ua-param-testtool.scm b/nplab-m3ua-test/m3ua-param-testtool.scm similarity index 100% rename from m3ua-test/m3ua-param-testtool.scm rename to nplab-m3ua-test/m3ua-param-testtool.scm diff --git a/m3ua-test/osmo-stp.cfg b/nplab-m3ua-test/osmo-stp.cfg similarity index 100% rename from m3ua-test/osmo-stp.cfg rename to nplab-m3ua-test/osmo-stp.cfg diff --git a/sua-test/.release b/nplab-sua-test/.release similarity index 100% rename from sua-test/.release rename to nplab-sua-test/.release diff --git a/sua-test/Dockerfile b/nplab-sua-test/Dockerfile similarity index 100% rename from sua-test/Dockerfile rename to nplab-sua-test/Dockerfile diff --git a/sua-test/Makefile b/nplab-sua-test/Makefile similarity index 100% rename from sua-test/Makefile rename to nplab-sua-test/Makefile diff --git a/sua-test/dotguile b/nplab-sua-test/dotguile similarity index 100% rename from sua-test/dotguile rename to nplab-sua-test/dotguile diff --git a/sua-test/jenkins.sh b/nplab-sua-test/jenkins.sh similarity index 91% rename from sua-test/jenkins.sh rename to nplab-sua-test/jenkins.sh index 5e8d4cb..fea5cf0 100755 --- a/sua-test/jenkins.sh +++ b/nplab-sua-test/jenkins.sh @@ -7,7 +7,7 @@ "osmo-stp-$IMAGE_SUFFIX" \ "debian-stretch-titan" \ "sigtran-tests" \ - "sua-test" + "nplab-sua-test" mkdir $VOL_BASE_DIR/sua-tester cp sua-param-testtool-sgp.scm some-sua-sgp-tests.txt $VOL_BASE_DIR/sua-tester/ @@ -30,7 +30,7 @@ --network $NET_NAME --ip 172.18.6.3 \ -v $VOL_BASE_DIR/sua-tester:/data \ --name ${BUILD_TAG}-sua-test \ - $REPO_USER/sua-test > $VOL_BASE_DIR/junit-xml-sua.log + $REPO_USER/nplab-sua-test > $VOL_BASE_DIR/junit-xml-sua.log docker container stop -t 1 ${BUILD_TAG}-stp diff --git a/sua-test/osmo-stp.cfg b/nplab-sua-test/osmo-stp.cfg similarity index 100% rename from sua-test/osmo-stp.cfg rename to nplab-sua-test/osmo-stp.cfg diff --git a/sua-test/some-sua-sgp-tests.txt b/nplab-sua-test/some-sua-sgp-tests.txt similarity index 100% rename from sua-test/some-sua-sgp-tests.txt rename to nplab-sua-test/some-sua-sgp-tests.txt diff --git a/sua-test/sua-param-testtool-sgp.scm b/nplab-sua-test/sua-param-testtool-sgp.scm similarity index 100% rename from sua-test/sua-param-testtool-sgp.scm rename to nplab-sua-test/sua-param-testtool-sgp.scm -- To view, visit https://gerrit.osmocom.org/11368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de Gerrit-Change-Number: 11368 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 10:35:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 10:35:47 +0000 Subject: Change in docker-playground[master]: Remove top-level Makefile, explain why in README In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11369 ) Change subject: Remove top-level Makefile, explain why in README ...................................................................... Remove top-level Makefile, explain why in README Obsoleted by docker_images_require(). The top-level Makefile had the following drawbacks: * it was not maintained: many targets were missing, and some of the existing ones did not build anymore * make targets have the same names as the folders, so if they are not listed in the Makefile, it will assume that the target has been built already (prone to making mistakes) Extend README.md to describe how to run tests, container caching, how container dependencies are resolved now and the reasoning for doing it that way instead of using a top-level Makefile. Related: OS#3268 Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff --- D Makefile M README.md 2 files changed, 69 insertions(+), 84 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/Makefile b/Makefile deleted file mode 100644 index e224274..0000000 --- a/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -.PHONY: build -build: debian-jessie-build osmo-ggsn-master osmo-stp-master sctp-test sigtran-tests m3ua-test sua-test debian-stretch-titan ttcn3-ggsn-test - -.PHONY: debian-jessie-build -debian-jessie-build: - $(MAKE) -C debian-jessie-build - -.PHONY: debian-stretch-titan -debian-stretch-titan: - $(MAKE) -C debian-stretch-titan - -.PHONY: osmo-bsc-master -osmo-bsc-master: debian-jessie-build - $(MAKE) -C osmo-bsc-master - -.PHONY: osmo-bts-master -osmo-bts-master: debian-jessie-build - $(MAKE) -C osmo-bts-master - -.PHONY: osmo-msc-master -osmo-msc-master: debian-jessie-build - $(MAKE) -C osmo-msc-master - -.PHONY: osmo-stp-master -osmo-stp-master: debian-jessie-build - $(MAKE) -C osmo-stp-master - -.PHONY: osmocom-bb-host-master -osmocom-bb-host-master: debian-jessie-build - $(MAKE) -C osmocom-bb-host-master - -.PHONY: osmo-ggsn-master -osmo-ggsn-master: debian-jessie-build - $(MAKE) -C osmo-ggsn-master - -.PHONY: osmo-hlr-master -osmo-hlr-master: debian-jessie-build - $(MAKE) -C osmo-hlr-master - -.PHONY: ttcn3-bsc-test -ttcn3-bsc-test: debian-stretch-titan osmo-stp-master osmo-bsc-master osmo-bts-master ttcn3-bsc-test - $(MAKE) -C ttcn3-bsc-test - -.PHONY: ttcn3-bts-test -ttcn3-bts-test: debian-stretch-titan osmo-bsc-master osmo-bts-master osmocom-bb-host-master ttcn3-bts-test - $(MAKE) -C ttcn3-bts-test - -.PHONY: ttcn3-msc-test -ttcn3-msc-test: debian-stretch-titan osmo-stp-master osmo-msc-master ttcn3-msc-test - $(MAKE) -C ttcn3-msc-test - -.PHONY: ttcn3-ggsn-test -ttcn3-ggsn-test: osmo-ggsn-test - $(MAKE) -C ggsn-test - -.PHONY: ttcn3-mgw-test -ttcn3-mgw-test: debian-stretch-titan osmo-mgw-master - $(MAKE) -C ttcn3-mgw-test - -.PHONY: ttcn3-hlr-test -ttcn3-hlr-test: debian-stretch-titan osmo-hlr-master - $(MAKE) -C ttcn3-hlr-test - -.PHONY: sctp-test -sctp-test: debian-jessie-build - $(MAKE) -C sctp-test - -.PHONY: sigtran-tests -sigtran-tests: debian-jessie-build - $(MAKE) -C sigtran-tests - -.PHONY: sua-test -sua-test: osmo-stp-master - $(MAKE) -C sua-test - -.PHONY: m3ua-test -m3ua-test: osmo-stp-master sigtran-tests - $(MAKE) -C m3ua-test - -.PHONY: gr-gsm-master -gr-gsm-master: - $(MAKE) -C gr-gsm-master diff --git a/README.md b/README.md index bb354c0..adb6420 100644 --- a/README.md +++ b/README.md @@ -5,5 +5,72 @@ containers + related stacks around Osmocom. So far, the main focus is test automation. -See http://laforge.gnumonks.org/blog/20170503-docker-overhyped/ for -related rambling on why this doesn't work as well as one would want. +## Running a testsuite +All testsuite folders start with `ttcn3` or `nplab`. Run the following +to build/update all required containers and start a specific testsuite: + +``` +$ cd ttcn3-mgw-test +$ ./jenkins.sh +``` + +Environment variables: +* `IMAGE_SUFFIX`: the version of the Osmocom stack to run the testsuite + against. Default is `master`, set this to `latest` to test the last + stable releases. +* `NO_DOCKER_IMAGE_BUILD`: when set to `1`, it won't try to update the + containers (see "caching" below) + +## Building containers manually +Most folders in this repository contain a `Dockerfile`. Build a docker +container with the same name as the folder like this: + +``` +$ cd debian-jessie-build +$ make +``` + +## Caching +All folders named `osmo-*-latest` and `osmo-*-master` build the latest +stable or most recent commit from `master` of the corresponding Osmocom +program's git repository. When you have built it already, running `make` +will only do a small HTTP request to check if the sources are outdated +and skip the build in case it is still up-to-date. + +## Dependencies +Folders that don't have a `jenkins.sh` usually only depend on the +container that is specified in the `FROM` line of their `Dockerfile`. +Testsuites depend on multiple containers, they are defined on top of +each `jenkins.sh`: + +```shell +. ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "debian-jessie-build" \ + "osmo-stp-$IMAGE_SUFFIX" \ + "osmo-bsc-$IMAGE_SUFFIX" \ + "osmo-bts-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "ttcn3-bsc-test" +``` + +#### Reasoning for this implementation +Before having the `docker_images_require` lines, there used to be a +top-level `Makefile` for resolving dependencies between the containers. +But it was prone to mistakes: when new folders in the repository +were added without related targets in the `Makefile`, `make` would +always assume that the targets where the always existing folders and +therefore never build the containers. + +In order to implement testing `latest` in addition to `master` +([OS#3268](https://osmocom.org/issues/3268)), it would have been +necessary to add further complexity to the `Makefile`. Instead it was +decided to scrap the file, and just keep the short list of dependencies +right above where they would be needed in the `jenkins.sh`. + +## See also +* [Overhyped Docker](http://laforge.gnumonks.org/blog/20170503-docker-overhyped/) + for related rambling on why this doesn't work as well as one would + want. +* [Osmocom wiki: Titan TTCN3 Testsuites](https://osmocom.org/projects/cellular-infrastructure/wiki/Titan_TTCN3_Testsuites) -- To view, visit https://gerrit.osmocom.org/11369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id18a9a7a70f85127e6f6c9447d71764018bdb4ff Gerrit-Change-Number: 11369 Gerrit-PatchSet: 9 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 10:43:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 10:43:21 +0000 Subject: Change in osmo-bts[master]: Add OC-2G BTS sources In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11447 ) Change subject: Add OC-2G BTS sources ...................................................................... Patch Set 1: -Code-Review ok, the discussion on the mailing list has gone into the direction of "merge this now as-is and then unify with lc15 after merge". So we are willing to merge this now. However, in order to merge this code, we also need to ensure it's at least build tested. This means that there is something like a contrib/jenkins_oc2g.sh and contrib/jenkins_bts_model.sh is extended to cover oc2g. Those scripts can be manually/locally tested by ensurign osmo-ci.git/scripts is included in PATH before calling something like "./contrib/jenkins_bts_model sysmo" Please provide those scripts which ensure that this commit can only be merged once it at least passes a simple build test. Thanks1 -- To view, visit https://gerrit.osmocom.org/11447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 Gerrit-Change-Number: 11447 Gerrit-PatchSet: 1 Gerrit-Owner: Omar Ramadan Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 26 Oct 2018 10:43:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 10:45:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 10:45:57 +0000 Subject: Change in osmo-bts[master]: Add OC-2G to build In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11449 ) Change subject: Add OC-2G to build ...................................................................... Patch Set 1: (2 comments) I think the three patches in this series should be merged into one patch. The retionale is: Only if the build infrastructure is added together with the soruce code, we can do build verification as part of patch verification (V+1) and a subsequent merge. https://gerrit.osmocom.org/#/c/11449/1/include/osmo-bts/gsm_data_shared.h File include/osmo-bts/gsm_data_shared.h: https://gerrit.osmocom.org/#/c/11449/1/include/osmo-bts/gsm_data_shared.h at 414 PS1, Line 414: uint8_t max_power_backoff_8psk; /* in actual dB */ : uint8_t c0_idle_power_red; /* in actual dB */ would be good to mark those as "OC2G only for now" in the comment https://gerrit.osmocom.org/#/c/11449/1/include/osmo-bts/l1sap.h File include/osmo-bts/l1sap.h: https://gerrit.osmocom.org/#/c/11449/1/include/osmo-bts/l1sap.h at 53 PS1, Line 53: return L1SAP_CHAN2SS_BCCH(chan_nr); unrelated cosmetic change, lets' try to avoid that. -- To view, visit https://gerrit.osmocom.org/11449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4a8dcf759a2818c8e457bcb82775c4e60c94d771 Gerrit-Change-Number: 11449 Gerrit-PatchSet: 1 Gerrit-Owner: Omar Ramadan Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 26 Oct 2018 10:45:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 10:46:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 10:46:16 +0000 Subject: Change in osmo-bts[master]: Add OC-2G systemd service and config In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11448 ) Change subject: Add OC-2G systemd service and config ...................................................................... Patch Set 1: see my other comment, let's squash those three patches into one patch, and also add the jenkins.sh integration -- To view, visit https://gerrit.osmocom.org/11448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4b5a97b9677051442f3c3341ba23add35b43715 Gerrit-Change-Number: 11448 Gerrit-PatchSet: 1 Gerrit-Owner: Omar Ramadan Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 26 Oct 2018 10:46:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 11:06:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 11:06:52 +0000 Subject: Change in osmo-mgw[master]: add MGCP CRCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11463 ) Change subject: add MGCP CRCX command statistics to osmo-mgw ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11463 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ida82fc340d5c66180e5fe9a0d195e9be6dc64c61 Gerrit-Change-Number: 11463 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 26 Oct 2018 11:06:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 11:09:12 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Oct 2018 11:09:12 +0000 Subject: Change in docker-playground[master]: rename m3ua-test, sua-test to nplab-*-test In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11368 ) Change subject: rename m3ua-test, sua-test to nplab-*-test ...................................................................... Patch Set 8: NOTE: I've adjusted the paths in the existing jenkins jobs, as they are not replaced with the new jenkins job builder based ones yet (see https://gerrit.osmocom.org/#/c/osmo-ci/+/11370/). -- To view, visit https://gerrit.osmocom.org/11368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de Gerrit-Change-Number: 11368 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Fri, 26 Oct 2018 11:09:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 11:59:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 26 Oct 2018 11:59:34 +0000 Subject: Change in osmocom-bb[master]: Report socket path on errors In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11464 ) Change subject: Report socket path on errors ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11464 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib63e1205d7b845c8779eb511635f26bae3a18085 Gerrit-Change-Number: 11464 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 26 Oct 2018 11:59:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 12:22:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 12:22:57 +0000 Subject: Change in osmo-ci[master]: ansible: ogt: Deploy osmo-gsm-tester_netns_exec.sh Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11465 Change subject: ansible: ogt: Deploy osmo-gsm-tester_netns_exec.sh ...................................................................... ansible: ogt: Deploy osmo-gsm-tester_netns_exec.sh Related: OS#2308 Change-Id: I587dd5630b211a906351f064c718f8f4c5fe6273 --- A ansible/roles/gsm-tester/files/osmo-gsm-tester_netns_exec.sh M ansible/roles/gsm-tester/tasks/main.yml 2 files changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/65/11465/1 diff --git a/ansible/roles/gsm-tester/files/osmo-gsm-tester_netns_exec.sh b/ansible/roles/gsm-tester/files/osmo-gsm-tester_netns_exec.sh new file mode 100755 index 0000000..336b746 --- /dev/null +++ b/ansible/roles/gsm-tester/files/osmo-gsm-tester_netns_exec.sh @@ -0,0 +1,5 @@ +#!/bin/bash +netns="$1" +shift +#TODO: Later on I may want to call myself with specific ENV and calling sudo in order to run inside the netns but with dropped privileges +ip netns exec $netns "$@" diff --git a/ansible/roles/gsm-tester/tasks/main.yml b/ansible/roles/gsm-tester/tasks/main.yml index 61db8e9..4f57b17 100644 --- a/ansible/roles/gsm-tester/tasks/main.yml +++ b/ansible/roles/gsm-tester/tasks/main.yml @@ -237,6 +237,19 @@ dest: /etc/sudoers.d/osmo-gsm-tester_setcap_net_admin mode: 0440 +- name: create a wrapper script to run processes on modem netns + copy: + src: osmo-gsm-tester_netns_exec.sh + dest: /usr/local/bin/osmo-gsm-tester_netns_exec.sh + mode: 755 + +- name: allow osmo-gsm-tester sudo osmo-gsm-tester_netns_exec.sh + copy: + content: | + %osmo-gsm-tester ALL=(root) NOPASSWD: /usr/local/bin/osmo-gsm-tester_netns_exec.sh + dest: /etc/sudoers.d/osmo-gsm-tester_netns_exec + mode: 0440 + - name: logrotate limit filesizes to 10M copy: content: "maxsize 10M" -- To view, visit https://gerrit.osmocom.org/11465 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I587dd5630b211a906351f064c718f8f4c5fe6273 Gerrit-Change-Number: 11465 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 12:55:34 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 26 Oct 2018 12:55:34 +0000 Subject: Change in osmo-mgw[master]: mgcp_protocol: increase buffer space for codec name in LCO Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11466 Change subject: mgcp_protocol: increase buffer space for codec name in LCO ...................................................................... mgcp_protocol: increase buffer space for codec name in LCO The function that parses the LCO uses an internal buffer to store the codec name that has been issued via LCO. This buffer is only 9 byte long, this means an 8 character string can be stored. If a codec name exceeds this limit it gets chopped. For example "GSM-HR-08" becomes "GSM-HR-0", which may mess up the codec negotiation. - Increase the buffer from 9 to 17 byte. Change-Id: I17ce7acde1f23ab1394227d74214fe2a55cd2264 Related: OS#3673 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/66/11466/1 diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index e17bdae..860692f 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -518,7 +518,7 @@ const char *options) { char *p_opt, *a_opt; - char codec[9]; + char codec[17]; if (!options) return 0; @@ -544,7 +544,7 @@ * (e.g. a:PCMU;G726-32) But this implementation only supports a single * codec only. */ a_opt = strstr(lco->string, "a:"); - if (a_opt && sscanf(a_opt, "a:%8[^,]", codec) == 1) { + if (a_opt && sscanf(a_opt, "a:%16[^,]", codec) == 1) { talloc_free(lco->codec); lco->codec = talloc_strdup(ctx, codec); } -- To view, visit https://gerrit.osmocom.org/11466 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I17ce7acde1f23ab1394227d74214fe2a55cd2264 Gerrit-Change-Number: 11466 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 13:26:51 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 26 Oct 2018 13:26:51 +0000 Subject: Change in libosmocore[master]: stop printing group description in vty_out_rate_ctr_group_fmt() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11467 Change subject: stop printing group description in vty_out_rate_ctr_group_fmt() ...................................................................... stop printing group description in vty_out_rate_ctr_group_fmt() When vty_out_rate_ctr_group_fmt() prints the description of a counter group, it assumes this description should appear at the beginning of a line. However, the caller might be printing counters in an indented context. So just let the caller worry about printing the group title if necessary (there is currently only one known caller, which is updated in this commit). Note that printing of the group title was an undocumented feature. Change-Id: I2c55cb54e8b7a7c8c6cf72f22287083767ed0201 Related: OS#2660 --- M src/vty/stats_vty.c M src/vty/utils.c 2 files changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/67/11467/1 diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c index 5ded7a4..62153f3 100644 --- a/src/vty/stats_vty.c +++ b/src/vty/stats_vty.c @@ -533,6 +533,7 @@ static int rate_ctr_group_handler(struct rate_ctr_group *ctrg, void *sctx_) { struct vty *vty = sctx_; + vty_out(vty, "%s:%s", ctrg->desc->group_description, VTY_NEWLINE); vty_out_rate_ctr_group_fmt(vty, "%25n: %10c (%S/s %M/m %H/h %D/d) %d", ctrg); return 0; } diff --git a/src/vty/utils.c b/src/vty/utils.c index 0d663c6..0358d9b 100644 --- a/src/vty/utils.c +++ b/src/vty/utils.c @@ -214,9 +214,6 @@ struct rate_ctr_group *ctrg) { struct vty_out_context vctx = {vty, fmt}; - - vty_out(vty, "%s:%s", ctrg->desc->group_description, VTY_NEWLINE); - rate_ctr_for_each_counter(ctrg, rate_ctr_handler_fmt, &vctx); } -- To view, visit https://gerrit.osmocom.org/11467 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2c55cb54e8b7a7c8c6cf72f22287083767ed0201 Gerrit-Change-Number: 11467 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 13:37:25 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 26 Oct 2018 13:37:25 +0000 Subject: Change in osmo-mgw[master]: add MGCP CRCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Hello dexter, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11463 to look at the new patch set (#3). Change subject: add MGCP CRCX command statistics to osmo-mgw ...................................................................... add MGCP CRCX command statistics to osmo-mgw Add a counter group for CRCX commands. The group contains counters for successful connection processing as well as various error conditions. This provides a quick overview of CRCX failures on each trunk throughout the lifetime of the osmo-mgw process. For example, after running the TTCN3 mgw test suite, the counters show the following values: OsmoMGW> show rate-counters crxc statistics: crcx:success: 88 (0/s 88/m 0/h 0/d) CRCX command processed successfully. crcx:bad_action: 0 (0/s 0/m 0/h 0/d) bad action in CRCX command. crcx:unhandled_param: 1 (0/s 1/m 0/h 0/d) unhandled parameter in CRCX command. crcx:missing_callid: 1 (0/s 1/m 0/h 0/d) missing CallId in CRCX command. crcx:invalid_mode: 1 (0/s 1/m 0/h 0/d) connection invalid mode in CRCX command. crcx:limit_exceeded: 0 (0/s 0/m 0/h 0/d) limit of concurrent connections was reached. crcx:unkown_callid: 0 (0/s 0/m 0/h 0/d) unknown CallId in CRCX command. crcx:alloc_conn_fail: 0 (0/s 0/m 0/h 0/d) connection allocation failure. crcx:no_remote_conn_desc: 1 (0/s 1/m 0/h 0/d) no opposite end specified for connection. crcx:start_rtp_failure: 0 (0/s 0/m 0/h 0/d) failure to start RTP processing. crcx:conn_rejected: 0 (0/s 0/m 0/h 0/d) connection rejected by policy. OsmoMGW> These same counters are now also shown by 'show mgcp stats' in the context of the trunk which they belong to. With input from Philipp Maier. Change-Id: Ida82fc340d5c66180e5fe9a0d195e9be6dc64c61 Related: OS#2660 --- M include/osmocom/mgcp/mgcp.h M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c 3 files changed, 86 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/63/11463/3 -- To view, visit https://gerrit.osmocom.org/11463 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ida82fc340d5c66180e5fe9a0d195e9be6dc64c61 Gerrit-Change-Number: 11463 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 13:39:30 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 26 Oct 2018 13:39:30 +0000 Subject: Change in osmo-mgw[master]: use a dynamic name for rtp connection rate counters In-Reply-To: References: Message-ID: Stefan Sperling has abandoned this change. ( https://gerrit.osmocom.org/11439 ) Change subject: use a dynamic name for rtp connection rate counters ...................................................................... Abandoned As discussed with Harald, this is a wrong approach. -- To view, visit https://gerrit.osmocom.org/11439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I027644f4b913e1f966c11b081e9027e61591a224 Gerrit-Change-Number: 11439 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 13:41:33 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Oct 2018 13:41:33 +0000 Subject: Change in libosmocore[master]: add osmo_sock_get_{local, remote}_ip{, _port}() In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11455 to look at the new patch set (#2). Change subject: add osmo_sock_get_{local,remote}_ip{,_port}() ...................................................................... add osmo_sock_get_{local,remote}_ip{,_port}() Return only the IP or port of either the local or remote connection, not the whole set of IP and port of both the local and remote connection like osmo_sock_get_name() does it. This is needed for OS#2841, where we only want to print the remote IP. Related: OS#2841 Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 92 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/55/11455/2 -- To view, visit https://gerrit.osmocom.org/11455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 Gerrit-Change-Number: 11455 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 13:44:17 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Oct 2018 13:44:17 +0000 Subject: Change in libosmocore[master]: add osmo_sock_get_{local, remote}_ip{, _port}() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11455 ) Change subject: add osmo_sock_get_{local,remote}_ip{,_port}() ...................................................................... Patch Set 2: Let's try this again: without defines, no heap-allocated buffer and less duplicate code :) -- To view, visit https://gerrit.osmocom.org/11455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 Gerrit-Change-Number: 11455 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Fri, 26 Oct 2018 13:44:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 13:46:18 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Oct 2018 13:46:18 +0000 Subject: Change in libosmocore[master]: add osmo_sock_get_{local, remote}_ip{, _port}() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11455 ) Change subject: add osmo_sock_get_{local,remote}_ip{,_port}() ...................................................................... Patch Set 2: (Tested both osmo_sock_get_name() and osmo_sock_get_remote_ip(), and they are working as expected.) -- To view, visit https://gerrit.osmocom.org/11455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 Gerrit-Change-Number: 11455 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Fri, 26 Oct 2018 13:46:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 14:01:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 14:01:29 +0000 Subject: Change in osmo-ci[master]: ansible: ogt: Add new local IP addr to be available for resources Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11468 Change subject: ansible: ogt: Add new local IP addr to be available for resources ...................................................................... ansible: ogt: Add new local IP addr to be available for resources Change-Id: I32574a935289fa208647d16663b77c0708c0572c --- M ansible/roles/gsm-tester-network/templates/interface.j2 1 file changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/68/11468/1 diff --git a/ansible/roles/gsm-tester-network/templates/interface.j2 b/ansible/roles/gsm-tester-network/templates/interface.j2 index c849210..f694261 100644 --- a/ansible/roles/gsm-tester-network/templates/interface.j2 +++ b/ansible/roles/gsm-tester-network/templates/interface.j2 @@ -46,20 +46,25 @@ auto {{ bts_interface }}:8 iface {{ bts_interface }}:8 inet static - address 10.42.42.50 + address 10.42.42.10 netmask 255.255.255.0 auto {{ bts_interface }}:9 iface {{ bts_interface }}:9 inet static - address 10.42.42.51 + address 10.42.42.50 netmask 255.255.255.0 auto {{ bts_interface }}:10 iface {{ bts_interface }}:10 inet static - address 10.42.42.52 + address 10.42.42.51 netmask 255.255.255.0 auto {{ bts_interface }}:11 iface {{ bts_interface }}:11 inet static + address 10.42.42.52 + netmask 255.255.255.0 + +auto {{ bts_interface }}:12 +iface {{ bts_interface }}:12 inet static address 10.42.42.53 netmask 255.255.255.0 -- To view, visit https://gerrit.osmocom.org/11468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I32574a935289fa208647d16663b77c0708c0572c Gerrit-Change-Number: 11468 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 14:08:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 14:08:21 +0000 Subject: Change in osmo-ci[master]: osmo-layer1-headers.sh: Add support for OC-2G Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11469 Change subject: osmo-layer1-headers.sh: Add support for OC-2G ...................................................................... osmo-layer1-headers.sh: Add support for OC-2G Change-Id: Iceb62df4511ed50f0286e5762d9ffc4b068f70a6 --- M scripts/osmo-layer1-headers.sh 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/69/11469/1 diff --git a/scripts/osmo-layer1-headers.sh b/scripts/osmo-layer1-headers.sh index a975396..0adf528 100755 --- a/scripts/osmo-layer1-headers.sh +++ b/scripts/osmo-layer1-headers.sh @@ -22,6 +22,10 @@ uri="https://gitlab.com/nrw_litecell15/litecell15-fw" version="origin/nrw/litecell15" ;; + oc2g) + uri="https://gitlab.com/nrw_oc2g/oc2g-fw" + version="origin/nrw/oc2g" + ;; *) echo "Unknown BTS model '$1'" exit 1 -- To view, visit https://gerrit.osmocom.org/11469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iceb62df4511ed50f0286e5762d9ffc4b068f70a6 Gerrit-Change-Number: 11469 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 14:09:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 14:09:26 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications.yml: Add OC2G build matrix to gerrit-osmo-bts Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11470 Change subject: gerrit-verifications.yml: Add OC2G build matrix to gerrit-osmo-bts ...................................................................... gerrit-verifications.yml: Add OC2G build matrix to gerrit-osmo-bts The gerrit-osmo-bts job is used for build verification of osmo-bts patches. This adds (untested) support for OC2G Change-Id: I62a9a5ec357b7246b2d7915681c646c79eda4b76 --- M jobs/gerrit-verifications.yml 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/70/11470/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index f3bde2e..a989760 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -87,9 +87,9 @@ - osmo-bts: a1_name: FIRMWARE_VERSION - a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, origin/nrw/litecell15] + a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, origin/nrw/litecell15, origin/nrw/oc2g, origin/nrw/oc2g-next] a2_name: BTS_MODEL - a2: !!python/tuple [sysmo, oct, trx, oct+trx, lc15] + a2: !!python/tuple [sysmo, oct, trx, oct+trx, lc15, oc2g] combination_filter: > FIRMWARE_VERSION == "master" || (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo") || @@ -98,7 +98,9 @@ (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo") || (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo") || (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15") || - (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15") + (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15") || + (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g") || + (FIRMWARE_VERSION == "origin/nrw/oc2g-next" && BTS_MODEL == "oc2g") cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL"' - osmo-ggsn: -- To view, visit https://gerrit.osmocom.org/11470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I62a9a5ec357b7246b2d7915681c646c79eda4b76 Gerrit-Change-Number: 11470 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 14:09:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 14:09:49 +0000 Subject: Change in osmo-ci[master]: osmo-layer1-headers.sh: Add support for OC-2G In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11469 ) Change subject: osmo-layer1-headers.sh: Add support for OC-2G ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iceb62df4511ed50f0286e5762d9ffc4b068f70a6 Gerrit-Change-Number: 11469 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 26 Oct 2018 14:09:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 14:10:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 14:10:15 +0000 Subject: Change in osmo-ci[master]: osmo-layer1-headers.sh: Add support for OC-2G In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11469 ) Change subject: osmo-layer1-headers.sh: Add support for OC-2G ...................................................................... osmo-layer1-headers.sh: Add support for OC-2G Change-Id: Iceb62df4511ed50f0286e5762d9ffc4b068f70a6 --- M scripts/osmo-layer1-headers.sh 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/scripts/osmo-layer1-headers.sh b/scripts/osmo-layer1-headers.sh index a975396..0adf528 100755 --- a/scripts/osmo-layer1-headers.sh +++ b/scripts/osmo-layer1-headers.sh @@ -22,6 +22,10 @@ uri="https://gitlab.com/nrw_litecell15/litecell15-fw" version="origin/nrw/litecell15" ;; + oc2g) + uri="https://gitlab.com/nrw_oc2g/oc2g-fw" + version="origin/nrw/oc2g" + ;; *) echo "Unknown BTS model '$1'" exit 1 -- To view, visit https://gerrit.osmocom.org/11469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iceb62df4511ed50f0286e5762d9ffc4b068f70a6 Gerrit-Change-Number: 11469 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Omar Ramadan -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 14:10:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 14:10:39 +0000 Subject: Change in osmo-ci[master]: ansible: ogt: Deploy osmo-gsm-tester_netns_exec.sh In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11465 ) Change subject: ansible: ogt: Deploy osmo-gsm-tester_netns_exec.sh ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11465 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I587dd5630b211a906351f064c718f8f4c5fe6273 Gerrit-Change-Number: 11465 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 26 Oct 2018 14:10:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 14:11:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 14:11:19 +0000 Subject: Change in osmo-ci[master]: ansible: ogt: Add new local IP addr to be available for resources In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11468 ) Change subject: ansible: ogt: Add new local IP addr to be available for resources ...................................................................... Patch Set 1: it doesn't appear to only add an address but also modify existing ones? -- To view, visit https://gerrit.osmocom.org/11468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32574a935289fa208647d16663b77c0708c0572c Gerrit-Change-Number: 11468 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 26 Oct 2018 14:11:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 14:12:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 14:12:48 +0000 Subject: Change in libosmocore[master]: add osmo_sock_get_{local, remote}_ip{, _port}() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11455 ) Change subject: add osmo_sock_get_{local,remote}_ip{,_port}() ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11455/2/include/osmocom/core/socket.h File include/osmocom/core/socket.h: https://gerrit.osmocom.org/#/c/11455/2/include/osmocom/core/socket.h at 60 PS2, Line 60: bool please don't make them return bool. We don't have any functions in osmocom that return bool, *except* for predicate functions that are used to check for some condition. The general semantics are, like many things, like in the linux kernel: 0 is success, negativ is error, and positive is used to e.g. indicate the size/number of bytes/... -- To view, visit https://gerrit.osmocom.org/11455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 Gerrit-Change-Number: 11455 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Fri, 26 Oct 2018 14:12:48 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 14:13:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 14:13:40 +0000 Subject: Change in libosmocore[master]: stop printing group description in vty_out_rate_ctr_group_fmt() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11467 ) Change subject: stop printing group description in vty_out_rate_ctr_group_fmt() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11467 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2c55cb54e8b7a7c8c6cf72f22287083767ed0201 Gerrit-Change-Number: 11467 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 26 Oct 2018 14:13:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 14:14:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 14:14:06 +0000 Subject: Change in osmo-ci[master]: ansible: ogt: Add new local IP addr to be available for resources In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11468 ) Change subject: ansible: ogt: Add new local IP addr to be available for resources ...................................................................... Patch Set 1: Well, let's say the way git shows the diff is not the logical path I found to add it. I just added a new block after enp2s0:7: auto enp2s0:8 iface enp2s0:8 inet static address 10.42.42.10 netmask 255.255.255.0 And then I renamed the interfaces below it incrementing index by 1. This way IP ranges and indexes are sorted and easy to find how they are divided. -- To view, visit https://gerrit.osmocom.org/11468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32574a935289fa208647d16663b77c0708c0572c Gerrit-Change-Number: 11468 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 26 Oct 2018 14:14:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 14:15:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 14:15:24 +0000 Subject: Change in osmo-mgw[master]: add MGCP CRCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11463 ) Change subject: add MGCP CRCX command statistics to osmo-mgw ...................................................................... Patch Set 3: Code-Review+2 In long functions it might make sense to have a local variable rather than always the length "&tcfg->mgcp_crcx_ctr_group->ctr", but that's purely optional/cosmetic. -- To view, visit https://gerrit.osmocom.org/11463 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ida82fc340d5c66180e5fe9a0d195e9be6dc64c61 Gerrit-Change-Number: 11463 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 26 Oct 2018 14:15:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 14:25:01 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Oct 2018 14:25:01 +0000 Subject: Change in libosmocore[master]: add osmo_sock_get_{local, remote}_ip{, _port}() In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11455 to look at the new patch set (#3). Change subject: add osmo_sock_get_{local,remote}_ip{,_port}() ...................................................................... add osmo_sock_get_{local,remote}_ip{,_port}() Return only the IP or port of either the local or remote connection, not the whole set of IP and port of both the local and remote connection like osmo_sock_get_name() does it. This is needed for OS#2841, where we only want to print the remote IP. Related: OS#2841 Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 92 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/55/11455/3 -- To view, visit https://gerrit.osmocom.org/11455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 Gerrit-Change-Number: 11455 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 14:31:11 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Oct 2018 14:31:11 +0000 Subject: Change in libosmocore[master]: add osmo_sock_get_{local, remote}_ip{, _port}() In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11455 to look at the new patch set (#4). Change subject: add osmo_sock_get_{local,remote}_ip{,_port}() ...................................................................... add osmo_sock_get_{local,remote}_ip{,_port}() Return only the IP or port of either the local or remote connection, not the whole set of IP and port of both the local and remote connection like osmo_sock_get_name() does it. This is needed for OS#2841, where we only want to print the remote IP. Related: OS#2841 Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 92 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/55/11455/4 -- To view, visit https://gerrit.osmocom.org/11455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 Gerrit-Change-Number: 11455 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 14:35:47 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Oct 2018 14:35:47 +0000 Subject: Change in libosmocore[master]: add osmo_sock_get_{local, remote}_ip{, _port}() In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11455 to look at the new patch set (#5). Change subject: add osmo_sock_get_{local,remote}_ip{,_port}() ...................................................................... add osmo_sock_get_{local,remote}_ip{,_port}() Return only the IP or port of either the local or remote connection, not the whole set of IP and port of both the local and remote connection like osmo_sock_get_name() does it. This is needed for OS#2841, where we only want to print the remote IP. Related: OS#2841 Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 92 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/55/11455/5 -- To view, visit https://gerrit.osmocom.org/11455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 Gerrit-Change-Number: 11455 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 14:38:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 14:38:50 +0000 Subject: Change in osmo-ci[master]: ansible: ogt: install udhcpc and iperf3 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11471 Change subject: ansible: ogt: install udhcpc and iperf3 ...................................................................... ansible: ogt: install udhcpc and iperf3 These tools are used during gprs data plane setup and performance testing. Change-Id: I5beddd74fca726c5ea2c9527836a9f50d92b4ce8 --- M ansible/roles/gsm-tester/tasks/main.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/71/11471/1 diff --git a/ansible/roles/gsm-tester/tasks/main.yml b/ansible/roles/gsm-tester/tasks/main.yml index 4f57b17..70a0549 100644 --- a/ansible/roles/gsm-tester/tasks/main.yml +++ b/ansible/roles/gsm-tester/tasks/main.yml @@ -122,6 +122,8 @@ - sudo - libcap2-bin - python3-pip + - udhcpc + - iperf3 - name: install gsm tester pip dependencies pip: -- To view, visit https://gerrit.osmocom.org/11471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5beddd74fca726c5ea2c9527836a9f50d92b4ce8 Gerrit-Change-Number: 11471 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Oct 26 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 26 Oct 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#288?= In-Reply-To: <1545962033.214.1540480207306.JavaMail.jenkins@jenkins.osmocom.org> References: <1545962033.214.1540480207306.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <684666930.230.1540566607298.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Oct 26 15:20:15 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 26 Oct 2018 15:20:15 +0000 Subject: Change in osmocom-bb[master]: Report socket path on errors In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11464 ) Change subject: Report socket path on errors ...................................................................... Report socket path on errors Change-Id: Ib63e1205d7b845c8779eb511635f26bae3a18085 --- M src/host/layer23/src/common/l1l2_interface.c M src/host/layer23/src/common/sap_interface.c M src/host/osmocon/osmoload.c 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c index e21b07e..b366d51 100644 --- a/src/host/layer23/src/common/l1l2_interface.c +++ b/src/host/layer23/src/common/l1l2_interface.c @@ -109,7 +109,7 @@ rc = osmo_sock_unix_init_ofd(&ms->l2_wq.bfd, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT); if (rc < 0) { - fprintf(stderr, "Failed to create unix domain socket.\n"); + fprintf(stderr, "Failed to create unix domain socket %s\n", socket_path); return rc; } diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index da03c0f..cab3c6b 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -503,7 +503,7 @@ rc = osmo_sock_unix_init_ofd(&ms->sap_wq.bfd, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT); if (rc < 0) { - fprintf(stderr, "Failed to create unix domain socket.\n"); + fprintf(stderr, "Failed to create unix domain socket %s\n", socket_path); ms->sap_entity.sap_state = SAP_SOCKET_ERROR; return rc; } diff --git a/src/host/osmocon/osmoload.c b/src/host/osmocon/osmoload.c index b1b48e2..decdc13 100644 --- a/src/host/osmocon/osmoload.c +++ b/src/host/osmocon/osmoload.c @@ -499,7 +499,7 @@ rc = osmo_sock_unix_init_ofd(conn, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT); if (rc < 0) { - fprintf(stderr, "Failed to create unix domain socket.\n"); + fprintf(stderr, "Failed to create unix domain socket %s\n", socket_path); exit(1); } -- To view, visit https://gerrit.osmocom.org/11464 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib63e1205d7b845c8779eb511635f26bae3a18085 Gerrit-Change-Number: 11464 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 15:30:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 26 Oct 2018 15:30:44 +0000 Subject: Change in osmocom-bb[master]: trxcon: make TRX bind address configurable Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11472 Change subject: trxcon: make TRX bind address configurable ...................................................................... trxcon: make TRX bind address configurable Previously the wildcard address (i.e. '0.0.0.0') was hard-coded as the bind address of TRX interface. Let's make it configurable by introducing a command line option. Note that the '--trx-ip' option was deprecated by '--trx-remote', because it isn't clean whether it is remore or local address. It still can be used, but was removed from help message. Change-Id: Ic2f43632cc57bb6f722eba05219e438f97fecb95 --- M src/host/trxcon/trxcon.c 1 file changed, 17 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/72/11472/1 diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index 84d132e..251321d 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -68,7 +68,8 @@ /* TRX specific */ struct trx_instance *trx; - const char *trx_ip; + const char *trx_bind_ip; + const char *trx_remote_ip; uint16_t trx_base_port; uint32_t trx_fn_advance; } app_data; @@ -152,7 +153,8 @@ printf(" Some help...\n"); printf(" -h --help this text\n"); printf(" -d --debug Change debug flags. Default: %s\n", DEBUG_DEFAULT); - printf(" -i --trx-ip IP address of host runing TRX (default 127.0.0.1)\n"); + printf(" -b --trx-bind TRX bind IP address (default 0.0.0.0)\n"); + printf(" -i --trx-remote TRX remote IP address (default 127.0.0.1)\n"); printf(" -p --trx-port Base port of TRX instance (default 6700)\n"); printf(" -f --trx-advance Scheduler clock advance (default 20)\n"); printf(" -s --socket Listening socket for layer23 (default /tmp/osmocom_l2)\n"); @@ -167,14 +169,18 @@ {"help", 0, 0, 'h'}, {"debug", 1, 0, 'd'}, {"socket", 1, 0, 's'}, + {"trx-bind", 1, 0, 'b'}, + /* NOTE: 'trx-ip' is now an alias for 'trx-remote' + * due to backward compatibility reasons! */ {"trx-ip", 1, 0, 'i'}, + {"trx-remote", 1, 0, 'i'}, {"trx-port", 1, 0, 'p'}, {"trx-advance", 1, 0, 'f'}, {"daemonize", 0, 0, 'D'}, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "d:i:p:f:s:Dh", + c = getopt_long(argc, argv, "d:b:i:p:f:s:Dh", long_options, &option_index); if (c == -1) break; @@ -188,8 +194,11 @@ case 'd': app_data.debug_mask = optarg; break; + case 'b': + app_data.trx_bind_ip = optarg; + break; case 'i': - app_data.trx_ip = optarg; + app_data.trx_remote_ip = optarg; break; case 'p': app_data.trx_base_port = atoi(optarg); @@ -212,7 +221,8 @@ static void init_defaults(void) { app_data.bind_socket = "/tmp/osmocom_l2"; - app_data.trx_ip = "127.0.0.1"; + app_data.trx_remote_ip = "127.0.0.1"; + app_data.trx_bind_ip = "0.0.0.0"; app_data.trx_base_port = 6700; app_data.trx_fn_advance = 20; @@ -274,7 +284,8 @@ goto exit; /* Init transceiver interface */ - rc = trx_if_open(&app_data.trx, "0.0.0.0", app_data.trx_ip, app_data.trx_base_port); + rc = trx_if_open(&app_data.trx, + app_data.trx_bind_ip, app_data.trx_remote_ip, app_data.trx_base_port); if (rc) goto exit; -- To view, visit https://gerrit.osmocom.org/11472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic2f43632cc57bb6f722eba05219e438f97fecb95 Gerrit-Change-Number: 11472 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 15:33:18 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 26 Oct 2018 15:33:18 +0000 Subject: Change in osmocom-bb[master]: trxcon: make TRX bind address configurable In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11472 ) Change subject: trxcon: make TRX bind address configurable ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic2f43632cc57bb6f722eba05219e438f97fecb95 Gerrit-Change-Number: 11472 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Fri, 26 Oct 2018 15:33:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 15:34:30 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 26 Oct 2018 15:34:30 +0000 Subject: Change in osmocom-bb[master]: trxcon: make TRX bind address configurable In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11472 ) Change subject: trxcon: make TRX bind address configurable ...................................................................... Patch Set 1: If the deprecated option wasn't part of any official release than I don't think we have to bother with backwards compatibility. -- To view, visit https://gerrit.osmocom.org/11472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic2f43632cc57bb6f722eba05219e438f97fecb95 Gerrit-Change-Number: 11472 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Fri, 26 Oct 2018 15:34:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 15:36:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 26 Oct 2018 15:36:37 +0000 Subject: Change in osmocom-bb[master]: trxcon: make TRX bind address configurable In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11472 ) Change subject: trxcon: make TRX bind address configurable ...................................................................... Patch Set 1: > If the deprecated option wasn't part of any official release than I > don't think we have to bother with backwards compatibility. Hmm, not sure that we do care about releases in OsmocomBB :) AFAIK, this option is used in Jenkins, for some (e.g. BTS) tests. -- To view, visit https://gerrit.osmocom.org/11472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic2f43632cc57bb6f722eba05219e438f97fecb95 Gerrit-Change-Number: 11472 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 26 Oct 2018 15:36:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 15:44:24 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 26 Oct 2018 15:44:24 +0000 Subject: Change in osmocom-bb[master]: trxcon: make TRX bind address configurable In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11472 ) Change subject: trxcon: make TRX bind address configurable ...................................................................... Patch Set 1: Well, since it's used in jenkins tests we probably should start caring about OsmocomBB releases to properly use versioning and such :) -- To view, visit https://gerrit.osmocom.org/11472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic2f43632cc57bb6f722eba05219e438f97fecb95 Gerrit-Change-Number: 11472 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 26 Oct 2018 15:44:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 16:24:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 16:24:04 +0000 Subject: Change in osmo-gsm-tester[master]: utils: Add osmo-gsm-tester_setcap_net_*.sh scripts Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11473 Change subject: utils: Add osmo-gsm-tester_setcap_net_*.sh scripts ...................................................................... utils: Add osmo-gsm-tester_setcap_net_*.sh scripts This scripts were already being used by osmo-gsm-tester for a while, but were not avaialable in this repository. Let's put them here to easy find them and have all this kind of helper scripts together with code using it. Change-Id: Ib88a1b7818155fc608cc6ff763300fbd0e03a07a --- A utils/osmo-gsm-tester_setcap_net_admin.sh A utils/osmo-gsm-tester_setcap_net_raw.sh 2 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/73/11473/1 diff --git a/utils/osmo-gsm-tester_setcap_net_admin.sh b/utils/osmo-gsm-tester_setcap_net_admin.sh new file mode 100755 index 0000000..60e527a --- /dev/null +++ b/utils/osmo-gsm-tester_setcap_net_admin.sh @@ -0,0 +1,2 @@ +#!/bin/sh +/sbin/setcap cap_net_admin+ep "$1" diff --git a/utils/osmo-gsm-tester_setcap_net_raw.sh b/utils/osmo-gsm-tester_setcap_net_raw.sh new file mode 100755 index 0000000..1f3a727 --- /dev/null +++ b/utils/osmo-gsm-tester_setcap_net_raw.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +/sbin/setcap cap_net_raw+ep "$1" -- To view, visit https://gerrit.osmocom.org/11473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib88a1b7818155fc608cc6ff763300fbd0e03a07a Gerrit-Change-Number: 11473 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 16:24:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 16:24:05 +0000 Subject: Change in osmo-gsm-tester[master]: pcap_recorder: Add support to run in netns Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11474 Change subject: pcap_recorder: Add support to run in netns ...................................................................... pcap_recorder: Add support to run in netns Change-Id: Ie1c848254f221f26c59e7f4bd8c079fe3e7bdfc2 --- M src/osmo_gsm_tester/pcap_recorder.py 1 file changed, 10 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/74/11474/1 diff --git a/src/osmo_gsm_tester/pcap_recorder.py b/src/osmo_gsm_tester/pcap_recorder.py index 98dea8b..70833d0 100644 --- a/src/osmo_gsm_tester/pcap_recorder.py +++ b/src/osmo_gsm_tester/pcap_recorder.py @@ -26,7 +26,7 @@ class PcapRecorder(log.Origin): - def __init__(self, suite_run, run_dir, iface=None, filters=''): + def __init__(self, suite_run, run_dir, iface=None, filters='', netns=None): self.iface = iface if not self.iface: self.iface = "any" @@ -34,16 +34,20 @@ super().__init__(log.C_RUN, 'pcap-recorder_%s' % self.iface, filters=self.filters) self.suite_run = suite_run self.run_dir = run_dir + self.netns = netns self.start() def start(self): self.dbg('Recording pcap', self.run_dir, self.filters) dumpfile = os.path.join(os.path.abspath(self.run_dir), self.name() + ".pcap") - self.process = process.Process(self.name(), self.run_dir, - ('tcpdump', '-n', - '-i', self.iface, - '-w', dumpfile, - self.filters)) + popen_args = ('tcpdump', '-n', + '-i', self.iface, + '-w', dumpfile, + self.filters) + if self.netns: + self.process = process.NetNSProcess(self.name(), self.run_dir, self.netns, popen_args) + else: + self.process = process.Process(self.name(), self.run_dir, popen_args) self.suite_run.remember_to_stop(self.process) self.process.launch() -- To view, visit https://gerrit.osmocom.org/11474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1c848254f221f26c59e7f4bd8c079fe3e7bdfc2 Gerrit-Change-Number: 11474 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 16:24:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 16:24:06 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf: Add extra IPaddr to pool Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11475 Change subject: resources.conf: Add extra IPaddr to pool ...................................................................... resources.conf: Add extra IPaddr to pool Change-Id: If0f1a6a3f4e99091ed117bc7a77a5e60eccb2425 --- M example/resources.conf.prod M example/resources.conf.rnd 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/75/11475/1 diff --git a/example/resources.conf.prod b/example/resources.conf.prod index b12a7bc..0c8792e 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -9,6 +9,7 @@ - addr: 10.42.42.7 - addr: 10.42.42.8 - addr: 10.42.42.9 +- addr: 10.42.42.10 bts: - label: sysmoBTS 1002 diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd index 63650e1..dd9dc8f 100644 --- a/example/resources.conf.rnd +++ b/example/resources.conf.rnd @@ -9,6 +9,7 @@ - addr: 10.42.42.7 - addr: 10.42.42.8 - addr: 10.42.42.9 +- addr: 10.42.42.10 bts: - label: sysmoBTS 1002 -- To view, visit https://gerrit.osmocom.org/11475 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If0f1a6a3f4e99091ed117bc7a77a5e60eccb2425 Gerrit-Change-Number: 11475 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 16:24:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 16:24:06 +0000 Subject: Change in osmo-gsm-tester[master]: Introduce iperf3 testing infrastructure Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11476 Change subject: Introduce iperf3 testing infrastructure ...................................................................... Introduce iperf3 testing infrastructure Change-Id: I6ff6bef14feb535d98ca41b9788700d699e1ef1e --- A src/osmo_gsm_tester/iperf3.py M src/osmo_gsm_tester/suite.py A suites/gprs/iperf3.py M suites/gprs/suite.conf 4 files changed, 189 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/76/11476/1 diff --git a/src/osmo_gsm_tester/iperf3.py b/src/osmo_gsm_tester/iperf3.py new file mode 100644 index 0000000..8141fea --- /dev/null +++ b/src/osmo_gsm_tester/iperf3.py @@ -0,0 +1,107 @@ +# osmo_gsm_tester: specifics for running an iperf3 client and server +# +# Copyright (C) 2018 by sysmocom - s.f.m.c. GmbH +# +# Author: Pau Espin Pedrol +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import os +import json + +from . import log, util, process, pcap_recorder + +DEFAULT_SRV_PORT = 5003 + +class IPerf3Server(log.Origin): + + def __init__(self, suite_run, ip_address): + super().__init__(log.C_RUN, 'iperf3-srv_%s' % ip_address.get('addr')) + self.run_dir = None + self.config_file = None + self.process = None + self.suite_run = suite_run + self.ip_address = ip_address + self._port = DEFAULT_SRV_PORT + + def start(self): + self.log('Starting iperf3-srv') + self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) + + pcap_recorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), None, + 'host %s and port not 22' % self.addr()) + + self.log_file = self.run_dir.new_file('iperf3_srv.json') + self.process = process.Process(self.name(), self.run_dir, + ('iperf3', '-s', '-B', self.addr(), + '-p', str(self._port), '-J', + '--logfile', os.path.abspath(self.log_file)), + env={}) + self.suite_run.remember_to_stop(self.process) + self.process.launch() + + def stop(self): + self.suite_run.stop_process(self.process) + + def get_results(self): + with open(self.log_file) as f: + data = json.load(f) + return data + + def addr(self): + return self.ip_address.get('addr') + + def port(self): + return self._port + + def running(self): + return not self.process.terminated() + + def create_client(self): + return IPerf3Client(self.suite_run, self) + +class IPerf3Client(log.Origin): + + def __init__(self, suite_run, iperf3srv): + super().__init__(log.C_RUN, 'iperf3-cli_%s' % iperf3srv.addr()) + self.run_dir = None + self.config_file = None + self.process = None + self.server = iperf3srv + self.suite_run = suite_run + + def run_test(self, netns=None): + self.log('Starting iperf3-client connecting to %s:%d' % (self.server.addr(), self.server.port())) + self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) + + pcap_recorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), None, + 'host %s and port not 22' % self.server.addr(), netns) + + self.log_file = self.run_dir.new_file('iperf3_cli.json') + popen_args = ('iperf3', '-c', self.server.addr(), + '-p', str(self.server.port()), '-J', + '--logfile', os.path.abspath(self.log_file)) + if netns: + self.process = process.NetNSProcess(self.name(), self.run_dir, netns, popen_args, env={}) + else: + self.process = process.Process(self.name(), self.run_dir, popen_args, env={}) + process.run_proc_sync(self.process) + return self.get_results() + + def get_results(self): + with open(self.log_file) as f: + data = json.load(f) + return data + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index 2504941..b65031b 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -23,7 +23,7 @@ import pprint from . import config, log, util, resource, test from .event_loop import MainLoop -from . import osmo_nitb, osmo_hlr, osmo_mgcpgw, osmo_mgw, osmo_msc, osmo_bsc, osmo_stp, osmo_ggsn, osmo_sgsn, modem, esme, osmocon +from . import osmo_nitb, osmo_hlr, osmo_mgcpgw, osmo_mgw, osmo_msc, osmo_bsc, osmo_stp, osmo_ggsn, osmo_sgsn, modem, esme, osmocon, iperf3 class Timeout(Exception): pass @@ -344,6 +344,12 @@ self.register_for_cleanup(osmocon_obj) return osmocon_obj + def iperf3srv(self, ip_address=None): + if ip_address is None: + ip_address = self.ip_address() + iperf3srv_obj = iperf3.IPerf3Server(self, ip_address) + return iperf3srv_obj + def msisdn(self): msisdn = self.resources_pool.next_msisdn(self) self.log('using MSISDN', msisdn) diff --git a/suites/gprs/iperf3.py b/suites/gprs/iperf3.py new file mode 100755 index 0000000..a1dd62c --- /dev/null +++ b/suites/gprs/iperf3.py @@ -0,0 +1,74 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +def print_results(cli_res, srv_res): + cli_sent = cli_res['end']['sum_sent'] + cli_recv = cli_res['end']['sum_received'] + print("RESULT client:") + print("\tSEND: %d KB, %d kbps, %d seconds (%d retrans)" % (cli_sent['bytes']/1000, cli_sent['bits_per_second']/1000, cli_sent['seconds'], cli_sent['retransmits'])) + print("\tRECV: %d KB, %d kbps, %d seconds" % (cli_recv['bytes']/1000, cli_recv['bits_per_second']/1000, cli_recv['seconds'])) + print("RESULT server:") + print("\tSEND: %d KB, %d kbps, %d seconds" % (cli_sent['bytes']/1000, cli_sent['bits_per_second']/1000, cli_sent['seconds'])) + print("\tRECV: %d KB, %d kbps, %d seconds" % (cli_recv['bytes']/1000, cli_recv['bits_per_second']/1000, cli_recv['seconds'])) + +hlr = suite.hlr() +bts = suite.bts() +pcu = bts.pcu() +mgw_msc = suite.mgw() +mgw_bsc = suite.mgw() +stp = suite.stp() +ggsn = suite.ggsn() +sgsn = suite.sgsn(hlr, ggsn) +msc = suite.msc(hlr, mgw_msc, stp) +bsc = suite.bsc(msc, mgw_bsc, stp) +ms = suite.modem() +iperf3srv = suite.iperf3srv() +iperf3cli = iperf3srv.create_client() + +bsc.bts_add(bts) +sgsn.bts_add(bts) + +print('start iperfv3 server...') +iperf3srv.start() + +print('start network...') +hlr.start() +stp.start() +ggsn.start() +sgsn.start() +msc.start() +mgw_msc.start() +mgw_bsc.start() +bsc.start() + +bts.start() +wait(bsc.bts_is_connected, bts) +print('Waiting for bts to be ready...') +wait(bts.ready_for_pcu) +pcu.start() + +hlr.subscriber_add(ms) + +ms.connect(msc.mcc_mnc()) +ms.attach() + +ms.log_info() + +print('waiting for modems to attach...') +wait(ms.is_connected, msc.mcc_mnc()) +wait(msc.subscriber_attached, ms) + +print('waiting for modems to attach to data services...') +wait(ms.is_attached) + +# We need to use inet46 since ofono qmi only uses ipv4v6 eua (OS#2713) +ctx_id_v4 = ms.activate_context(apn='inet46', protocol=ms.CTX_PROT_IPv4) +print("Setting up data plan for %r" % repr(ctx_id_v4)) +ms.setup_context_data_plane(ctx_id_v4) + +print("Running iperf3 client to %s through %r" % (iperf3srv.addr(),repr(ctx_id_v4))) +res = iperf3cli.run_test(ms.netns()) +iperf3srv.stop() +print_results(res, iperf3srv.get_results()) + +ms.deactivate_context(ctx_id_v4) diff --git a/suites/gprs/suite.conf b/suites/gprs/suite.conf index 1590b7d..a24bc5d 100644 --- a/suites/gprs/suite.conf +++ b/suites/gprs/suite.conf @@ -1,6 +1,6 @@ resources: ip_address: - - times: 8 # msc, bsc, hlr, stp, mgw*2, sgsn, ggsn + - times: 9 # msc, bsc, hlr, stp, mgw*2, sgsn, ggsn, iperf3srv bts: - times: 1 modem: -- To view, visit https://gerrit.osmocom.org/11476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6ff6bef14feb535d98ca41b9788700d699e1ef1e Gerrit-Change-Number: 11476 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 16:24:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 16:24:24 +0000 Subject: Change in osmo-gsm-tester[master]: utils: Introduce show_usb_device.py In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11460 ) Change subject: utils: Introduce show_usb_device.py ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iec049e2d56d61ecd50b65b64d95d69641fa0f8be Gerrit-Change-Number: 11460 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 26 Oct 2018 16:24:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 16:24:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 16:24:26 +0000 Subject: Change in osmo-gsm-tester[master]: utils: Introduce modem-netns-setup.py In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11461 ) Change subject: utils: Introduce modem-netns-setup.py ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11461 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iadb2df2974e132044fba1f1bc2db8b559912e4e1 Gerrit-Change-Number: 11461 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 26 Oct 2018 16:24:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 16:24:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 16:24:59 +0000 Subject: Change in osmo-gsm-tester[master]: Add support to test gprs IPv4 data plane In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11462 ) Change subject: Add support to test gprs IPv4 data plane ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icb06bdfcdd37c797be95ab5addb28da2d9f6681c Gerrit-Change-Number: 11462 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 26 Oct 2018 16:24:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 17:49:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 17:49:31 +0000 Subject: Change in osmo-gsm-tester[master]: utils: Introduce show_usb_device.py In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11460 ) Change subject: utils: Introduce show_usb_device.py ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iec049e2d56d61ecd50b65b64d95d69641fa0f8be Gerrit-Change-Number: 11460 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 26 Oct 2018 17:49:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 17:50:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 17:50:17 +0000 Subject: Change in osmo-gsm-tester[master]: utils: Introduce show_usb_device.py In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11460 ) Change subject: utils: Introduce show_usb_device.py ...................................................................... Patch Set 2: Code-Review-1 actually, if it's written by somebody else, please simply use GIT_AUTHOR_EMAIL and GIT_AUTHOR_NAME to fix the attribution. There's only one time to get this right, which is in the initial merge. Thanks! -- To view, visit https://gerrit.osmocom.org/11460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iec049e2d56d61ecd50b65b64d95d69641fa0f8be Gerrit-Change-Number: 11460 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 26 Oct 2018 17:50:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 17:50:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 17:50:28 +0000 Subject: Change in osmo-gsm-tester[master]: utils: Introduce modem-netns-setup.py In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11461 ) Change subject: utils: Introduce modem-netns-setup.py ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11461 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iadb2df2974e132044fba1f1bc2db8b559912e4e1 Gerrit-Change-Number: 11461 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 26 Oct 2018 17:50:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 17:50:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 17:50:39 +0000 Subject: Change in osmo-gsm-tester[master]: utils: Add osmo-gsm-tester_setcap_net_*.sh scripts In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11473 ) Change subject: utils: Add osmo-gsm-tester_setcap_net_*.sh scripts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib88a1b7818155fc608cc6ff763300fbd0e03a07a Gerrit-Change-Number: 11473 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 26 Oct 2018 17:50:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 17:51:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 17:51:05 +0000 Subject: Change in osmo-gsm-tester[master]: Add support to test gprs IPv4 data plane In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11462 ) Change subject: Add support to test gprs IPv4 data plane ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icb06bdfcdd37c797be95ab5addb28da2d9f6681c Gerrit-Change-Number: 11462 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 26 Oct 2018 17:51:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 17:51:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 17:51:24 +0000 Subject: Change in osmo-gsm-tester[master]: pcap_recorder: Add support to run in netns In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11474 ) Change subject: pcap_recorder: Add support to run in netns ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie1c848254f221f26c59e7f4bd8c079fe3e7bdfc2 Gerrit-Change-Number: 11474 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 26 Oct 2018 17:51:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 17:51:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 17:51:32 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf: Add extra IPaddr to pool In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11475 ) Change subject: resources.conf: Add extra IPaddr to pool ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11475 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If0f1a6a3f4e99091ed117bc7a77a5e60eccb2425 Gerrit-Change-Number: 11475 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 26 Oct 2018 17:51:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 17:51:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 17:51:57 +0000 Subject: Change in osmo-gsm-tester[master]: Introduce iperf3 testing infrastructure In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11476 ) Change subject: Introduce iperf3 testing infrastructure ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6ff6bef14feb535d98ca41b9788700d699e1ef1e Gerrit-Change-Number: 11476 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 26 Oct 2018 17:51:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 17:52:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 17:52:46 +0000 Subject: Change in osmocom-bb[master]: trxcon: make TRX bind address configurable In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11472 ) Change subject: trxcon: make TRX bind address configurable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic2f43632cc57bb6f722eba05219e438f97fecb95 Gerrit-Change-Number: 11472 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 26 Oct 2018 17:52:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 17:52:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 17:52:47 +0000 Subject: Change in osmocom-bb[master]: trxcon: make TRX bind address configurable In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11472 ) Change subject: trxcon: make TRX bind address configurable ...................................................................... trxcon: make TRX bind address configurable Previously the wildcard address (i.e. '0.0.0.0') was hard-coded as the bind address of TRX interface. Let's make it configurable by introducing a command line option. Note that the '--trx-ip' option was deprecated by '--trx-remote', because it isn't clean whether it is remore or local address. It still can be used, but was removed from help message. Change-Id: Ic2f43632cc57bb6f722eba05219e438f97fecb95 --- M src/host/trxcon/trxcon.c 1 file changed, 17 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Max: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index 84d132e..251321d 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -68,7 +68,8 @@ /* TRX specific */ struct trx_instance *trx; - const char *trx_ip; + const char *trx_bind_ip; + const char *trx_remote_ip; uint16_t trx_base_port; uint32_t trx_fn_advance; } app_data; @@ -152,7 +153,8 @@ printf(" Some help...\n"); printf(" -h --help this text\n"); printf(" -d --debug Change debug flags. Default: %s\n", DEBUG_DEFAULT); - printf(" -i --trx-ip IP address of host runing TRX (default 127.0.0.1)\n"); + printf(" -b --trx-bind TRX bind IP address (default 0.0.0.0)\n"); + printf(" -i --trx-remote TRX remote IP address (default 127.0.0.1)\n"); printf(" -p --trx-port Base port of TRX instance (default 6700)\n"); printf(" -f --trx-advance Scheduler clock advance (default 20)\n"); printf(" -s --socket Listening socket for layer23 (default /tmp/osmocom_l2)\n"); @@ -167,14 +169,18 @@ {"help", 0, 0, 'h'}, {"debug", 1, 0, 'd'}, {"socket", 1, 0, 's'}, + {"trx-bind", 1, 0, 'b'}, + /* NOTE: 'trx-ip' is now an alias for 'trx-remote' + * due to backward compatibility reasons! */ {"trx-ip", 1, 0, 'i'}, + {"trx-remote", 1, 0, 'i'}, {"trx-port", 1, 0, 'p'}, {"trx-advance", 1, 0, 'f'}, {"daemonize", 0, 0, 'D'}, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "d:i:p:f:s:Dh", + c = getopt_long(argc, argv, "d:b:i:p:f:s:Dh", long_options, &option_index); if (c == -1) break; @@ -188,8 +194,11 @@ case 'd': app_data.debug_mask = optarg; break; + case 'b': + app_data.trx_bind_ip = optarg; + break; case 'i': - app_data.trx_ip = optarg; + app_data.trx_remote_ip = optarg; break; case 'p': app_data.trx_base_port = atoi(optarg); @@ -212,7 +221,8 @@ static void init_defaults(void) { app_data.bind_socket = "/tmp/osmocom_l2"; - app_data.trx_ip = "127.0.0.1"; + app_data.trx_remote_ip = "127.0.0.1"; + app_data.trx_bind_ip = "0.0.0.0"; app_data.trx_base_port = 6700; app_data.trx_fn_advance = 20; @@ -274,7 +284,8 @@ goto exit; /* Init transceiver interface */ - rc = trx_if_open(&app_data.trx, "0.0.0.0", app_data.trx_ip, app_data.trx_base_port); + rc = trx_if_open(&app_data.trx, + app_data.trx_bind_ip, app_data.trx_remote_ip, app_data.trx_base_port); if (rc) goto exit; -- To view, visit https://gerrit.osmocom.org/11472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic2f43632cc57bb6f722eba05219e438f97fecb95 Gerrit-Change-Number: 11472 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 17:54:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 17:54:30 +0000 Subject: Change in libosmocore[master]: add osmo_sock_get_{local, remote}_ip{, _port}() In-Reply-To: References: Message-ID: Harald Welte has uploaded a new patch set (#6) to the change originally created by osmith. ( https://gerrit.osmocom.org/11455 ) Change subject: add osmo_sock_get_{local,remote}_ip{,_port}() ...................................................................... add osmo_sock_get_{local,remote}_ip{,_port}() Return only the IP or port of either the local or remote connection, not the whole set of IP and port of both the local and remote connection like osmo_sock_get_name() does it. This is needed for OS#2841, where we only want to print the remote IP. Related: OS#2841 Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 92 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/55/11455/6 -- To view, visit https://gerrit.osmocom.org/11455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 Gerrit-Change-Number: 11455 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 17:54:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 17:54:52 +0000 Subject: Change in libosmocore[master]: add osmo_sock_get_{local, remote}_ip{, _port}() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11455 ) Change subject: add osmo_sock_get_{local,remote}_ip{,_port}() ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 Gerrit-Change-Number: 11455 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Fri, 26 Oct 2018 17:54:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 17:55:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 17:55:06 +0000 Subject: Change in osmo-ci[master]: ansible: ogt: install udhcpc and iperf3 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11471 ) Change subject: ansible: ogt: install udhcpc and iperf3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5beddd74fca726c5ea2c9527836a9f50d92b4ce8 Gerrit-Change-Number: 11471 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 26 Oct 2018 17:55:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 17:55:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 17:55:14 +0000 Subject: Change in osmo-ci[master]: ansible: ogt: Add new local IP addr to be available for resources In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11468 ) Change subject: ansible: ogt: Add new local IP addr to be available for resources ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32574a935289fa208647d16663b77c0708c0572c Gerrit-Change-Number: 11468 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 26 Oct 2018 17:55:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 19:25:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 19:25:48 +0000 Subject: Change in osmo-ci[master]: ansible: ogt: Deploy osmo-gsm-tester_netns_exec.sh In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11465 ) Change subject: ansible: ogt: Deploy osmo-gsm-tester_netns_exec.sh ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11465 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I587dd5630b211a906351f064c718f8f4c5fe6273 Gerrit-Change-Number: 11465 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 26 Oct 2018 19:25:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 19:25:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 19:25:50 +0000 Subject: Change in osmo-ci[master]: ansible: ogt: Add new local IP addr to be available for resources In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11468 ) Change subject: ansible: ogt: Add new local IP addr to be available for resources ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32574a935289fa208647d16663b77c0708c0572c Gerrit-Change-Number: 11468 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 26 Oct 2018 19:25:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 19:25:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 19:25:52 +0000 Subject: Change in osmo-ci[master]: ansible: ogt: install udhcpc and iperf3 In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11471 ) Change subject: ansible: ogt: install udhcpc and iperf3 ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5beddd74fca726c5ea2c9527836a9f50d92b4ce8 Gerrit-Change-Number: 11471 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 26 Oct 2018 19:25:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 19:25:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 19:25:54 +0000 Subject: Change in osmo-ci[master]: ansible: ogt: Deploy osmo-gsm-tester_netns_exec.sh In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11465 ) Change subject: ansible: ogt: Deploy osmo-gsm-tester_netns_exec.sh ...................................................................... ansible: ogt: Deploy osmo-gsm-tester_netns_exec.sh Related: OS#2308 Change-Id: I587dd5630b211a906351f064c718f8f4c5fe6273 --- A ansible/roles/gsm-tester/files/osmo-gsm-tester_netns_exec.sh M ansible/roles/gsm-tester/tasks/main.yml 2 files changed, 18 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/ansible/roles/gsm-tester/files/osmo-gsm-tester_netns_exec.sh b/ansible/roles/gsm-tester/files/osmo-gsm-tester_netns_exec.sh new file mode 100755 index 0000000..336b746 --- /dev/null +++ b/ansible/roles/gsm-tester/files/osmo-gsm-tester_netns_exec.sh @@ -0,0 +1,5 @@ +#!/bin/bash +netns="$1" +shift +#TODO: Later on I may want to call myself with specific ENV and calling sudo in order to run inside the netns but with dropped privileges +ip netns exec $netns "$@" diff --git a/ansible/roles/gsm-tester/tasks/main.yml b/ansible/roles/gsm-tester/tasks/main.yml index 61db8e9..4f57b17 100644 --- a/ansible/roles/gsm-tester/tasks/main.yml +++ b/ansible/roles/gsm-tester/tasks/main.yml @@ -237,6 +237,19 @@ dest: /etc/sudoers.d/osmo-gsm-tester_setcap_net_admin mode: 0440 +- name: create a wrapper script to run processes on modem netns + copy: + src: osmo-gsm-tester_netns_exec.sh + dest: /usr/local/bin/osmo-gsm-tester_netns_exec.sh + mode: 755 + +- name: allow osmo-gsm-tester sudo osmo-gsm-tester_netns_exec.sh + copy: + content: | + %osmo-gsm-tester ALL=(root) NOPASSWD: /usr/local/bin/osmo-gsm-tester_netns_exec.sh + dest: /etc/sudoers.d/osmo-gsm-tester_netns_exec + mode: 0440 + - name: logrotate limit filesizes to 10M copy: content: "maxsize 10M" -- To view, visit https://gerrit.osmocom.org/11465 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I587dd5630b211a906351f064c718f8f4c5fe6273 Gerrit-Change-Number: 11465 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 19:25:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 19:25:54 +0000 Subject: Change in osmo-ci[master]: ansible: ogt: Add new local IP addr to be available for resources In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11468 ) Change subject: ansible: ogt: Add new local IP addr to be available for resources ...................................................................... ansible: ogt: Add new local IP addr to be available for resources Change-Id: I32574a935289fa208647d16663b77c0708c0572c --- M ansible/roles/gsm-tester-network/templates/interface.j2 1 file changed, 8 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/ansible/roles/gsm-tester-network/templates/interface.j2 b/ansible/roles/gsm-tester-network/templates/interface.j2 index c849210..f694261 100644 --- a/ansible/roles/gsm-tester-network/templates/interface.j2 +++ b/ansible/roles/gsm-tester-network/templates/interface.j2 @@ -46,20 +46,25 @@ auto {{ bts_interface }}:8 iface {{ bts_interface }}:8 inet static - address 10.42.42.50 + address 10.42.42.10 netmask 255.255.255.0 auto {{ bts_interface }}:9 iface {{ bts_interface }}:9 inet static - address 10.42.42.51 + address 10.42.42.50 netmask 255.255.255.0 auto {{ bts_interface }}:10 iface {{ bts_interface }}:10 inet static - address 10.42.42.52 + address 10.42.42.51 netmask 255.255.255.0 auto {{ bts_interface }}:11 iface {{ bts_interface }}:11 inet static + address 10.42.42.52 + netmask 255.255.255.0 + +auto {{ bts_interface }}:12 +iface {{ bts_interface }}:12 inet static address 10.42.42.53 netmask 255.255.255.0 -- To view, visit https://gerrit.osmocom.org/11468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I32574a935289fa208647d16663b77c0708c0572c Gerrit-Change-Number: 11468 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 19:25:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 26 Oct 2018 19:25:55 +0000 Subject: Change in osmo-ci[master]: ansible: ogt: install udhcpc and iperf3 In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11471 ) Change subject: ansible: ogt: install udhcpc and iperf3 ...................................................................... ansible: ogt: install udhcpc and iperf3 These tools are used during gprs data plane setup and performance testing. Change-Id: I5beddd74fca726c5ea2c9527836a9f50d92b4ce8 --- M ansible/roles/gsm-tester/tasks/main.yml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/ansible/roles/gsm-tester/tasks/main.yml b/ansible/roles/gsm-tester/tasks/main.yml index 4f57b17..70a0549 100644 --- a/ansible/roles/gsm-tester/tasks/main.yml +++ b/ansible/roles/gsm-tester/tasks/main.yml @@ -122,6 +122,8 @@ - sudo - libcap2-bin - python3-pip + - udhcpc + - iperf3 - name: install gsm tester pip dependencies pip: -- To view, visit https://gerrit.osmocom.org/11471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5beddd74fca726c5ea2c9527836a9f50d92b4ce8 Gerrit-Change-Number: 11471 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 21:48:03 2018 From: gerrit-no-reply at lists.osmocom.org (Omar Ramadan) Date: Fri, 26 Oct 2018 21:48:03 +0000 Subject: Change in osmo-ci[master]: osmo-layer1-headers.sh: Add support for OC-2G In-Reply-To: References: Message-ID: Omar Ramadan has posted comments on this change. ( https://gerrit.osmocom.org/11469 ) Change subject: osmo-layer1-headers.sh: Add support for OC-2G ...................................................................... Patch Set 1: Verified+1 Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iceb62df4511ed50f0286e5762d9ffc4b068f70a6 Gerrit-Change-Number: 11469 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Omar Ramadan Gerrit-Comment-Date: Fri, 26 Oct 2018 21:48:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 22:08:31 2018 From: gerrit-no-reply at lists.osmocom.org (Omar Ramadan) Date: Fri, 26 Oct 2018 22:08:31 +0000 Subject: Change in osmo-bts[master]: Add OC-2G BTS sources In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11447 to look at the new patch set (#2). Change subject: Add OC-2G BTS sources ...................................................................... Add OC-2G BTS sources Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 --- M configure.ac A contrib/systemd/oc2gbts-mgr.service A contrib/systemd/osmo-bts-oc2g.service A doc/examples/oc2g/oc2gbts-mgr.cfg A doc/examples/oc2g/osmo-bts.cfg M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/l1sap.h M include/osmo-bts/phy_link.h M src/Makefile.am M src/common/gsm_data_shared.c A src/osmo-bts-oc2g/Makefile.am A src/osmo-bts-oc2g/calib_file.c A src/osmo-bts-oc2g/hw_info.ver_major A src/osmo-bts-oc2g/hw_misc.c A src/osmo-bts-oc2g/hw_misc.h A src/osmo-bts-oc2g/l1_if.c A src/osmo-bts-oc2g/l1_if.h A src/osmo-bts-oc2g/l1_transp.h A src/osmo-bts-oc2g/l1_transp_hw.c A src/osmo-bts-oc2g/main.c A src/osmo-bts-oc2g/misc/oc2gbts_bid.c A src/osmo-bts-oc2g/misc/oc2gbts_bid.h A src/osmo-bts-oc2g/misc/oc2gbts_bts.c A src/osmo-bts-oc2g/misc/oc2gbts_bts.h A src/osmo-bts-oc2g/misc/oc2gbts_clock.c A src/osmo-bts-oc2g/misc/oc2gbts_clock.h A src/osmo-bts-oc2g/misc/oc2gbts_led.c A src/osmo-bts-oc2g/misc/oc2gbts_led.h A src/osmo-bts-oc2g/misc/oc2gbts_mgr.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr.h A src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_nl.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_temp.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c A src/osmo-bts-oc2g/misc/oc2gbts_misc.c A src/osmo-bts-oc2g/misc/oc2gbts_misc.h A src/osmo-bts-oc2g/misc/oc2gbts_nl.c A src/osmo-bts-oc2g/misc/oc2gbts_nl.h A src/osmo-bts-oc2g/misc/oc2gbts_par.c A src/osmo-bts-oc2g/misc/oc2gbts_par.h A src/osmo-bts-oc2g/misc/oc2gbts_power.c A src/osmo-bts-oc2g/misc/oc2gbts_power.h A src/osmo-bts-oc2g/misc/oc2gbts_swd.c A src/osmo-bts-oc2g/misc/oc2gbts_swd.h A src/osmo-bts-oc2g/misc/oc2gbts_temp.c A src/osmo-bts-oc2g/misc/oc2gbts_temp.h A src/osmo-bts-oc2g/misc/oc2gbts_util.c A src/osmo-bts-oc2g/oc2gbts.c A src/osmo-bts-oc2g/oc2gbts.h A src/osmo-bts-oc2g/oc2gbts_vty.c A src/osmo-bts-oc2g/oml.c A src/osmo-bts-oc2g/oml_router.c A src/osmo-bts-oc2g/oml_router.h A src/osmo-bts-oc2g/tch.c A src/osmo-bts-oc2g/utils.c A src/osmo-bts-oc2g/utils.h 56 files changed, 13,518 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/47/11447/2 -- To view, visit https://gerrit.osmocom.org/11447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 Gerrit-Change-Number: 11447 Gerrit-PatchSet: 2 Gerrit-Owner: Omar Ramadan Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 22:08:58 2018 From: gerrit-no-reply at lists.osmocom.org (Omar Ramadan) Date: Fri, 26 Oct 2018 22:08:58 +0000 Subject: Change in osmo-bts[master]: Add OC-2G systemd service and config In-Reply-To: References: Message-ID: Omar Ramadan has abandoned this change. ( https://gerrit.osmocom.org/11448 ) Change subject: Add OC-2G systemd service and config ...................................................................... Abandoned Squashing into 11447 -- To view, visit https://gerrit.osmocom.org/11448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ic4b5a97b9677051442f3c3341ba23add35b43715 Gerrit-Change-Number: 11448 Gerrit-PatchSet: 1 Gerrit-Owner: Omar Ramadan Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 22:09:08 2018 From: gerrit-no-reply at lists.osmocom.org (Omar Ramadan) Date: Fri, 26 Oct 2018 22:09:08 +0000 Subject: Change in osmo-bts[master]: Add OC-2G to build In-Reply-To: References: Message-ID: Omar Ramadan has abandoned this change. ( https://gerrit.osmocom.org/11449 ) Change subject: Add OC-2G to build ...................................................................... Abandoned Squashing into 11447 -- To view, visit https://gerrit.osmocom.org/11449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I4a8dcf759a2818c8e457bcb82775c4e60c94d771 Gerrit-Change-Number: 11449 Gerrit-PatchSet: 1 Gerrit-Owner: Omar Ramadan Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 22:17:22 2018 From: gerrit-no-reply at lists.osmocom.org (Omar Ramadan) Date: Fri, 26 Oct 2018 22:17:22 +0000 Subject: Change in osmo-bts[master]: Add OC-2G BTS sources In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11447 to look at the new patch set (#3). Change subject: Add OC-2G BTS sources ...................................................................... Add OC-2G BTS sources Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 --- M configure.ac A contrib/systemd/oc2gbts-mgr.service A contrib/systemd/osmo-bts-oc2g.service A doc/examples/oc2g/oc2gbts-mgr.cfg A doc/examples/oc2g/osmo-bts.cfg M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/phy_link.h M src/Makefile.am M src/common/gsm_data_shared.c A src/osmo-bts-oc2g/Makefile.am A src/osmo-bts-oc2g/calib_file.c A src/osmo-bts-oc2g/hw_info.ver_major A src/osmo-bts-oc2g/hw_misc.c A src/osmo-bts-oc2g/hw_misc.h A src/osmo-bts-oc2g/l1_if.c A src/osmo-bts-oc2g/l1_if.h A src/osmo-bts-oc2g/l1_transp.h A src/osmo-bts-oc2g/l1_transp_hw.c A src/osmo-bts-oc2g/main.c A src/osmo-bts-oc2g/misc/oc2gbts_bid.c A src/osmo-bts-oc2g/misc/oc2gbts_bid.h A src/osmo-bts-oc2g/misc/oc2gbts_bts.c A src/osmo-bts-oc2g/misc/oc2gbts_bts.h A src/osmo-bts-oc2g/misc/oc2gbts_clock.c A src/osmo-bts-oc2g/misc/oc2gbts_clock.h A src/osmo-bts-oc2g/misc/oc2gbts_led.c A src/osmo-bts-oc2g/misc/oc2gbts_led.h A src/osmo-bts-oc2g/misc/oc2gbts_mgr.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr.h A src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_nl.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_temp.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c A src/osmo-bts-oc2g/misc/oc2gbts_misc.c A src/osmo-bts-oc2g/misc/oc2gbts_misc.h A src/osmo-bts-oc2g/misc/oc2gbts_nl.c A src/osmo-bts-oc2g/misc/oc2gbts_nl.h A src/osmo-bts-oc2g/misc/oc2gbts_par.c A src/osmo-bts-oc2g/misc/oc2gbts_par.h A src/osmo-bts-oc2g/misc/oc2gbts_power.c A src/osmo-bts-oc2g/misc/oc2gbts_power.h A src/osmo-bts-oc2g/misc/oc2gbts_swd.c A src/osmo-bts-oc2g/misc/oc2gbts_swd.h A src/osmo-bts-oc2g/misc/oc2gbts_temp.c A src/osmo-bts-oc2g/misc/oc2gbts_temp.h A src/osmo-bts-oc2g/misc/oc2gbts_util.c A src/osmo-bts-oc2g/oc2gbts.c A src/osmo-bts-oc2g/oc2gbts.h A src/osmo-bts-oc2g/oc2gbts_vty.c A src/osmo-bts-oc2g/oml.c A src/osmo-bts-oc2g/oml_router.c A src/osmo-bts-oc2g/oml_router.h A src/osmo-bts-oc2g/tch.c A src/osmo-bts-oc2g/utils.c A src/osmo-bts-oc2g/utils.h 55 files changed, 13,517 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/47/11447/3 -- To view, visit https://gerrit.osmocom.org/11447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 Gerrit-Change-Number: 11447 Gerrit-PatchSet: 3 Gerrit-Owner: Omar Ramadan Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 22:28:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 26 Oct 2018 22:28:56 +0000 Subject: Change in libosmocore[master]: add osmo_sock_get_{local, remote}_ip{, _port}() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11455 ) Change subject: add osmo_sock_get_{local,remote}_ip{,_port}() ...................................................................... add osmo_sock_get_{local,remote}_ip{,_port}() Return only the IP or port of either the local or remote connection, not the whole set of IP and port of both the local and remote connection like osmo_sock_get_name() does it. This is needed for OS#2841, where we only want to print the remote IP. Related: OS#2841 Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 92 insertions(+), 25 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index f23a243..28f89a5 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -9,6 +9,7 @@ #include #include +#include struct sockaddr; struct osmo_fd; @@ -56,6 +57,11 @@ const char *socket_path, unsigned int flags); char *osmo_sock_get_name(void *ctx, int fd); +int osmo_sock_get_local_ip(int fd, char *host, size_t len); +int osmo_sock_get_local_ip_port(int fd, char *port, size_t len); +int osmo_sock_get_remote_ip(int fd, char *host, size_t len); +int osmo_sock_get_remote_ip_port(int fd, char *port, size_t len); + int osmo_sock_mcast_loop_set(int fd, bool enable); int osmo_sock_mcast_ttl_set(int fd, uint8_t ttl); diff --git a/src/socket.c b/src/socket.c index bb5505f..c7e1c9d 100644 --- a/src/socket.c +++ b/src/socket.c @@ -682,6 +682,86 @@ return osmo_fd_init_ofd(ofd, osmo_sock_unix_init(type, proto, socket_path, flags)); } +/*! Get the IP and/or port number on socket. This is for internal usage. + * Convenience wrappers: osmo_sock_get_local_ip(), + * osmo_sock_get_local_ip_port(), osmo_sock_get_remote_ip(), + * osmo_sock_get_remote_ip_port() and osmo_sock_get_name() + * \param[in] fd file descriptor of socket + * \param[out] ip IP address (will be filled in when not NULL) + * \param[in] ip_len length of the ip buffer + * \param[out] port number (will be filled in when not NULL) + * \param[in] port_len length of the port buffer + * \param[in] local (true) or remote (false) name will get looked at + * \returns 0 on success; negative otherwise + */ +static int osmo_sock_get_name2(int fd, char *ip, size_t ip_len, char *port, size_t port_len, bool local) +{ + struct sockaddr sa; + socklen_t len = sizeof(sa); + char ipbuf[64], portbuf[16]; + int rc; + + rc = local ? getsockname(fd, &sa, &len) : getpeername(fd, &sa, &len); + if (rc < 0) + return rc; + + rc = getnameinfo(&sa, len, ipbuf, sizeof(ipbuf), + portbuf, sizeof(portbuf), + NI_NUMERICHOST | NI_NUMERICSERV); + if (rc < 0) + return rc; + + if (ip) + strncpy(ip, ipbuf, ip_len); + if (port) + strncpy(port, portbuf, port_len); + return 0; +} + +/*! Get local IP address on socket + * \param[in] fd file descriptor of socket + * \param[out] ip IP address (will be filled in) + * \param[in] len length of the output buffer + * \returns 0 on success; negative otherwise + */ +int osmo_sock_get_local_ip(int fd, char *ip, size_t len) +{ + return osmo_sock_get_name2(fd, ip, len, NULL, 0, true); +} + +/*! Get local port on socket + * \param[in] fd file descriptor of socket + * \param[out] port number (will be filled in) + * \param[in] len length of the output buffer + * \returns 0 on success; negative otherwise + */ +int osmo_sock_get_local_ip_port(int fd, char *port, size_t len) +{ + return osmo_sock_get_name2(fd, NULL, 0, port, len, true); +} + +/*! Get remote IP address on socket + * \param[in] fd file descriptor of socket + * \param[out] ip IP address (will be filled in) + * \param[in] len length of the output buffer + * \returns 0 on success; negative otherwise + */ +int osmo_sock_get_remote_ip(int fd, char *ip, size_t len) +{ + return osmo_sock_get_name2(fd, ip, len, NULL, 0, false); +} + +/*! Get remote port on socket + * \param[in] fd file descriptor of socket + * \param[out] port number (will be filled in) + * \param[in] len length of the output buffer + * \returns 0 on success; negative otherwise + */ +int osmo_sock_get_remote_ip_port(int fd, char *port, size_t len) +{ + return osmo_sock_get_name2(fd, NULL, 0, port, len, false); +} + /*! Get address/port information on socket in dyn-alloc string * \param[in] ctx talloc context from which to allocate string buffer * \param[in] fd file descriptor of socket @@ -689,37 +769,18 @@ */ char *osmo_sock_get_name(void *ctx, int fd) { - struct sockaddr sa_l, sa_r; - socklen_t sa_len_l = sizeof(sa_l); - socklen_t sa_len_r = sizeof(sa_r); char hostbuf_l[64], hostbuf_r[64]; char portbuf_l[16], portbuf_r[16]; - int rc; - rc = getsockname(fd, &sa_l, &sa_len_l); - if (rc < 0) + /* get local */ + if (osmo_sock_get_name2(fd, hostbuf_l, sizeof(hostbuf_l), portbuf_l, sizeof(portbuf_l), true)) return NULL; - rc = getnameinfo(&sa_l, sa_len_l, hostbuf_l, sizeof(hostbuf_l), - portbuf_l, sizeof(portbuf_l), - NI_NUMERICHOST | NI_NUMERICSERV); - if (rc < 0) - return NULL; + /* get remote */ + if (!osmo_sock_get_name2(fd, hostbuf_r, sizeof(hostbuf_r), portbuf_r, sizeof(portbuf_r), false)) + return talloc_asprintf(ctx, "(r=%s:%s<->l=%s:%s)", hostbuf_r, portbuf_r, hostbuf_l, portbuf_l); - rc = getpeername(fd, &sa_r, &sa_len_r); - if (rc < 0) - goto local_only; - - rc = getnameinfo(&sa_r, sa_len_r, hostbuf_r, sizeof(hostbuf_r), - portbuf_r, sizeof(portbuf_r), - NI_NUMERICHOST | NI_NUMERICSERV); - if (rc < 0) - goto local_only; - - return talloc_asprintf(ctx, "(r=%s:%s<->l=%s:%s)", hostbuf_r, portbuf_r, - hostbuf_l, portbuf_l); - -local_only: + /* local only: different format */ return talloc_asprintf(ctx, "(r=NULL<->l=%s:%s)", hostbuf_l, portbuf_l); } -- To view, visit https://gerrit.osmocom.org/11455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6803c204771c59a2002bc6a0e6b79c83c35f87e1 Gerrit-Change-Number: 11455 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 22:37:42 2018 From: gerrit-no-reply at lists.osmocom.org (Omar Ramadan) Date: Fri, 26 Oct 2018 22:37:42 +0000 Subject: Change in osmo-bts[master]: Add OC-2G BTS sources In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11447 to look at the new patch set (#4). Change subject: Add OC-2G BTS sources ...................................................................... Add OC-2G BTS sources Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 --- M configure.ac M contrib/jenkins_bts_model.sh A contrib/jenkins_oc2g.sh A contrib/systemd/oc2gbts-mgr.service A contrib/systemd/osmo-bts-oc2g.service A doc/examples/oc2g/oc2gbts-mgr.cfg A doc/examples/oc2g/osmo-bts.cfg M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/phy_link.h M src/Makefile.am M src/common/gsm_data_shared.c A src/osmo-bts-oc2g/Makefile.am A src/osmo-bts-oc2g/calib_file.c A src/osmo-bts-oc2g/hw_info.ver_major A src/osmo-bts-oc2g/hw_misc.c A src/osmo-bts-oc2g/hw_misc.h A src/osmo-bts-oc2g/l1_if.c A src/osmo-bts-oc2g/l1_if.h A src/osmo-bts-oc2g/l1_transp.h A src/osmo-bts-oc2g/l1_transp_hw.c A src/osmo-bts-oc2g/main.c A src/osmo-bts-oc2g/misc/oc2gbts_bid.c A src/osmo-bts-oc2g/misc/oc2gbts_bid.h A src/osmo-bts-oc2g/misc/oc2gbts_bts.c A src/osmo-bts-oc2g/misc/oc2gbts_bts.h A src/osmo-bts-oc2g/misc/oc2gbts_clock.c A src/osmo-bts-oc2g/misc/oc2gbts_clock.h A src/osmo-bts-oc2g/misc/oc2gbts_led.c A src/osmo-bts-oc2g/misc/oc2gbts_led.h A src/osmo-bts-oc2g/misc/oc2gbts_mgr.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr.h A src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_nl.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_temp.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c A src/osmo-bts-oc2g/misc/oc2gbts_misc.c A src/osmo-bts-oc2g/misc/oc2gbts_misc.h A src/osmo-bts-oc2g/misc/oc2gbts_nl.c A src/osmo-bts-oc2g/misc/oc2gbts_nl.h A src/osmo-bts-oc2g/misc/oc2gbts_par.c A src/osmo-bts-oc2g/misc/oc2gbts_par.h A src/osmo-bts-oc2g/misc/oc2gbts_power.c A src/osmo-bts-oc2g/misc/oc2gbts_power.h A src/osmo-bts-oc2g/misc/oc2gbts_swd.c A src/osmo-bts-oc2g/misc/oc2gbts_swd.h A src/osmo-bts-oc2g/misc/oc2gbts_temp.c A src/osmo-bts-oc2g/misc/oc2gbts_temp.h A src/osmo-bts-oc2g/misc/oc2gbts_util.c A src/osmo-bts-oc2g/oc2gbts.c A src/osmo-bts-oc2g/oc2gbts.h A src/osmo-bts-oc2g/oc2gbts_vty.c A src/osmo-bts-oc2g/oml.c A src/osmo-bts-oc2g/oml_router.c A src/osmo-bts-oc2g/oml_router.h A src/osmo-bts-oc2g/tch.c A src/osmo-bts-oc2g/utils.c A src/osmo-bts-oc2g/utils.h 57 files changed, 13,546 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/47/11447/4 -- To view, visit https://gerrit.osmocom.org/11447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 Gerrit-Change-Number: 11447 Gerrit-PatchSet: 4 Gerrit-Owner: Omar Ramadan Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 22:45:55 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 26 Oct 2018 22:45:55 +0000 Subject: Change in osmocom-bb[master]: l1ctl_proto.h: use flexible array member for traffic messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11395 ) Change subject: l1ctl_proto.h: use flexible array member for traffic messages ...................................................................... Patch Set 2: > this may need synchronization with other implementations of > l1ctl_proto, such as the TTCN-3 code? Sure, thanks! -- To view, visit https://gerrit.osmocom.org/11395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I119fa36c84e95c3003d57c19e25f8146ed45c3c6 Gerrit-Change-Number: 11395 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 26 Oct 2018 22:45:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 22:57:08 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 26 Oct 2018 22:57:08 +0000 Subject: Change in osmocom-bb[master]: layer23/common: move signal loss criteria to L23SAP In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11251 to look at the new patch set (#2). Change subject: layer23/common: move signal loss criteria to L23SAP ...................................................................... layer23/common: move signal loss criteria to L23SAP Change-Id: Ib70bf9104cf3b5489413dd90819fd4955ec16f95 --- M src/host/layer23/src/common/l1ctl.c M src/host/layer23/src/common/l23sap.c 2 files changed, 83 insertions(+), 67 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/51/11251/2 -- To view, visit https://gerrit.osmocom.org/11251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib70bf9104cf3b5489413dd90819fd4955ec16f95 Gerrit-Change-Number: 11251 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 22:57:09 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 26 Oct 2018 22:57:09 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: fix: use host byte order for TDMA fn Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11477 Change subject: layer23/l1ctl.c: fix: use host byte order for TDMA fn ...................................................................... layer23/l1ctl.c: fix: use host byte order for TDMA fn Change-Id: Iad00eebf03b38b9c4fc2d7ed66697d23a953d8b2 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/77/11477/1 diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index b3f73a8..96db52f 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -180,7 +180,7 @@ * - select correct paging block that is for us. * - initialize ds_fail according to BS_PA_MFRMS. */ - if ((dl->frame_nr % 51) != 6) + if ((meas->last_fn % 51) != 6) break; if (!meas->ds_fail) break; -- To view, visit https://gerrit.osmocom.org/11477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iad00eebf03b38b9c4fc2d7ed66697d23a953d8b2 Gerrit-Change-Number: 11477 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 22:57:10 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 26 Oct 2018 22:57:10 +0000 Subject: Change in osmocom-bb[master]: (WIP) misc/cbch_sacn: indicate CBCH cbits to L1/PHY Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11478 Change subject: (WIP) misc/cbch_sacn: indicate CBCH cbits to L1/PHY ...................................................................... (WIP) misc/cbch_sacn: indicate CBCH cbits to L1/PHY Change-Id: If19f2b2ed645c0f6f5baf7ed853b41011603f1a0 --- M src/host/layer23/src/misc/app_cbch_sniff.c 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/78/11478/1 diff --git a/src/host/layer23/src/misc/app_cbch_sniff.c b/src/host/layer23/src/misc/app_cbch_sniff.c index 8256eaf..4d50c15 100644 --- a/src/host/layer23/src/misc/app_cbch_sniff.c +++ b/src/host/layer23/src/misc/app_cbch_sniff.c @@ -48,6 +48,12 @@ return 0; } +#define L1SAP_CHAN_IS_SDCCH4(chan_nr) ((chan_nr >> 3) & 3) +#define L1SAP_CHAN_IS_SDCCH8(chan_nr) ((chan_nr >> 3) & 7) +#define L1SAP_SDCCH_TO_CBCH(chan_nr) \ + (L1SAP_CHAN_IS_SDCCH4(chan_nr) ? ((0x18 << 3) | (chan_nr & 0x07)) \ + : L1SAP_CHAN_IS_SDCCH8(chan_nr) ? ((0x19 << 3) | (chan_nr & 0x07)) : 0x00) + if (s->h) { LOGP(DRR, LOGL_INFO, "chan_nr = 0x%02x TSC = %d MAIO = %d " "HSN = %d hseq (%d): %s\n", @@ -56,13 +62,13 @@ osmo_hexdump((unsigned char *) s->hopping, s->hopp_len * 2)); return l1ctl_tx_dm_est_req_h1(ms, s->maio, s->hsn, s->hopping, s->hopp_len, - s->chan_nr, s->tsc, + L1SAP_SDCCH_TO_CBCH(s->chan_nr), s->tsc, GSM48_CMODE_SIGN, 0); } else { LOGP(DRR, LOGL_INFO, "chan_nr = 0x%02x TSC = %d ARFCN = %d\n", s->chan_nr, s->tsc, s->arfcn); return l1ctl_tx_dm_est_req_h0(ms, s->arfcn, - s->chan_nr, s->tsc, GSM48_CMODE_SIGN, 0); + L1SAP_SDCCH_TO_CBCH(s->chan_nr), s->tsc, GSM48_CMODE_SIGN, 0); } } -- To view, visit https://gerrit.osmocom.org/11478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If19f2b2ed645c0f6f5baf7ed853b41011603f1a0 Gerrit-Change-Number: 11478 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 22:57:10 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 26 Oct 2018 22:57:10 +0000 Subject: Change in osmocom-bb[master]: layer23/ccch_scan: unwrap dump_bcch() as gsm48_rx_bcch() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11479 Change subject: layer23/ccch_scan: unwrap dump_bcch() as gsm48_rx_bcch() ...................................................................... layer23/ccch_scan: unwrap dump_bcch() as gsm48_rx_bcch() Change-Id: I382fbdb60513324164cd1147c36f3367bb6fb22c --- M src/host/layer23/src/misc/app_ccch_scan.c 1 file changed, 11 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/79/11479/1 diff --git a/src/host/layer23/src/misc/app_ccch_scan.c b/src/host/layer23/src/misc/app_ccch_scan.c index 88a2bef..4c88ded 100644 --- a/src/host/layer23/src/misc/app_ccch_scan.c +++ b/src/host/layer23/src/misc/app_ccch_scan.c @@ -130,11 +130,16 @@ l1ctl_tx_ccch_mode_req(ms, app_state.ccch_mode); } -static void dump_bcch(struct osmocom_ms *ms, uint8_t tc, const uint8_t *data) +int gsm48_rx_bcch(struct msgb *msg, struct osmocom_ms *ms) { struct gsm48_system_information_type_header *si_hdr; - si_hdr = (struct gsm48_system_information_type_header *) data; - uint8_t si_type = si_hdr->system_information; + uint8_t si_type, tc = 0; + + /* FIXME: we have lost the gsm frame time until here, + * need to store it in some msgb context, so tc=0 */ + + si_hdr = (struct gsm48_system_information_type_header *) msg->l3h; + si_type = si_hdr->system_information; LOGP(DRR, LOGL_INFO, "BCCH message (type=0x%02x): %s\n", si_type, gsm48_rr_msg_name(si_type)); @@ -146,13 +151,15 @@ switch (si_type) { case GSM48_MT_RR_SYSINFO_3: handle_si3(ms, - (struct gsm48_system_information_type_3 *) data); + (struct gsm48_system_information_type_3 *) si_hdr); break; default: /* We don't care about other types of SI */ break; /* thus there is nothing to do */ }; + + return 0; } @@ -446,16 +453,6 @@ return rc; } -int gsm48_rx_bcch(struct msgb *msg, struct osmocom_ms *ms) -{ - /* FIXME: we have lost the gsm frame time until here, need to store it - * in some msgb context */ - //dump_bcch(dl->time.tc, ccch->data); - dump_bcch(ms, 0, msg->l3h); - - return 0; -} - void layer3_app_reset(void) { /* Reset state */ -- To view, visit https://gerrit.osmocom.org/11479 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I382fbdb60513324164cd1147c36f3367bb6fb22c Gerrit-Change-Number: 11479 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 22:58:05 2018 From: gerrit-no-reply at lists.osmocom.org (Omar Ramadan) Date: Fri, 26 Oct 2018 22:58:05 +0000 Subject: Change in osmo-bts[master]: Add OC-2G BTS sources In-Reply-To: References: Message-ID: Omar Ramadan has posted comments on this change. ( https://gerrit.osmocom.org/11447 ) Change subject: Add OC-2G BTS sources ...................................................................... Patch Set 4: Thanks for the review Harald. I've squashed the changes as requested and have also added oc2g as a target to jenkins_bts_model which I have verified as passing. However, it hasn't shown up in jenkins (I think we need to add the target configuration) -- To view, visit https://gerrit.osmocom.org/11447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 Gerrit-Change-Number: 11447 Gerrit-PatchSet: 4 Gerrit-Owner: Omar Ramadan Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Omar Ramadan Gerrit-Comment-Date: Fri, 26 Oct 2018 22:58:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 22:58:09 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 26 Oct 2018 22:58:09 +0000 Subject: Change in osmocom-bb[master]: layer23/l23sap.c: fix: use host byte order for dl->frame_nr In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/11252 ) Change subject: layer23/l23sap.c: fix: use host byte order for dl->frame_nr ...................................................................... Abandoned See 11477. -- To view, visit https://gerrit.osmocom.org/11252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ic72b04b4bb6990413578b1e9f4499fe98acf5d85 Gerrit-Change-Number: 11252 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 22:58:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 26 Oct 2018 22:58:58 +0000 Subject: Change in osmocom-bb[master]: layer23/l23sap.c: use the CHAN_IS_SACCH() macro In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/11253 ) Change subject: layer23/l23sap.c: use the CHAN_IS_SACCH() macro ...................................................................... Abandoned Merged into 11251. -- To view, visit https://gerrit.osmocom.org/11253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I25200bbcd174882b37e7c628e7f1204c488aa258 Gerrit-Change-Number: 11253 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 22:59:51 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 26 Oct 2018 22:59:51 +0000 Subject: Change in osmocom-bb[master]: layer23/common: move SIM APDU caching from l1ctl.c In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11247 ) Change subject: layer23/common: move SIM APDU caching from l1ctl.c ...................................................................... layer23/common: move SIM APDU caching from l1ctl.c L1CTL implementation (i.e. l1ctl.c) is not a good place for the SIM specific stuff. Let's move it to the proper place (i.e. sim.c). As a bonus, this change fixes a possible problem of loosing the cached APDUs if two or more L2&3 applications are using a single LAPDm connection. The APDU buffer is dedicated per MS now. Change-Id: I564c610e45aa3b630ca5d1ec6bc1cace0dc9c566 --- M src/host/layer23/include/osmocom/bb/common/sim.h M src/host/layer23/src/common/l1ctl.c M src/host/layer23/src/common/sim.c 3 files changed, 29 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/common/sim.h b/src/host/layer23/include/osmocom/bb/common/sim.h index 95d2147..8b1f830 100644 --- a/src/host/layer23/include/osmocom/bb/common/sim.h +++ b/src/host/layer23/include/osmocom/bb/common/sim.h @@ -176,6 +176,10 @@ uint8_t reset; uint8_t chv1_remain, chv2_remain; uint8_t unblk1_remain, unblk2_remain; + + /* APDU cache (used by GSMTAP) */ + uint8_t apdu_data[256 + 7]; + uint16_t apdu_len; }; struct sim_hdr { diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 6f4a6d8..b3f73a8 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -50,9 +50,6 @@ extern struct gsmtap_inst *gsmtap_inst; -static int apdu_len = -1; -static uint8_t apdu_data[256 + 7]; - static struct msgb *osmo_l1_alloc(uint8_t msg_type) { struct l1ctl_hdr *l1h; @@ -620,12 +617,6 @@ struct msgb *msg; uint8_t *dat; - if (length <= sizeof(apdu_data)) { - memcpy(apdu_data, data, length); - apdu_len = length; - } else - apdu_len = -1; - msg = osmo_l1_alloc(L1CTL_SIM_REQ); if (!msg) return -1; @@ -642,13 +633,6 @@ uint16_t len = msgb_l2len(msg); uint8_t *data = msg->data; - if (apdu_len > -1 && apdu_len + len <= sizeof(apdu_data)) { - memcpy(apdu_data + apdu_len, data, len); - apdu_len += len; - gsmtap_send_ex(gsmtap_inst, GSMTAP_TYPE_SIM, 0, 0, 0, 0, 0, 0, - 0, apdu_data, apdu_len); - } - LOGP(DL1C, LOGL_INFO, "SIM %s\n", osmo_hexdump(data, len)); sim_apdu_resp(ms, msg); diff --git a/src/host/layer23/src/common/sim.c b/src/host/layer23/src/common/sim.c index c2d6033..7f5240d 100644 --- a/src/host/layer23/src/common/sim.c +++ b/src/host/layer23/src/common/sim.c @@ -24,11 +24,15 @@ #include #include #include +#include +#include #include #include #include +extern struct gsmtap_inst *gsmtap_inst; + static int sim_process_job(struct osmocom_ms *ms); /* @@ -185,6 +189,16 @@ LOGP(DSIM, LOGL_INFO, "sending APDU (class 0x%02x, ins 0x%02x)\n", data[0], data[1]); + /* Cache this APDU, so it can be sent to GSMTAP on response */ + if (length <= sizeof(ms->sim.apdu_data)) { + memcpy(ms->sim.apdu_data, data, length); + ms->sim.apdu_len = length; + } else { + LOGP(DSIM, LOGL_NOTICE, "Cannot cache SIM APDU " + "(len=%u), so it won't be sent to GSMTAP\n", length); + ms->sim.apdu_len = 0; + } + /* adding SAP client support * it makes more sense to do it here then in L1CTL */ if (ms->subscr.sim_type == GSM_SIM_TYPE_SAP) { @@ -861,6 +875,17 @@ struct gsm1111_response_mfdf_gsm *mfdf_gsm; int i; + /* If there is cached APDU */ + if (ms->sim.apdu_len) { + /* ... and APDU buffer has enough space, send it to GSMTAP */ + if ((ms->sim.apdu_len + length) <= sizeof(ms->sim.apdu_data)) { + memcpy(ms->sim.apdu_data + ms->sim.apdu_len, data, length); + ms->sim.apdu_len += length; + gsmtap_send_ex(gsmtap_inst, GSMTAP_TYPE_SIM, + 0, 0, 0, 0, 0, 0, 0, ms->sim.apdu_data, ms->sim.apdu_len); + } + } + /* ignore, if current job already gone */ if (!sim->job_msg) { LOGP(DSIM, LOGL_ERROR, "received APDU but no job, " -- To view, visit https://gerrit.osmocom.org/11247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I564c610e45aa3b630ca5d1ec6bc1cace0dc9c566 Gerrit-Change-Number: 11247 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 23:04:09 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 26 Oct 2018 23:04:09 +0000 Subject: Change in osmocom-bb[master]: mobile: cleanup app init In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11456 ) Change subject: mobile: cleanup app init ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11456/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11456/1//COMMIT_MSG at 9 PS1, Line 9: remove redundant printf > ok, fine. Let's do this removement in a separate change, because this is the only part I would vote +1. Other points look useless for me, sorry. -- To view, visit https://gerrit.osmocom.org/11456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idc38feb03656bd9a52aa29095ff7423e0e6ad53b Gerrit-Change-Number: 11456 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 26 Oct 2018 23:04:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 23:47:28 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 26 Oct 2018 23:47:28 +0000 Subject: Change in pysim[master]: pySim/transport: introduce Calypso based reader interface Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11480 Change subject: pySim/transport: introduce Calypso based reader interface ...................................................................... pySim/transport: introduce Calypso based reader interface This interface allows to use a Calypso based phone (e.g. Motorola C1XX) as a SIM card reader. It basically implements a few L1CTL messages that are used to interact with the SIM card through the OsmocomBB 'layer1' firmware. Please note, that this is an experimental implementation, and there is a risk that SIM programming would fail. Nevertheless, I've managed to program and read one of my SIMs a few times. Change-Id: Iec8101140581bf9e2cf7cf3a0b54bdf1875fc51b --- M pySim/exceptions.py A pySim/transport/calypso.py 2 files changed, 160 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/80/11480/1 diff --git a/pySim/exceptions.py b/pySim/exceptions.py index 403f54c..831b1c9 100644 --- a/pySim/exceptions.py +++ b/pySim/exceptions.py @@ -31,3 +31,6 @@ class ProtocolError(exceptions.Exception): pass + +class ReaderError(exceptions.Exception): + pass diff --git a/pySim/transport/calypso.py b/pySim/transport/calypso.py new file mode 100644 index 0000000..c0cfcbb --- /dev/null +++ b/pySim/transport/calypso.py @@ -0,0 +1,157 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +""" pySim: Transport Link for Calypso bases phones +""" + +# +# Copyright (C) 2018 Vadim Yanitskiy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +from __future__ import absolute_import + +import select +import struct +import socket +import os + +from pySim.transport import LinkBase +from pySim.exceptions import * +from pySim.utils import h2b, b2h +from pySim.utils import h2i, i2h + +class L1CTLMessage(object): + + # Every (encoded) L1CTL message has the following structure: + # - msg_length (2 bytes, net order) + # - l1ctl_hdr (packed structure) + # - msg_type + # - flags + # - padding (2 spare bytes) + # - ... payload ... + + def __init__(self, msg_type, flags = 0x00): + # Init L1CTL message header + self.data = struct.pack("BBxx", msg_type, flags) + + def gen_msg(self): + return struct.pack("!H", len(self.data)) + self.data + +class L1CTLMessageReset(L1CTLMessage): + + # L1CTL message types + L1CTL_RESET_REQ = 0x0d + L1CTL_RESET_IND = 0x07 + L1CTL_RESET_CONF = 0x0e + + # Reset types + L1CTL_RES_T_BOOT = 0x00 + L1CTL_RES_T_FULL = 0x01 + L1CTL_RES_T_SCHED = 0x02 + + def __init__(self, type = L1CTL_RES_T_FULL): + super(L1CTLMessageReset, self).__init__(self.L1CTL_RESET_REQ) + self.data += struct.pack("Bxxx", type) + +class L1CTLMessageSIM(L1CTLMessage): + + # SIM related message types + L1CTL_SIM_REQ = 0x16 + L1CTL_SIM_CONF = 0x17 + + def __init__(self, pdu): + super(L1CTLMessageSIM, self).__init__(self.L1CTL_SIM_REQ) + self.data += pdu + +class CalypsoSimLink(LinkBase): + + def __init__(self, sock_path = "/tmp/osmocom_l2"): + # Make sure that a given socket path exists + if not os.path.exists(sock_path): + raise ReaderError("There is no such ('%s') UNIX socket" % sock_path) + + print("Connecting to osmocon at '%s'..." % sock_path) + + # Establish a client connection + self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + self.sock.connect(sock_path) + + def __del__(self): + self.sock.close() + + def reset_card(self): + # Request FULL reset + req_msg = L1CTLMessageReset() + self.sock.send(req_msg.gen_msg()) + + # Wait for confirmation (timeout is 3 seconds) + s, _, _ = select.select([self.sock], [], [], 3.0) + if not s: + raise ReaderError("Timeout waiting for L1CTL_RESET_REQ") + else: + rsp = self.sock.recv(128) + rsp_msg = struct.unpack_from("!HB", rsp) + if rsp_msg[1] != L1CTLMessageReset.L1CTL_RESET_CONF: + raise ReaderError("Failed to reset Calypso PHY") + + def connect(self): + self.reset_card() + + def disconnect(self): + pass # Nothing to do really ... + + def wait_for_card(self, timeout = None, newcardonly = False): + pass # Nothing to do really ... + + def send_apdu_raw(self, pdu): + """see LinkBase.send_apdu_raw""" + + # Request FULL reset + req_msg = L1CTLMessageSIM(h2b(pdu)) + self.sock.send(req_msg.gen_msg()) + + # Wait for confirmation (timeout is 3 seconds) + s, _, _ = select.select([self.sock], [], [], 3.0) + if not s: + raise ReaderError("Timeout waiting for L1CTL_SIM_CONF") + + # Read message length first + rsp = self.sock.recv(struct.calcsize("!H")) + msg_len = struct.unpack_from("!H", rsp)[0] + if msg_len < struct.calcsize("BBxx"): + raise ReaderError("Missing L1CTL header for L1CTL_SIM_CONF") + + # Read the whole message then + rsp = self.sock.recv(msg_len) + + # Verify L1CTL header + hdr = struct.unpack_from("BBxx", rsp) + if hdr[0] != L1CTLMessageSIM.L1CTL_SIM_CONF: + raise ReaderError("Failed to reset Calypso PHY") + + # Verify the payload length + offset = struct.calcsize("BBxx") + if len(rsp) <= offset: + raise ProtocolError("Empty response from SIM?!?") + + # Omit L1CTL header + rsp = rsp[offset:] + + # Unpack data and SW + data = rsp[:-2] + sw = rsp[-2:] + + return b2h(data), b2h(sw) -- To view, visit https://gerrit.osmocom.org/11480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iec8101140581bf9e2cf7cf3a0b54bdf1875fc51b Gerrit-Change-Number: 11480 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 23:47:28 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 26 Oct 2018 23:47:28 +0000 Subject: Change in pysim[master]: pySim-*.py: refactor card reader driver initialization Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11481 Change subject: pySim-*.py: refactor card reader driver initialization ...................................................................... pySim-*.py: refactor card reader driver initialization This would facilitate adding new card reader drivers. Change-Id: Ia893537786c95a6aab3a51fb1ba7169023d5ef97 --- M pySim-prog.py M pySim-read.py 2 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/81/11481/1 diff --git a/pySim-prog.py b/pySim-prog.py index ae5e482..ba1b783 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -562,13 +562,13 @@ # Parse options opts = parse_options() - # Connect to the card - if opts.pcsc_dev is None: - from pySim.transport.serial import SerialSimLink - sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) - else: + # Init card reader driver + if opts.pcsc_dev is not None: from pySim.transport.pcsc import PcscSimLink sl = PcscSimLink(opts.pcsc_dev) + else: # Serial reader is default + from pySim.transport.serial import SerialSimLink + sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) # Create command layer scc = SimCardCommands(transport=sl) diff --git a/pySim-read.py b/pySim-read.py index e807e3e..066b0df 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -70,13 +70,13 @@ # Parse options opts = parse_options() - # Connect to the card - if opts.pcsc_dev is None: - from pySim.transport.serial import SerialSimLink - sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) - else: + # Init card reader driver + if opts.pcsc_dev is not None: from pySim.transport.pcsc import PcscSimLink sl = PcscSimLink(opts.pcsc_dev) + else: # Serial reader is default + from pySim.transport.serial import SerialSimLink + sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) # Create command layer scc = SimCardCommands(transport=sl) -- To view, visit https://gerrit.osmocom.org/11481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia893537786c95a6aab3a51fb1ba7169023d5ef97 Gerrit-Change-Number: 11481 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 26 23:47:29 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 26 Oct 2018 23:47:29 +0000 Subject: Change in pysim[master]: pySim-*.py: add command line option for Calypso reader Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11482 Change subject: pySim-*.py: add command line option for Calypso reader ...................................................................... pySim-*.py: add command line option for Calypso reader Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df --- M pySim-prog.py M pySim-read.py 2 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/82/11482/1 diff --git a/pySim-prog.py b/pySim-prog.py index ba1b783..8a17d9d 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -58,6 +58,10 @@ help="Which PC/SC reader number for SIM access", default=None, ) + parser.add_option("--calypso-phy", dest="osmocon_sock", metavar="PATH", + help="Socket path for Calypso (e.g. Motorola C1XX) based reader (via OsmocomBB)", + default=None, + ) parser.add_option("-t", "--type", dest="type", help="Card type (user -t list to view) [default: %default]", default="auto", @@ -566,6 +570,9 @@ if opts.pcsc_dev is not None: from pySim.transport.pcsc import PcscSimLink sl = PcscSimLink(opts.pcsc_dev) + if opts.osmocon_sock is not None: + from pySim.transport.calypso import CalypsoSimLink + sl = CalypsoSimLink(sock_path=opts.osmocon_sock) else: # Serial reader is default from pySim.transport.serial import SerialSimLink sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) diff --git a/pySim-read.py b/pySim-read.py index 066b0df..65184ed 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -56,6 +56,10 @@ help="Which PC/SC reader number for SIM access", default=None, ) + parser.add_option("--calypso-phy", dest="osmocon_sock", metavar="PATH", + help="Socket path for Calypso (e.g. Motorola C1XX) based reader (via OsmocomBB)", + default=None, + ) (options, args) = parser.parse_args() @@ -74,6 +78,9 @@ if opts.pcsc_dev is not None: from pySim.transport.pcsc import PcscSimLink sl = PcscSimLink(opts.pcsc_dev) + if opts.osmocon_sock is not None: + from pySim.transport.calypso import CalypsoSimLink + sl = CalypsoSimLink(sock_path=opts.osmocon_sock) else: # Serial reader is default from pySim.transport.serial import SerialSimLink sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) -- To view, visit https://gerrit.osmocom.org/11482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df Gerrit-Change-Number: 11482 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 27 00:04:17 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 27 Oct 2018 00:04:17 +0000 Subject: Change in pysim[master]: pySim/transport: introduce Calypso based reader interface In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11480 to look at the new patch set (#2). Change subject: pySim/transport: introduce Calypso based reader interface ...................................................................... pySim/transport: introduce Calypso based reader interface This interface allows to use a Calypso based phone (e.g. Motorola C1XX) as a SIM card reader. It basically implements a few L1CTL messages that are used to interact with the SIM card through the OsmocomBB 'layer1' firmware. Please note, that this is an experimental implementation, and there is a risk that SIM programming would fail. Nevertheless, I've managed to program and read one of my SIMs a few times. Change-Id: Iec8101140581bf9e2cf7cf3a0b54bdf1875fc51b --- M pySim/exceptions.py A pySim/transport/calypso.py 2 files changed, 160 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/80/11480/2 -- To view, visit https://gerrit.osmocom.org/11480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iec8101140581bf9e2cf7cf3a0b54bdf1875fc51b Gerrit-Change-Number: 11480 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 27 10:22:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 27 Oct 2018 10:22:51 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications.yml: Add OC2G build matrix to gerrit-osmo-bts In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11470 ) Change subject: gerrit-verifications.yml: Add OC2G build matrix to gerrit-osmo-bts ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62a9a5ec357b7246b2d7915681c646c79eda4b76 Gerrit-Change-Number: 11470 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Omar Ramadan Gerrit-Comment-Date: Sat, 27 Oct 2018 10:22:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 27 10:22:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 27 Oct 2018 10:22:52 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications.yml: Add OC2G build matrix to gerrit-osmo-bts In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11470 ) Change subject: gerrit-verifications.yml: Add OC2G build matrix to gerrit-osmo-bts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62a9a5ec357b7246b2d7915681c646c79eda4b76 Gerrit-Change-Number: 11470 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Omar Ramadan Gerrit-Comment-Date: Sat, 27 Oct 2018 10:22:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 27 10:22:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 27 Oct 2018 10:22:54 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications.yml: Add OC2G build matrix to gerrit-osmo-bts In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11470 ) Change subject: gerrit-verifications.yml: Add OC2G build matrix to gerrit-osmo-bts ...................................................................... gerrit-verifications.yml: Add OC2G build matrix to gerrit-osmo-bts The gerrit-osmo-bts job is used for build verification of osmo-bts patches. This adds (untested) support for OC2G Change-Id: I62a9a5ec357b7246b2d7915681c646c79eda4b76 --- M jobs/gerrit-verifications.yml 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Omar Ramadan: Looks good to me, but someone else must approve; Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index f3bde2e..a989760 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -87,9 +87,9 @@ - osmo-bts: a1_name: FIRMWARE_VERSION - a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, origin/nrw/litecell15] + a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, origin/nrw/litecell15, origin/nrw/oc2g, origin/nrw/oc2g-next] a2_name: BTS_MODEL - a2: !!python/tuple [sysmo, oct, trx, oct+trx, lc15] + a2: !!python/tuple [sysmo, oct, trx, oct+trx, lc15, oc2g] combination_filter: > FIRMWARE_VERSION == "master" || (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo") || @@ -98,7 +98,9 @@ (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo") || (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo") || (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15") || - (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15") + (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15") || + (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g") || + (FIRMWARE_VERSION == "origin/nrw/oc2g-next" && BTS_MODEL == "oc2g") cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL"' - osmo-ggsn: -- To view, visit https://gerrit.osmocom.org/11470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I62a9a5ec357b7246b2d7915681c646c79eda4b76 Gerrit-Change-Number: 11470 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Omar Ramadan -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 27 11:33:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 27 Oct 2018 11:33:03 +0000 Subject: Change in osmo-ci[master]: osmo-layer1-headers.sh: Check-out NuRAN branches without slashes Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11483 Change subject: osmo-layer1-headers.sh: Check-out NuRAN branches without slashes ...................................................................... osmo-layer1-headers.sh: Check-out NuRAN branches without slashes this is an ugly workaround for Jenkins not being able to deal with slash ('/') in label names that comprise the axis of a matrix buildjob, while nuran not using tags but only branch names in their firmware repositories :( Change-Id: I1bbfc61f66c5fc490ceca96a8eb21210dd89b629 --- M scripts/osmo-layer1-headers.sh 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/83/11483/1 diff --git a/scripts/osmo-layer1-headers.sh b/scripts/osmo-layer1-headers.sh index 0adf528..59cad87 100755 --- a/scripts/osmo-layer1-headers.sh +++ b/scripts/osmo-layer1-headers.sh @@ -12,18 +12,22 @@ case "$1" in sysmo) uri="git://git.sysmocom.de/sysmo-bts/layer1-api" + version_prefix="" version="origin/master" ;; oct) uri="git://git.osmocom.org/octphy-2g-headers" + version_prefix="" version="origin/master" ;; lc15) uri="https://gitlab.com/nrw_litecell15/litecell15-fw" + version_prefix="origin/nrw/" version="origin/nrw/litecell15" ;; oc2g) uri="https://gitlab.com/nrw_oc2g/oc2g-fw" + version_prefix="origin/nrw/" version="origin/nrw/oc2g" ;; *) @@ -48,4 +52,7 @@ cd layer1-headers git fetch origin -git checkout -f "$version" +# $version_prefix is an ugly workaround for jenkins not being able to deal with slash ('/') +# in label names that comprise the axis of a matrxi buildjob, while nuran not using tags but +# only branch names in their firmware repositories :( +git checkout -f "$version" || git checkout -f "${version_prefix}${version}" -- To view, visit https://gerrit.osmocom.org/11483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1bbfc61f66c5fc490ceca96a8eb21210dd89b629 Gerrit-Change-Number: 11483 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 27 11:34:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 27 Oct 2018 11:34:36 +0000 Subject: Change in osmo-ci[master]: osmo-layer1-headers.sh: Check-out NuRAN branches without slashes In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11483 ) Change subject: osmo-layer1-headers.sh: Check-out NuRAN branches without slashes ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1bbfc61f66c5fc490ceca96a8eb21210dd89b629 Gerrit-Change-Number: 11483 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sat, 27 Oct 2018 11:34:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 27 11:34:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 27 Oct 2018 11:34:37 +0000 Subject: Change in osmo-ci[master]: osmo-layer1-headers.sh: Check-out NuRAN branches without slashes In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11483 ) Change subject: osmo-layer1-headers.sh: Check-out NuRAN branches without slashes ...................................................................... osmo-layer1-headers.sh: Check-out NuRAN branches without slashes this is an ugly workaround for Jenkins not being able to deal with slash ('/') in label names that comprise the axis of a matrix buildjob, while nuran not using tags but only branch names in their firmware repositories :( Change-Id: I1bbfc61f66c5fc490ceca96a8eb21210dd89b629 --- M scripts/osmo-layer1-headers.sh 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/scripts/osmo-layer1-headers.sh b/scripts/osmo-layer1-headers.sh index 0adf528..59cad87 100755 --- a/scripts/osmo-layer1-headers.sh +++ b/scripts/osmo-layer1-headers.sh @@ -12,18 +12,22 @@ case "$1" in sysmo) uri="git://git.sysmocom.de/sysmo-bts/layer1-api" + version_prefix="" version="origin/master" ;; oct) uri="git://git.osmocom.org/octphy-2g-headers" + version_prefix="" version="origin/master" ;; lc15) uri="https://gitlab.com/nrw_litecell15/litecell15-fw" + version_prefix="origin/nrw/" version="origin/nrw/litecell15" ;; oc2g) uri="https://gitlab.com/nrw_oc2g/oc2g-fw" + version_prefix="origin/nrw/" version="origin/nrw/oc2g" ;; *) @@ -48,4 +52,7 @@ cd layer1-headers git fetch origin -git checkout -f "$version" +# $version_prefix is an ugly workaround for jenkins not being able to deal with slash ('/') +# in label names that comprise the axis of a matrxi buildjob, while nuran not using tags but +# only branch names in their firmware repositories :( +git checkout -f "$version" || git checkout -f "${version_prefix}${version}" -- To view, visit https://gerrit.osmocom.org/11483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1bbfc61f66c5fc490ceca96a8eb21210dd89b629 Gerrit-Change-Number: 11483 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 27 11:39:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 27 Oct 2018 11:39:37 +0000 Subject: Change in osmo-ci[master]: gerrot-osmo-bts: Don't use unsupported '/' in labels of axis/matrix jobs Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11484 Change subject: gerrot-osmo-bts: Don't use unsupported '/' in labels of axis/matrix jobs ...................................................................... gerrot-osmo-bts: Don't use unsupported '/' in labels of axis/matrix jobs It seems jenkins cannot deal with this, so we cannot specify something like 'origin/nrw/oc2g-next' in a label. Let's work around by using only oc2g-next here and expanding that to 'origin/nrw/oc2g-next' only in the osmo-l1yer1-headers.sh script of osmo-ci.git Change-Id: I9130a2f349f06a0b46b50665cef7188ddb08f666 --- M jobs/gerrit-verifications.yml 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/84/11484/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index a989760..71a0904 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -87,7 +87,7 @@ - osmo-bts: a1_name: FIRMWARE_VERSION - a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, origin/nrw/litecell15, origin/nrw/oc2g, origin/nrw/oc2g-next] + a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, litecell15, oc2g, oc2g-next] a2_name: BTS_MODEL a2: !!python/tuple [sysmo, oct, trx, oct+trx, lc15, oc2g] combination_filter: > @@ -98,9 +98,9 @@ (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo") || (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo") || (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15") || - (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15") || - (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g") || - (FIRMWARE_VERSION == "origin/nrw/oc2g-next" && BTS_MODEL == "oc2g") + (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15") || + (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g") || + (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g") cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL"' - osmo-ggsn: -- To view, visit https://gerrit.osmocom.org/11484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9130a2f349f06a0b46b50665cef7188ddb08f666 Gerrit-Change-Number: 11484 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 27 11:40:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 27 Oct 2018 11:40:37 +0000 Subject: Change in pysim[master]: pySim/transport: introduce Calypso based reader interface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11480 ) Change subject: pySim/transport: introduce Calypso based reader interface ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iec8101140581bf9e2cf7cf3a0b54bdf1875fc51b Gerrit-Change-Number: 11480 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 27 Oct 2018 11:40:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 27 11:40:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 27 Oct 2018 11:40:48 +0000 Subject: Change in pysim[master]: pySim-*.py: refactor card reader driver initialization In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11481 ) Change subject: pySim-*.py: refactor card reader driver initialization ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia893537786c95a6aab3a51fb1ba7169023d5ef97 Gerrit-Change-Number: 11481 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 27 Oct 2018 11:40:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 27 11:41:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 27 Oct 2018 11:41:46 +0000 Subject: Change in pysim[master]: pySim/transport: introduce Calypso based reader interface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11480 ) Change subject: pySim/transport: introduce Calypso based reader interface ...................................................................... Patch Set 2: another way to go about this would be to implement a pc/sc ifd_handler for L1CTL, this way it would just show up as a normal reader in pcsc_scan. -- To view, visit https://gerrit.osmocom.org/11480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iec8101140581bf9e2cf7cf3a0b54bdf1875fc51b Gerrit-Change-Number: 11480 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 27 Oct 2018 11:41:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 27 11:42:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 27 Oct 2018 11:42:34 +0000 Subject: Change in osmo-ci[master]: gerrot-osmo-bts: Don't use unsupported '/' in labels of axis/matrix jobs In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11484 ) Change subject: gerrot-osmo-bts: Don't use unsupported '/' in labels of axis/matrix jobs ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9130a2f349f06a0b46b50665cef7188ddb08f666 Gerrit-Change-Number: 11484 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sat, 27 Oct 2018 11:42:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 27 11:54:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 27 Oct 2018 11:54:36 +0000 Subject: Change in osmo-bts[master]: Add OC-2G BTS sources In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11447 ) Change subject: Add OC-2G BTS sources ...................................................................... Patch Set 5: Code-Review+2 > Thanks for the review Harald. I've squashed the changes as > requested and have also added oc2g as a target to jenkins_bts_model > which I have verified as passing. However, it hasn't shown up in > jenkins (I think we need to add the target configuration) Yes, that's sort of a chicken-and-egg problem. we have to ask jenkins to verify oc-2g before it is merged, yet a the same time it cannot be verified until it's merged. That requires some manual actions on tight timeline. It's done now and OC-2G support passes against both "oc2g" as well as "oc2g-next" firmware/phy from nuran. -- To view, visit https://gerrit.osmocom.org/11447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 Gerrit-Change-Number: 11447 Gerrit-PatchSet: 5 Gerrit-Owner: Omar Ramadan Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Omar Ramadan Gerrit-Comment-Date: Sat, 27 Oct 2018 11:54:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 27 11:54:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 27 Oct 2018 11:54:39 +0000 Subject: Change in osmo-bts[master]: Add OC-2G BTS sources In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11447 ) Change subject: Add OC-2G BTS sources ...................................................................... Add OC-2G BTS sources Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 --- M configure.ac M contrib/jenkins_bts_model.sh A contrib/jenkins_oc2g.sh A contrib/systemd/oc2gbts-mgr.service A contrib/systemd/osmo-bts-oc2g.service A doc/examples/oc2g/oc2gbts-mgr.cfg A doc/examples/oc2g/osmo-bts.cfg M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/phy_link.h M src/Makefile.am M src/common/gsm_data_shared.c A src/osmo-bts-oc2g/Makefile.am A src/osmo-bts-oc2g/calib_file.c A src/osmo-bts-oc2g/hw_info.ver_major A src/osmo-bts-oc2g/hw_misc.c A src/osmo-bts-oc2g/hw_misc.h A src/osmo-bts-oc2g/l1_if.c A src/osmo-bts-oc2g/l1_if.h A src/osmo-bts-oc2g/l1_transp.h A src/osmo-bts-oc2g/l1_transp_hw.c A src/osmo-bts-oc2g/main.c A src/osmo-bts-oc2g/misc/oc2gbts_bid.c A src/osmo-bts-oc2g/misc/oc2gbts_bid.h A src/osmo-bts-oc2g/misc/oc2gbts_bts.c A src/osmo-bts-oc2g/misc/oc2gbts_bts.h A src/osmo-bts-oc2g/misc/oc2gbts_clock.c A src/osmo-bts-oc2g/misc/oc2gbts_clock.h A src/osmo-bts-oc2g/misc/oc2gbts_led.c A src/osmo-bts-oc2g/misc/oc2gbts_led.h A src/osmo-bts-oc2g/misc/oc2gbts_mgr.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr.h A src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_nl.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_temp.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c A src/osmo-bts-oc2g/misc/oc2gbts_misc.c A src/osmo-bts-oc2g/misc/oc2gbts_misc.h A src/osmo-bts-oc2g/misc/oc2gbts_nl.c A src/osmo-bts-oc2g/misc/oc2gbts_nl.h A src/osmo-bts-oc2g/misc/oc2gbts_par.c A src/osmo-bts-oc2g/misc/oc2gbts_par.h A src/osmo-bts-oc2g/misc/oc2gbts_power.c A src/osmo-bts-oc2g/misc/oc2gbts_power.h A src/osmo-bts-oc2g/misc/oc2gbts_swd.c A src/osmo-bts-oc2g/misc/oc2gbts_swd.h A src/osmo-bts-oc2g/misc/oc2gbts_temp.c A src/osmo-bts-oc2g/misc/oc2gbts_temp.h A src/osmo-bts-oc2g/misc/oc2gbts_util.c A src/osmo-bts-oc2g/oc2gbts.c A src/osmo-bts-oc2g/oc2gbts.h A src/osmo-bts-oc2g/oc2gbts_vty.c A src/osmo-bts-oc2g/oml.c A src/osmo-bts-oc2g/oml_router.c A src/osmo-bts-oc2g/oml_router.h A src/osmo-bts-oc2g/tch.c A src/osmo-bts-oc2g/utils.c A src/osmo-bts-oc2g/utils.h 57 files changed, 13,546 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved -- To view, visit https://gerrit.osmocom.org/11447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 Gerrit-Change-Number: 11447 Gerrit-PatchSet: 5 Gerrit-Owner: Omar Ramadan Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Omar Ramadan -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Oct 27 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 27 Oct 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#289?= In-Reply-To: <684666930.230.1540566607298.JavaMail.jenkins@jenkins.osmocom.org> References: <684666930.230.1540566607298.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <248828247.250.1540653007332.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat Oct 27 17:07:11 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 27 Oct 2018 17:07:11 +0000 Subject: Change in pysim[master]: pySim/transport: introduce Calypso based reader interface In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11480 ) Change subject: pySim/transport: introduce Calypso based reader interface ...................................................................... Patch Set 2: > another way to go about this would be to implement a pc/sc > ifd_handler for L1CTL, this way it would just show up as a normal > reader in pcsc_scan. Yep, I am going to implement a L23 application for that, but later. I have no PC/SC SIM-card reader ATM, but there was a need to program one. Probably, this "hack" would be useful for someone else... -- To view, visit https://gerrit.osmocom.org/11480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iec8101140581bf9e2cf7cf3a0b54bdf1875fc51b Gerrit-Change-Number: 11480 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 27 Oct 2018 17:07:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 27 22:55:46 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 27 Oct 2018 22:55:46 +0000 Subject: Change in pysim[master]: (WIP/CHECK): dump parsed arguments Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11485 Change subject: (WIP/CHECK): dump parsed arguments ...................................................................... (WIP/CHECK): dump parsed arguments Change-Id: I08ddaf2040328aedb714debaf15707279cd7a0e3 --- M pySim-prog.py M pySim-read.py 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/85/11485/1 diff --git a/pySim-prog.py b/pySim-prog.py index 8a17d9d..9a0600f 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -565,6 +565,7 @@ # Parse options opts = parse_options() + print(opts) # Init card reader driver if opts.pcsc_dev is not None: diff --git a/pySim-read.py b/pySim-read.py index 65184ed..995a477 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -73,6 +73,7 @@ # Parse options opts = parse_options() + print(opts) # Init card reader driver if opts.pcsc_dev is not None: -- To view, visit https://gerrit.osmocom.org/11485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I08ddaf2040328aedb714debaf15707279cd7a0e3 Gerrit-Change-Number: 11485 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 09:42:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 28 Oct 2018 09:42:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGsAP: Switch over to osmocom branch/repo to avoid bugs in official one Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11486 Change subject: SGsAP: Switch over to osmocom branch/repo to avoid bugs in official one ...................................................................... SGsAP: Switch over to osmocom branch/repo to avoid bugs in official one The VLR and MME name are octetstring with dns-style labels and not character strings. Change-Id: I31a8ea04ef508beba9014aac5479693c47b7b956 --- M deps/Makefile M library/SGsAP_Templates.ttcn 2 files changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/11486/1 diff --git a/deps/Makefile b/deps/Makefile index a1ac595..7cf9300 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -40,11 +40,11 @@ titan.ProtocolModules.LLC_v7.1.0 \ titan.ProtocolModules.MobileL3_v13.4.0 \ titan.ProtocolModules.NS_v7.3.0 \ - titan.ProtocolModules.SGsAP_13.2.0 \ titan.ProtocolModules.SNDCP_v7.0.0 \ titan.ProtocolEmulations.SCCP OSMOGITHUB_REPOS= titan.TestPorts.SCTPasp \ + titan.ProtocolModules.SGsAP_13.2.0 \ titan.TestPorts.MTP3asp \ titan.ProtocolEmulations.M3UA @@ -78,7 +78,7 @@ titan.ProtocolModules.RTP_commit= R.5.A titan.ProtocolModules.ROSE_commit= R.1.C titan.ProtocolModules.SCTP_commit= R.2.A -titan.ProtocolModules.SGsAP_13.2.0_commit= R.1.B +titan.ProtocolModules.SGsAP_13.2.0_commit= 520dc48dd41ee15c9fd77e71d2ea7a05c58770b9 titan.ProtocolModules.SDP_commit= R.14.A titan.ProtocolModules.SMPP_commit= R.2.A-2-gb7aee69 titan.ProtocolModules.SNDCP_v7.0.0_commit= R.2.A diff --git a/library/SGsAP_Templates.ttcn b/library/SGsAP_Templates.ttcn index aac045e..9526080 100644 --- a/library/SGsAP_Templates.ttcn +++ b/library/SGsAP_Templates.ttcn @@ -174,12 +174,12 @@ /* 9.4.13 */ -template (value) MME_Name ts_SGsAP_IE_MmeName(template (value) charstring name) := { +template (value) MME_Name ts_SGsAP_IE_MmeName(template (value) octetstring name) := { iEI := '00001001'B, lengthIndicator := lengthof(valueof(name)), name := name }; -template MME_Name tr_SGsAP_IE_MmeName(template charstring name) := { +template MME_Name tr_SGsAP_IE_MmeName(template octetstring name) := { iEI := '00001001'B, lengthIndicator := ?, name := name @@ -303,12 +303,12 @@ /* 9.4.22 */ -template (value) VLR_Name ts_SGsAP_IE_VlrName(template (value) charstring name) := { +template (value) VLR_Name ts_SGsAP_IE_VlrName(template (value) octetstring name) := { iEI := '00000010'B, lengthIndicator := lengthof(name), name := name } -template VLR_Name tr_SGsAP_IE_VlrName(template charstring name) := { +template VLR_Name tr_SGsAP_IE_VlrName(template octetstring name) := { iEI := '00000010'B, lengthIndicator := ?, name := name @@ -397,7 +397,7 @@ /* 8.6 */ template (value) PDU_SGsAP ts_SGsAP_EPS_DETACH_IND(hexstring imsi, - template (value) charstring mme_name, + template (value) octetstring mme_name, template (value) IMSI_detachFromEPS_serviceType det_serv_typ) := { sGsAP_EPS_DETACH_INDICATION:= { messageType := '00010001'B, @@ -407,7 +407,7 @@ } } template PDU_SGsAP tr_SGsAP_EPS_DETACH_IND(template hexstring imsi, - template charstring mme_name, + template octetstring mme_name, template IMSI_detachFromEPS_serviceType det_serv_typ) := { sGsAP_EPS_DETACH_INDICATION:= { messageType := '00010001'B, @@ -433,7 +433,7 @@ /* 8.8 */ template (value) PDU_SGsAP ts_SGsAP_IMSI_DETACH_IND(hexstring imsi, - template (value) charstring mme_name, + template (value) octetstring mme_name, template (value) IMSI_detachFromNonEPS_serviceType det_serv_typ) := { sGsAP_IMSI_DETACH_INDICATION := { messageType := '00010011'B, @@ -443,7 +443,7 @@ } } template PDU_SGsAP tr_SGsAP_IMSI_DETACH_IND(template hexstring imsi, - template charstring mme_name := ?, + template octetstring mme_name := ?, template IMSI_detachFromNonEPS_serviceType det_serv_typ := ?) := { sGsAP_IMSI_DETACH_INDICATION := { messageType := '00010011'B, @@ -498,7 +498,7 @@ /* 8.11 */ template (value) PDU_SGsAP ts_SGsAP_LU_REQ(hexstring imsi, - template (value) charstring mme_name, + template (value) octetstring mme_name, template (value) EPS_location_update_type eps_lu_type, template (value) LocationAreaIdValue new_lai) := { sGsAP_LOCATION_UPDATE_REQUEST := { @@ -517,7 +517,7 @@ } } template PDU_SGsAP tr_SGsAP_LU_REQ(template hexstring imsi, - template charstring mme_name := ?, + template octetstring mme_name := ?, template EPS_location_update_type eps_lu_type := ?, template LocationAreaIdValue new_lai := ?) := { sGsAP_LOCATION_UPDATE_REQUEST := { @@ -574,7 +574,7 @@ /* 8.14 */ template (value) PDU_SGsAP ts_SGsAP_PAGING_REQ(hexstring imsi, - template (value) charstring vlr_name, + template (value) octetstring vlr_name, template (value) Service_Indicator serv_ind, template (omit) OCT4 tmsi) := { @@ -596,7 +596,7 @@ } } template PDU_SGsAP tr_SGsAP_PAGING_REQ(template hexstring imsi, - template charstring vlr_name, + template octetstring vlr_name, template Service_Indicator serv_ind, template OCT4 tmsi) := { @@ -619,21 +619,21 @@ } /* 8.15 */ -template (value) PDU_SGsAP ts_SGsAP_RESET_ACK_MME(template (value) charstring mme_name) := { +template (value) PDU_SGsAP ts_SGsAP_RESET_ACK_MME(template (value) octetstring mme_name) := { sGsAP_RESET_ACK := { messageType := '00010110'B, mME_Name := ts_SGsAP_IE_MmeName(mme_name), vLR_Name := omit } } -template (value) PDU_SGsAP ts_SGsAP_RESET_ACK_VLR(template (value) charstring vlr_name) := { +template (value) PDU_SGsAP ts_SGsAP_RESET_ACK_VLR(template (value) octetstring vlr_name) := { sGsAP_RESET_ACK := { messageType := '00010110'B, mME_Name := omit, vLR_Name := ts_SGsAP_IE_VlrName(vlr_name) } } -template PDU_SGsAP tr_SGsAP_RESET_ACK(template charstring mme_name, template charstring vlr_name) := { +template PDU_SGsAP tr_SGsAP_RESET_ACK(template octetstring mme_name, template octetstring vlr_name) := { sGsAP_RESET_ACK := { messageType := '00010110'B, mME_Name := tr_SGsAP_IE_MmeName(mme_name), @@ -642,21 +642,21 @@ } /* 8.16 */ -template (value) PDU_SGsAP ts_SGsAP_RESET_IND_MME(template (value) charstring mme_name) := { +template (value) PDU_SGsAP ts_SGsAP_RESET_IND_MME(template (value) octetstring mme_name) := { sGsAP_RESET_INDICATION := { messageType := '00010101'B, mME_Name := ts_SGsAP_IE_MmeName(mme_name), vLR_Name := omit } } -template (value) PDU_SGsAP ts_SGsAP_RESET_IND_VLR(template (value) charstring vlr_name) := { +template (value) PDU_SGsAP ts_SGsAP_RESET_IND_VLR(template (value) octetstring vlr_name) := { sGsAP_RESET_INDICATION := { messageType := '00010101'B, mME_Name := omit, vLR_Name := ts_SGsAP_IE_VlrName(vlr_name) } } -template PDU_SGsAP tr_SGsAP_RESET_IND(template charstring mme_name, template charstring vlr_name) := { +template PDU_SGsAP tr_SGsAP_RESET_IND(template octetstring mme_name, template octetstring vlr_name) := { sGsAP_RESET_INDICATION := { messageType := '00010101'B, mME_Name := tr_SGsAP_IE_MmeName(mme_name), -- To view, visit https://gerrit.osmocom.org/11486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I31a8ea04ef508beba9014aac5479693c47b7b956 Gerrit-Change-Number: 11486 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 09:42:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 28 Oct 2018 09:42:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGsAP_Emulation: Add functions to send MME or VLR reset Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11487 Change subject: SGsAP_Emulation: Add functions to send MME or VLR reset ...................................................................... SGsAP_Emulation: Add functions to send MME or VLR reset ... including encoding/decoding of names between string and binary labels Change-Id: I981c7c1d34f0db60031b5436739cd924e5a09407 --- A library/DNS_Helpers.ttcn M library/SGsAP_Emulation.ttcn 2 files changed, 106 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/87/11487/1 diff --git a/library/DNS_Helpers.ttcn b/library/DNS_Helpers.ttcn new file mode 100644 index 0000000..45c3a09 --- /dev/null +++ b/library/DNS_Helpers.ttcn @@ -0,0 +1,63 @@ +module DNS_Helpers { + +private function f_strchr(charstring s, char c) return integer { + var integer i; + for (i := 0; i < lengthof(s); i := i+1) { + if (s[i] == c) { + return i; + } + } + return -1; +} + +private function f_dns_enc_label(charstring str) return octetstring { + var octetstring ret; + + ret[0] := int2oct(lengthof(str), 1); + return ret & char2oct(str); +} + +function f_enc_dns_hostname(charstring str) return octetstring { + var octetstring ret := ''O; + while (lengthof(str) > 0) { + var integer dot_idx; + var octetstring lbl; + + dot_idx := f_strchr(str, "."); + if (dot_idx >= 0) { + /* there is another dot */ + lbl := f_dns_enc_label(substr(str, 0, dot_idx)); + str := substr(str, dot_idx+1, lengthof(str)-dot_idx-1); + } else { + /* no more dot */ + lbl := f_dns_enc_label(str); + str := ""; + } + ret := ret & lbl; + } + return ret; +} + + + + +function f_dec_dns_hostname(octetstring inp) return charstring { + var charstring ret := ""; + while (lengthof(inp) > 0) { + var integer label_len; + var charstring lbl; + + label_len := oct2int(substr(inp, 0, 1)); + lbl := oct2char(substr(inp, 1, label_len)); + inp := substr(inp, 1+label_len, lengthof(inp)-1-label_len); + + ret := ret & lbl; + if (lengthof(inp) > 0) { + ret := ret & "."; + } + } + return ret; +} + + +} diff --git a/library/SGsAP_Emulation.ttcn b/library/SGsAP_Emulation.ttcn index 0c37840..968bcdd 100644 --- a/library/SGsAP_Emulation.ttcn +++ b/library/SGsAP_Emulation.ttcn @@ -31,6 +31,7 @@ import from SGsAP_Templates all; import from Osmocom_Types all; import from IPL4asp_Types all; +import from DNS_Helpers all; type component SGsAP_ConnHdlr { port SGsAP_Conn_PT SGsAP; @@ -295,6 +296,7 @@ var hexstring imsi; var SGsAP_RecvFrom mrf; var PDU_SGsAP msg; + var charstring vlr_name, mme_name; alt { /* SGsAP from client */ @@ -329,6 +331,24 @@ f_create_expect(imsi, vc_conn); SGsAP_PROC.reply(SGsAPEM_register:{imsi, vc_conn}) to vc_conn; } + [] SGsAP_PROC.getcall(SGsAPEM_reset_mme:{?,-}) -> param(mme_name) { + var octetstring mme_enc, vlr_enc; + mme_enc := f_enc_dns_hostname(mme_name); + msg := f_sgsap_xceive(ts_SGsAP_RESET_IND_MME(mme_enc)); + vlr_enc := msg.sGsAP_RESET_ACK.vLR_Name.name; + vlr_name := f_dec_dns_hostname(vlr_enc); + SGsAP_PROC.reply(SGsAPEM_reset_mme:{mme_name, vlr_name}); + } + [] SGsAP_PROC.getcall(SGsAPEM_reset_vlr:{?,-}) -> param(vlr_name) { + var octetstring mme_enc, vlr_enc; + vlr_enc := f_enc_dns_hostname(vlr_name); + msg := f_sgsap_xceive(ts_SGsAP_RESET_IND_VLR(vlr_enc)); + mme_enc := msg.sGsAP_RESET_ACK.mME_Name.name; + mme_name := f_dec_dns_hostname(mme_enc); + SGsAP_PROC.reply(SGsAPEM_reset_vlr:{vlr_name, mme_name}); + } + + } } @@ -343,8 +363,11 @@ signature SGsAPEM_register(in hexstring imsi, in SGsAP_ConnHdlr hdlr); +signature SGsAPEM_reset_vlr(in charstring vlr_name, out charstring mme_name); +signature SGsAPEM_reset_mme(in charstring mme_name, out charstring vlr_name); + type port SGsAPEM_PROC_PT procedure { - inout SGsAPEM_register; + inout SGsAPEM_register, SGsAPEM_reset_vlr, SGsAPEM_reset_mme; } with { extension "internal" }; /* Function that can be used as create_cb and will usse the expect table */ @@ -399,6 +422,25 @@ } } +/* client/conn_hdlr side function to use procedure port to send RESET from emulated MME */ +function f_sgsap_reset_mme(charstring mme_name) runs on SGsAP_ConnHdlr return charstring { + var charstring vlr_name; + SGsAP_PROC.call(SGsAPEM_reset_mme:{mme_name, -}) { + [] SGsAP_PROC.getreply(SGsAPEM_reset_mme:{mme_name,?}) -> param(vlr_name) { + return vlr_name; + }; + } +} + +/* client/conn_hdlr side function to use procedure port to send RESET from emulated VLR */ +function f_sgsap_reset_vlr(charstring vlr_name) runs on SGsAP_ConnHdlr return charstring { + var charstring mme_name; + SGsAP_PROC.call(SGsAPEM_reset_vlr:{vlr_name, -}) { + [] SGsAP_PROC.getreply(SGsAPEM_reset_vlr:{vlr_name,?}) -> param(mme_name) { + return mme_name; + }; + } +} private function f_expect_table_init() runs on SGsAP_Emulation_CT { -- To view, visit https://gerrit.osmocom.org/11487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I981c7c1d34f0db60031b5436739cd924e5a09407 Gerrit-Change-Number: 11487 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 09:42:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 28 Oct 2018 09:42:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MCS_Tests: Integrate first SGs testscase (RESET procedure) Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11488 Change subject: MCS_Tests: Integrate first SGs testscase (RESET procedure) ...................................................................... MCS_Tests: Integrate first SGs testscase (RESET procedure) Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.default M msc/MSC_Tests.ttcn M msc/gen_links.sh 4 files changed, 52 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/11488/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index bf7a6d2..d259c8a 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -31,8 +31,10 @@ import from SMPP_Emulation all; +import from SGsAP_Emulation all; + /* this component represents a single subscriber connection */ -type component BSC_ConnHdlr extends BSSAP_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr { +type component BSC_ConnHdlr extends BSSAP_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr, SGsAP_ConnHdlr { var BSC_ConnHdlrPars g_pars; timer g_Tguard := 60.0; } @@ -122,6 +124,8 @@ activate(as_Tguard()); /* Route all SMPP messages for our MSISDN to us */ f_create_smpp_expect(hex2str(pars.msisdn)); + /* Route all SGs message for our IMSI to us */ + f_create_sgsap_expect(pars.imsi); } diff --git a/msc/MSC_Tests.default b/msc/MSC_Tests.default index a24fa38..f807228 100644 --- a/msc/MSC_Tests.default +++ b/msc/MSC_Tests.default @@ -22,6 +22,7 @@ *.MSCVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" *.MSCVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.MSCVTY.PROMPT1 := "OsmoMSC> " +*.SGsAP.sctp_stack := "kernel" [MODULE_PARAMETERS] diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 93d7c77..1f787f5 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -42,6 +42,10 @@ import from BSSMAP_Emulation all; import from BSC_ConnectionHandler all; +import from SGsAP_Templates all; +import from SGsAP_Types all; +import from SGsAP_Emulation all; + import from MobileL3_Types all; import from MobileL3_CommonIE_Types all; import from L3_Templates all; @@ -71,6 +75,7 @@ var GSUP_Emulation_CT vc_GSUP; var IPA_Emulation_CT vc_GSUP_IPA; var SMPP_Emulation_CT vc_SMPP; + var SGsAP_Emulation_CT vc_SGsAP; /* only to get events from IPA underneath GSUP */ port IPA_CTRL_PT GSUP_IPA_EVENT; @@ -191,6 +196,25 @@ vc_MGCP.start(MGCP_Emulation.main(ops, pars, id)); } +function f_init_sgsap(charstring id) runs on MTC_CT { + id := id & "-SGsAP"; + var SGsAPOps ops := { + create_cb := refers(SGsAP_Emulation.ExpectedCreateCallback), + unitdata_cb := refers(SGsAP_Emulation.DummyUnitdataCallback) + } + var SGsAP_conn_parameters pars := { + remote_ip := mp_msc_ip, + remote_sctp_port := 29118, + local_ip := "", + local_sctp_port := -1 + } + + vc_SGsAP := SGsAP_Emulation_CT.create(id); + map(vc_SGsAP:SGsAP, system:SGsAP_CODEC_PT); + vc_SGsAP.start(SGsAP_Emulation.main(ops, pars, id)); +} + + function f_init_gsup(charstring id) runs on MTC_CT { id := id & "-GSUP"; var GsupOps ops := { @@ -245,6 +269,7 @@ f_init_mgcp("MSC_Test"); f_init_gsup("MSC_Test"); f_init_smpp("MSC_Test"); + f_init_sgsap("MSC_Test"); map(self:MSCVTY, system:MSCVTY); f_vty_set_prompts(MSCVTY); @@ -479,6 +504,9 @@ /* SMPP part */ connect(vc_conn:SMPP, vc_SMPP:SMPP_CLIENT); connect(vc_conn:SMPP_PROC, vc_SMPP:SMPP_PROC); + /* SGs part */ + connect(vc_conn:SGsAP, vc_SGsAP:SGsAP_CLIENT); + connect(vc_conn:SGsAP_PROC, vc_SGsAP:SGsAP_PROC); /* We cannot use vc_conn.start(f_init_handler(fn, id, pars)); as we cannot have * a stand-alone 'derefers()' call, see https://www.eclipse.org/forums/index.php/t/1091364/ */ @@ -2723,6 +2751,23 @@ * too long / short TLV values */ +private function f_tc_sgsap_reset(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + /* This should be DNS-encoded, not a charstring */ + var charstring mme_name := "mmec01.mmegi0001.mme.epc.mnc070.mcc901.3gppnetwork.org"; + var charstring vlr_name; + f_init_handler(pars); + + vlr_name := f_sgsap_reset_mme(mme_name); + log("VLR name: ", vlr_name); + setverdict(pass); +} + +testcase TC_sgsap_reset() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_sgsap_reset), 10); + vc_conn.done; +} control { execute( TC_cr_before_reset() ); diff --git a/msc/gen_links.sh b/msc/gen_links.sh index a394853..8d53d31 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -94,7 +94,7 @@ FILES+="MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunctDef.cc " FILES+="SMPP_CodecPort.ttcn SMPP_CodecPort_CtrlFunct.ttcn SMPP_CodecPort_CtrlFunctDef.cc SMPP_Emulation.ttcn SMPP_Templates.ttcn " FILES+="SS_Templates.ttcn SCCP_Templates.ttcn USSD_Helpers.ttcn " -FILES+="SGsAP_Templates.ttcn SGsAP_CodecPort.ttcn SGsAP_CodecPort_CtrlFunct.ttcn SGsAP_CodecPort_CtrlFunctDef.cc SGsAP_Emulation.ttcn " +FILES+="SGsAP_Templates.ttcn SGsAP_CodecPort.ttcn SGsAP_CodecPort_CtrlFunct.ttcn SGsAP_CodecPort_CtrlFunctDef.cc SGsAP_Emulation.ttcn DNS_Helpers.ttcn " gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 09:52:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 28 Oct 2018 09:52:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGsAP: Switch over to osmocom branch/repo to avoid bugs in official one In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11486 ) Change subject: SGsAP: Switch over to osmocom branch/repo to avoid bugs in official one ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31a8ea04ef508beba9014aac5479693c47b7b956 Gerrit-Change-Number: 11486 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 28 Oct 2018 09:52:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 09:52:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 28 Oct 2018 09:52:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add SGsAP_CodecPort + SGsAP_Emulation module In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11306 ) Change subject: Add SGsAP_CodecPort + SGsAP_Emulation module ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I530f8f444d1c7ea0bf11d510da7b97f64a2039f5 Gerrit-Change-Number: 11306 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 28 Oct 2018 09:52:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 09:52:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 28 Oct 2018 09:52:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGsAP_Emulation: Add functions to send MME or VLR reset In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11487 ) Change subject: SGsAP_Emulation: Add functions to send MME or VLR reset ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I981c7c1d34f0db60031b5436739cd924e5a09407 Gerrit-Change-Number: 11487 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 28 Oct 2018 09:52:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 09:52:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 28 Oct 2018 09:52:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add SGsAP_CodecPort + SGsAP_Emulation module In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11306 ) Change subject: Add SGsAP_CodecPort + SGsAP_Emulation module ...................................................................... Add SGsAP_CodecPort + SGsAP_Emulation module Change-Id: I530f8f444d1c7ea0bf11d510da7b97f64a2039f5 --- A library/SGsAP_CodecPort.ttcn A library/SGsAP_CodecPort_CtrlFunct.ttcn A library/SGsAP_CodecPort_CtrlFunctDef.cc A library/SGsAP_Emulation.ttcn M regen-makefile.sh 5 files changed, 591 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/SGsAP_CodecPort.ttcn b/library/SGsAP_CodecPort.ttcn new file mode 100644 index 0000000..2981fa2 --- /dev/null +++ b/library/SGsAP_CodecPort.ttcn @@ -0,0 +1,72 @@ +module SGsAP_CodecPort { + +/* Simple SGsAP Codec Port, translating between raw SCTP primitives with + * octetstring payload towards the IPL4asp provider, and SGsAP primitives + * which carry the decoded SGsAP data types as payload. + * + * (C) 2018 by Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + */ + + import from IPL4asp_PortType all; + import from IPL4asp_Types all; + import from SGsAP_Types all; + + type record SGsAP_RecvFrom { + ConnectionId connId, + HostName remName, + PortNumber remPort, + HostName locName, + PortNumber locPort, + PDU_SGsAP msg + }; + + template SGsAP_RecvFrom t_SGsAP_RecvFrom(template PDU_SGsAP msg) := { + connId := ?, + remName := ?, + remPort := ?, + locName := ?, + locPort := ?, + msg := msg + } + + type record SGsAP_Send { + ConnectionId connId, + PDU_SGsAP msg + } + + template SGsAP_Send t_SGsAP_Send(template ConnectionId connId, template PDU_SGsAP msg) := { + connId := connId, + msg := msg + } + + private function IPL4_to_SGsAP_RecvFrom(in ASP_RecvFrom pin, out SGsAP_RecvFrom pout) { + pout.connId := pin.connId; + pout.remName := pin.remName; + pout.remPort := pin.remPort; + pout.locName := pin.locName; + pout.locPort := pin.locPort; + pout.msg := dec_PDU_SGsAP(pin.msg); + } with { extension "prototype(fast)" }; + + private function SGsAP_to_IPL4_Send(in SGsAP_Send pin, out ASP_Send pout) { + pout.connId := pin.connId; + pout.proto := { sctp := {} }; + pout.msg := enc_PDU_SGsAP(pin.msg); + } with { extension "prototype(fast)" }; + + type port SGsAP_CODEC_PT message { + out SGsAP_Send; + in SGsAP_RecvFrom, + ASP_ConnId_ReadyToRelease, + ASP_Event; + } with { extension "user IPL4asp_PT + out(SGsAP_Send -> ASP_Send:function(SGsAP_to_IPL4_Send)) + in(ASP_RecvFrom -> SGsAP_RecvFrom: function(IPL4_to_SGsAP_RecvFrom); + ASP_ConnId_ReadyToRelease -> ASP_ConnId_ReadyToRelease: simple; + ASP_Event -> ASP_Event: simple)" + } +} diff --git a/library/SGsAP_CodecPort_CtrlFunct.ttcn b/library/SGsAP_CodecPort_CtrlFunct.ttcn new file mode 100644 index 0000000..b09fc94 --- /dev/null +++ b/library/SGsAP_CodecPort_CtrlFunct.ttcn @@ -0,0 +1,44 @@ +module SGsAP_CodecPort_CtrlFunct { + + import from SGsAP_CodecPort all; + import from IPL4asp_Types all; + + external function f_IPL4_listen( + inout SGsAP_CODEC_PT portRef, + in HostName locName, + in PortNumber locPort, + in ProtoTuple proto, + in OptionList options := {} + ) return Result; + + external function f_IPL4_connect( + inout SGsAP_CODEC_PT portRef, + in HostName remName, + in PortNumber remPort, + in HostName locName, + in PortNumber locPort, + in ConnectionId connId, + in ProtoTuple proto, + in OptionList options := {} + ) return Result; + + external function f_IPL4_close( + inout SGsAP_CODEC_PT portRef, + in ConnectionId id, + in ProtoTuple proto := { unspecified := {} } + ) return Result; + + external function f_IPL4_setUserData( + inout SGsAP_CODEC_PT portRef, + in ConnectionId id, + in UserData userData + ) return Result; + + external function f_IPL4_getUserData( + inout SGsAP_CODEC_PT portRef, + in ConnectionId id, + out UserData userData + ) return Result; + +} + diff --git a/library/SGsAP_CodecPort_CtrlFunctDef.cc b/library/SGsAP_CodecPort_CtrlFunctDef.cc new file mode 100644 index 0000000..aa38e51 --- /dev/null +++ b/library/SGsAP_CodecPort_CtrlFunctDef.cc @@ -0,0 +1,56 @@ +#include "IPL4asp_PortType.hh" +#include "SGsAP_CodecPort.hh" +#include "IPL4asp_PT.hh" + +namespace SGsAP__CodecPort__CtrlFunct { + + IPL4asp__Types::Result f__IPL4__listen( + SGsAP__CodecPort::SGsAP__CODEC__PT& portRef, + const IPL4asp__Types::HostName& locName, + const IPL4asp__Types::PortNumber& locPort, + const IPL4asp__Types::ProtoTuple& proto, + const IPL4asp__Types::OptionList& options) + { + return f__IPL4__PROVIDER__listen(portRef, locName, locPort, proto, options); + } + + IPL4asp__Types::Result f__IPL4__connect( + SGsAP__CodecPort::SGsAP__CODEC__PT& portRef, + const IPL4asp__Types::HostName& remName, + const IPL4asp__Types::PortNumber& remPort, + const IPL4asp__Types::HostName& locName, + const IPL4asp__Types::PortNumber& locPort, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::ProtoTuple& proto, + const IPL4asp__Types::OptionList& options) + { + return f__IPL4__PROVIDER__connect(portRef, remName, remPort, + locName, locPort, connId, proto, options); + } + + IPL4asp__Types::Result f__IPL4__close( + SGsAP__CodecPort::SGsAP__CODEC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::ProtoTuple& proto) + { + return f__IPL4__PROVIDER__close(portRef, connId, proto); + } + + IPL4asp__Types::Result f__IPL4__setUserData( + SGsAP__CodecPort::SGsAP__CODEC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + const IPL4asp__Types::UserData& userData) + { + return f__IPL4__PROVIDER__setUserData(portRef, connId, userData); + } + + IPL4asp__Types::Result f__IPL4__getUserData( + SGsAP__CodecPort::SGsAP__CODEC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + IPL4asp__Types::UserData& userData) + { + return f__IPL4__PROVIDER__getUserData(portRef, connId, userData); + } + +} + diff --git a/library/SGsAP_Emulation.ttcn b/library/SGsAP_Emulation.ttcn new file mode 100644 index 0000000..0c37840 --- /dev/null +++ b/library/SGsAP_Emulation.ttcn @@ -0,0 +1,418 @@ +module SGsAP_Emulation { + +/* SGsAP Emulation, runs on top of SGsAP_CodecPort. It multiplexes/demultiplexes + * the individual IMSIs/subscribers, so there can be separate TTCN-3 components handling + * each of them. + * + * The SGsAP_Emulation.main() function processes SGsAP primitives from the SGsAP + * socket via the SGsAP_CodecPort, and dispatches them to the per-IMSI components. + * + * For each new IMSI, the SgsapOps.create_cb() is called. It can create + * or resolve a TTCN-3 component, and returns a component reference to which that IMSI + * is routed/dispatched. + * + * If a pre-existing component wants to register to handle a future inbound IMSI, it can + * do so by registering an "expect" with the expected IMSI. + * + * Inbound SGsAP messages without IMSI (such as RESET-IND/ACK) are dispatched to + * the SgsapOps.unitdata_cb() callback, which is registered with an argument to the + * main() function below. + * + * (C) 2018 by Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + */ + +import from SGsAP_CodecPort all; +import from SGsAP_CodecPort_CtrlFunct all; +import from SGsAP_Types all; +import from SGsAP_Templates all; +import from Osmocom_Types all; +import from IPL4asp_Types all; + +type component SGsAP_ConnHdlr { + port SGsAP_Conn_PT SGsAP; + /* procedure based port to register for incoming connections */ + port SGsAPEM_PROC_PT SGsAP_PROC; +} + +/* port between individual per-connection components and this dispatcher */ +type port SGsAP_Conn_PT message { + inout PDU_SGsAP; +} with { extension "internal" }; + +/* represents a single SGsAP Association */ +type record AssociationData { + SGsAP_ConnHdlr comp_ref, + hexstring imsi optional +}; + +type component SGsAP_Emulation_CT { + /* Port facing to the UDP SUT */ + port SGsAP_CODEC_PT SGsAP; + /* All SGsAP_ConnHdlr SGsAP ports connect here + * SGsAP_Emulation_CT.main needs to figure out what messages + * to send where with CLIENT.send() to vc_conn */ + port SGsAP_Conn_PT SGsAP_CLIENT; + /* currently tracked connections */ + var AssociationData SgsapAssociationTable[16]; + /* pending expected CRCX */ + var ExpectData SgsapExpectTable[8]; + /* procedure based port to register for incoming connections */ + port SGsAPEM_PROC_PT SGsAP_PROC; + + var charstring g_sgsap_id; + var integer g_sgsap_conn_id := -1; +} + +type function SGsAPCreateCallback(PDU_SGsAP msg, hexstring imsi, charstring id) +runs on SGsAP_Emulation_CT return SGsAP_ConnHdlr; + +type function SGsAPUnitdataCallback(PDU_SGsAP msg) +runs on SGsAP_Emulation_CT return template PDU_SGsAP; + +type record SGsAPOps { + SGsAPCreateCallback create_cb, + SGsAPUnitdataCallback unitdata_cb +} + +type record SGsAP_conn_parameters { + HostName remote_ip, + PortNumber remote_sctp_port, + HostName local_ip, + PortNumber local_sctp_port +} + +function tr_SGsAP_RecvFrom_R(template PDU_SGsAP msg) +runs on SGsAP_Emulation_CT return template SGsAP_RecvFrom { + var template SGsAP_RecvFrom mrf := { + connId := g_sgsap_conn_id, + remName := ?, + remPort := ?, + locName := ?, + locPort := ?, + msg := msg + } + return mrf; +} + +private function f_imsi_known(hexstring imsi) +runs on SGsAP_Emulation_CT return boolean { + var integer i; + for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + if (SgsapAssociationTable[i].imsi == imsi) { + return true; + } + } + return false; +} + +private function f_comp_known(SGsAP_ConnHdlr client) +runs on SGsAP_Emulation_CT return boolean { + var integer i; + for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + if (SgsapAssociationTable[i].comp_ref == client) { + return true; + } + } + return false; +} + +private function f_comp_by_imsi(hexstring imsi) +runs on SGsAP_Emulation_CT return SGsAP_ConnHdlr { + var integer i; + for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + if (SgsapAssociationTable[i].imsi == imsi) { + return SgsapAssociationTable[i].comp_ref; + } + } + setverdict(fail, "SGsAP Association Table not found by IMSI", imsi); + mtc.stop; +} + +private function f_imsi_by_comp(SGsAP_ConnHdlr client) +runs on SGsAP_Emulation_CT return hexstring { + var integer i; + for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + if (SgsapAssociationTable[i].comp_ref == client) { + return SgsapAssociationTable[i].imsi; + } + } + setverdict(fail, "SGsAP Association Table not found by component ", client); + mtc.stop; +} + +private function f_imsi_table_add(SGsAP_ConnHdlr comp_ref, hexstring imsi) +runs on SGsAP_Emulation_CT { + var integer i; + for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + if (not isvalue(SgsapAssociationTable[i].imsi)) { + SgsapAssociationTable[i].imsi := imsi; + SgsapAssociationTable[i].comp_ref := comp_ref; + return; + } + } + testcase.stop("SGsAP Association Table full!"); +} + +private function f_imsi_table_del(SGsAP_ConnHdlr comp_ref, hexstring imsi) +runs on SGsAP_Emulation_CT { + var integer i; + for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + if (SgsapAssociationTable[i].comp_ref == comp_ref and + SgsapAssociationTable[i].imsi == imsi) { + SgsapAssociationTable[i].imsi := omit; + SgsapAssociationTable[i].comp_ref := null; + return; + } + } + setverdict(fail, "SGsAP Association Table: Couldn't find to-be-deleted entry!"); + mtc.stop; +} + + +private function f_imsi_table_init() +runs on SGsAP_Emulation_CT { + for (var integer i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { + SgsapAssociationTable[i].comp_ref := null; + SgsapAssociationTable[i].imsi := omit; + } +} + +private function f_SGsAP_get_imsi(PDU_SGsAP pdu) return template (omit) IMSI +{ + if (ischosen(pdu.sGsAP_ALERT_ACK)) { + return pdu.sGsAP_ALERT_ACK.iMSI; + } else if (ischosen(pdu.sGsAP_ALERT_REJECT)) { + return pdu.sGsAP_ALERT_REJECT.iMSI; + } else if (ischosen(pdu.sGsAP_ALERT_REQUEST)) { + return pdu.sGsAP_ALERT_REQUEST.iMSI; + } else if (ischosen(pdu.sGsAP_DOWNLINK_UNITDATA)) { + return pdu.sGsAP_DOWNLINK_UNITDATA.iMSI; + } else if (ischosen(pdu.sGsAP_EPS_DETACH_ACK)) { + return pdu.sGsAP_EPS_DETACH_ACK.iMSI; + } else if (ischosen(pdu.sGsAP_EPS_DETACH_INDICATION)) { + return pdu.sGsAP_EPS_DETACH_INDICATION.iMSI; + } else if (ischosen(pdu.sGsAP_IMSI_DETACH_ACK)) { + return pdu.sGsAP_IMSI_DETACH_ACK.iMSI; + } else if (ischosen(pdu.sGsAP_IMSI_DETACH_INDICATION)) { + return pdu.sGsAP_IMSI_DETACH_INDICATION.iMSI; + } else if (ischosen(pdu.sGsAP_LOCATION_UPDATE_ACCEPT)) { + return pdu.sGsAP_LOCATION_UPDATE_ACCEPT.iMSI; + } else if (ischosen(pdu.sGsAP_LOCATION_UPDATE_REJECT)) { + return pdu.sGsAP_LOCATION_UPDATE_REJECT.iMSI; + } else if (ischosen(pdu.sGsAP_LOCATION_UPDATE_REQUEST)) { + return pdu.sGsAP_LOCATION_UPDATE_REQUEST.iMSI; + } else if (ischosen(pdu.sGsAP_MM_INFORMATION_REQUEST)) { + return pdu.sGsAP_MM_INFORMATION_REQUEST.iMSI; + } else if (ischosen(pdu.sGsAP_PAGING_REJECT)) { + return pdu.sGsAP_PAGING_REJECT.iMSI; + } else if (ischosen(pdu.sGsAP_PAGING_REQUEST)) { + return pdu.sGsAP_PAGING_REQUEST.iMSI; + } else if (ischosen(pdu.sGsAP_SERVICE_REQUEST)) { + return pdu.sGsAP_SERVICE_REQUEST.iMSI; + } else if (ischosen(pdu.sGsAP_STATUS)) { + return pdu.sGsAP_STATUS.iMSI; + } else if (ischosen(pdu.sGsAP_TMSI_REALLOCATION_COMPLETE)) { + return pdu.sGsAP_TMSI_REALLOCATION_COMPLETE.iMSI; + } else if (ischosen(pdu.sGsAP_UE_ACTIVITY_INDICATION)) { + return pdu.sGsAP_UE_ACTIVITY_INDICATION.iMSI; + } else if (ischosen(pdu.sGsAP_UE_UNREACHABLE)) { + return pdu.sGsAP_UE_UNREACHABLE.iMSI; + } else if (ischosen(pdu.sGsAP_UPLINK_UNITDATA)) { + return pdu.sGsAP_UPLINK_UNITDATA.iMSI; + } else if (ischosen(pdu.sGsAP_RELEASE_REQUEST)) { + return pdu.sGsAP_RELEASE_REQUEST.iMSI; + } else if (ischosen(pdu.sGsAP_SERVICE_ABORT_REQUEST)) { + return pdu.sGsAP_SERVICE_ABORT_REQUEST.iMSI; + } else if (ischosen(pdu.sGsAP_MO_CSFB_INDICATION)) { + return pdu.sGsAP_MO_CSFB_INDICATION.iMSI; + } + return omit; +} + +private template (value) SctpTuple ts_SCTP(template (omit) integer ppid := omit) := { + sinfo_stream := omit, + sinfo_ppid := ppid, + remSocks := omit, + assocId := omit +}; + +private template PortEvent tr_SctpAssocChange := { + sctpEvent := { + sctpAssocChange := ? + } +} +private template PortEvent tr_SctpPeerAddrChange := { + sctpEvent := { + sctpPeerAddrChange := ? + } +} + +private function f_sgsap_xceive(template (value) PDU_SGsAP tx, + template PDU_SGsAP rx_t := ?) +runs on SGsAP_Emulation_CT return PDU_SGsAP { + timer T := 10.0; + var SGsAP_RecvFrom mrf; + + SGsAP.send(t_SGsAP_Send(g_sgsap_conn_id, tx)); + alt { + [] SGsAP.receive(tr_SGsAP_RecvFrom_R(rx_t)) -> value mrf { } + [] SGsAP.receive(tr_SctpAssocChange) { repeat; } + [] SGsAP.receive(tr_SctpPeerAddrChange) { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for ", rx_t); + mtc.stop; + } + } + return mrf.msg; +} + +function main(SGsAPOps ops, SGsAP_conn_parameters p, charstring id) runs on SGsAP_Emulation_CT { + var Result res; + g_sgsap_id := id; + f_imsi_table_init(); + f_expect_table_init(); + + map(self:SGsAP, system:SGsAP_CODEC_PT); + if (p.remote_sctp_port == -1) { + res := SGsAP_CodecPort_CtrlFunct.f_IPL4_listen(SGsAP, p.local_ip, p.local_sctp_port, { sctp := valueof(ts_SCTP) }); + } else { + res := SGsAP_CodecPort_CtrlFunct.f_IPL4_connect(SGsAP, p.remote_ip, p.remote_sctp_port, + p.local_ip, p.local_sctp_port, -1, { sctp := valueof(ts_SCTP) }); + } + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect SGsAP socket, check your configuration"); + mtc.stop; + } + g_sgsap_conn_id := res.connId; + + while (true) { + var SGsAP_ConnHdlr vc_conn; + var template IMSI imsi_t; + var hexstring imsi; + var SGsAP_RecvFrom mrf; + var PDU_SGsAP msg; + + alt { + /* SGsAP from client */ + [] SGsAP_CLIENT.receive(PDU_SGsAP:?) -> value msg sender vc_conn { + /* Pass message through */ + /* TODO: check which ConnectionID client has allocated + store in table? */ + SGsAP.send(t_SGsAP_Send(g_sgsap_conn_id, msg)); + } + [] SGsAP.receive(tr_SGsAP_RecvFrom_R(?)) -> value mrf { + imsi_t := f_SGsAP_get_imsi(mrf.msg); + if (isvalue(imsi_t)) { + imsi := valueof(imsi_t.iMSI.digits); + if (f_imsi_known(imsi)) { + vc_conn := f_comp_by_imsi(imsi); + SGsAP_CLIENT.send(mrf.msg) to vc_conn; + } else { + vc_conn := ops.create_cb.apply(mrf.msg, imsi, id); + f_imsi_table_add(vc_conn, imsi); + SGsAP_CLIENT.send(mrf.msg) to vc_conn; + } + } else { + /* message contained no IMSI; is not IMSI-oriented */ + var template PDU_SGsAP resp := ops.unitdata_cb.apply(mrf.msg); + if (isvalue(resp)) { + SGsAP.send(t_SGsAP_Send(g_sgsap_conn_id, valueof(resp))); + } + } + } + [] SGsAP.receive(tr_SctpAssocChange) { } + [] SGsAP.receive(tr_SctpPeerAddrChange) { } + [] SGsAP_PROC.getcall(SGsAPEM_register:{?,?}) -> param(imsi, vc_conn) { + f_create_expect(imsi, vc_conn); + SGsAP_PROC.reply(SGsAPEM_register:{imsi, vc_conn}) to vc_conn; + } + } + + } +} + +/* "Expect" Handling */ + +type record ExpectData { + hexstring imsi optional, + SGsAP_ConnHdlr vc_conn +} + +signature SGsAPEM_register(in hexstring imsi, in SGsAP_ConnHdlr hdlr); + +type port SGsAPEM_PROC_PT procedure { + inout SGsAPEM_register; +} with { extension "internal" }; + +/* Function that can be used as create_cb and will usse the expect table */ +function ExpectedCreateCallback(PDU_SGsAP msg, hexstring imsi, charstring id) +runs on SGsAP_Emulation_CT return SGsAP_ConnHdlr { + var SGsAP_ConnHdlr ret := null; + var integer i; + + for (i := 0; i < sizeof(SgsapExpectTable); i := i+1) { + if (not ispresent(SgsapExpectTable[i].imsi)) { + continue; + } + if (imsi == SgsapExpectTable[i].imsi) { + ret := SgsapExpectTable[i].vc_conn; + /* Release this entry */ + SgsapExpectTable[i].imsi := omit; + SgsapExpectTable[i].vc_conn := null; + log("Found Expect[", i, "] for ", msg, " handled at ", ret); + return ret; + } + } + setverdict(fail, "Couldn't find Expect for ", msg); + mtc.stop; +} + +private function f_create_expect(hexstring imsi, SGsAP_ConnHdlr hdlr) +runs on SGsAP_Emulation_CT { + var integer i; + + /* Check an entry like this is not already presnt */ + for (i := 0; i < sizeof(SgsapExpectTable); i := i+1) { + if (imsi == SgsapExpectTable[i].imsi) { + setverdict(fail, "IMSI already present", imsi); + mtc.stop; + } + } + for (i := 0; i < sizeof(SgsapExpectTable); i := i+1) { + if (not ispresent(SgsapExpectTable[i].imsi)) { + SgsapExpectTable[i].imsi := imsi; + SgsapExpectTable[i].vc_conn := hdlr; + log("Created Expect[", i, "] for ", imsi, " to be handled at ", hdlr); + return; + } + } + testcase.stop("No space left in SgsapExpectTable") +} + +/* client/conn_hdlr side function to use procedure port to create expect in emulation */ +function f_create_sgsap_expect(hexstring imsi) runs on SGsAP_ConnHdlr { + SGsAP_PROC.call(SGsAPEM_register:{imsi, self}) { + [] SGsAP_PROC.getreply(SGsAPEM_register:{?,?}) {}; + } +} + + +private function f_expect_table_init() +runs on SGsAP_Emulation_CT { + var integer i; + for (i := 0; i < sizeof(SgsapExpectTable); i := i + 1) { + SgsapExpectTable[i].imsi := omit; + } +} + +function DummyUnitdataCallback(PDU_SGsAP msg) +runs on SGsAP_Emulation_CT return template PDU_SGsAP { + log("Ignoring SGsAP ", msg); + return omit; +} + + +} diff --git a/regen-makefile.sh b/regen-makefile.sh index 6b32f75..b8be4ea 100755 --- a/regen-makefile.sh +++ b/regen-makefile.sh @@ -29,7 +29,7 @@ # The -DMAKEDEPEND_RUN is a workaround for Debian packaging issue, # see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=879816 for details -sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile +sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -DUSE_SCTP -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile if [ "x$CPPFLAGS_TTCN3" != "x" ]; then sed -i -e 's/CPPFLAGS_TTCN3 =/CPPFLAGS_TTCN3 = '"$CPPFLAGS_TTCN3"'/' Makefile -- To view, visit https://gerrit.osmocom.org/11306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I530f8f444d1c7ea0bf11d510da7b97f64a2039f5 Gerrit-Change-Number: 11306 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 09:52:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 28 Oct 2018 09:52:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGsAP: Switch over to osmocom branch/repo to avoid bugs in official one In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11486 ) Change subject: SGsAP: Switch over to osmocom branch/repo to avoid bugs in official one ...................................................................... SGsAP: Switch over to osmocom branch/repo to avoid bugs in official one The VLR and MME name are octetstring with dns-style labels and not character strings. Change-Id: I31a8ea04ef508beba9014aac5479693c47b7b956 --- M deps/Makefile M library/SGsAP_Templates.ttcn 2 files changed, 20 insertions(+), 20 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/deps/Makefile b/deps/Makefile index a1ac595..7cf9300 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -40,11 +40,11 @@ titan.ProtocolModules.LLC_v7.1.0 \ titan.ProtocolModules.MobileL3_v13.4.0 \ titan.ProtocolModules.NS_v7.3.0 \ - titan.ProtocolModules.SGsAP_13.2.0 \ titan.ProtocolModules.SNDCP_v7.0.0 \ titan.ProtocolEmulations.SCCP OSMOGITHUB_REPOS= titan.TestPorts.SCTPasp \ + titan.ProtocolModules.SGsAP_13.2.0 \ titan.TestPorts.MTP3asp \ titan.ProtocolEmulations.M3UA @@ -78,7 +78,7 @@ titan.ProtocolModules.RTP_commit= R.5.A titan.ProtocolModules.ROSE_commit= R.1.C titan.ProtocolModules.SCTP_commit= R.2.A -titan.ProtocolModules.SGsAP_13.2.0_commit= R.1.B +titan.ProtocolModules.SGsAP_13.2.0_commit= 520dc48dd41ee15c9fd77e71d2ea7a05c58770b9 titan.ProtocolModules.SDP_commit= R.14.A titan.ProtocolModules.SMPP_commit= R.2.A-2-gb7aee69 titan.ProtocolModules.SNDCP_v7.0.0_commit= R.2.A diff --git a/library/SGsAP_Templates.ttcn b/library/SGsAP_Templates.ttcn index aac045e..9526080 100644 --- a/library/SGsAP_Templates.ttcn +++ b/library/SGsAP_Templates.ttcn @@ -174,12 +174,12 @@ /* 9.4.13 */ -template (value) MME_Name ts_SGsAP_IE_MmeName(template (value) charstring name) := { +template (value) MME_Name ts_SGsAP_IE_MmeName(template (value) octetstring name) := { iEI := '00001001'B, lengthIndicator := lengthof(valueof(name)), name := name }; -template MME_Name tr_SGsAP_IE_MmeName(template charstring name) := { +template MME_Name tr_SGsAP_IE_MmeName(template octetstring name) := { iEI := '00001001'B, lengthIndicator := ?, name := name @@ -303,12 +303,12 @@ /* 9.4.22 */ -template (value) VLR_Name ts_SGsAP_IE_VlrName(template (value) charstring name) := { +template (value) VLR_Name ts_SGsAP_IE_VlrName(template (value) octetstring name) := { iEI := '00000010'B, lengthIndicator := lengthof(name), name := name } -template VLR_Name tr_SGsAP_IE_VlrName(template charstring name) := { +template VLR_Name tr_SGsAP_IE_VlrName(template octetstring name) := { iEI := '00000010'B, lengthIndicator := ?, name := name @@ -397,7 +397,7 @@ /* 8.6 */ template (value) PDU_SGsAP ts_SGsAP_EPS_DETACH_IND(hexstring imsi, - template (value) charstring mme_name, + template (value) octetstring mme_name, template (value) IMSI_detachFromEPS_serviceType det_serv_typ) := { sGsAP_EPS_DETACH_INDICATION:= { messageType := '00010001'B, @@ -407,7 +407,7 @@ } } template PDU_SGsAP tr_SGsAP_EPS_DETACH_IND(template hexstring imsi, - template charstring mme_name, + template octetstring mme_name, template IMSI_detachFromEPS_serviceType det_serv_typ) := { sGsAP_EPS_DETACH_INDICATION:= { messageType := '00010001'B, @@ -433,7 +433,7 @@ /* 8.8 */ template (value) PDU_SGsAP ts_SGsAP_IMSI_DETACH_IND(hexstring imsi, - template (value) charstring mme_name, + template (value) octetstring mme_name, template (value) IMSI_detachFromNonEPS_serviceType det_serv_typ) := { sGsAP_IMSI_DETACH_INDICATION := { messageType := '00010011'B, @@ -443,7 +443,7 @@ } } template PDU_SGsAP tr_SGsAP_IMSI_DETACH_IND(template hexstring imsi, - template charstring mme_name := ?, + template octetstring mme_name := ?, template IMSI_detachFromNonEPS_serviceType det_serv_typ := ?) := { sGsAP_IMSI_DETACH_INDICATION := { messageType := '00010011'B, @@ -498,7 +498,7 @@ /* 8.11 */ template (value) PDU_SGsAP ts_SGsAP_LU_REQ(hexstring imsi, - template (value) charstring mme_name, + template (value) octetstring mme_name, template (value) EPS_location_update_type eps_lu_type, template (value) LocationAreaIdValue new_lai) := { sGsAP_LOCATION_UPDATE_REQUEST := { @@ -517,7 +517,7 @@ } } template PDU_SGsAP tr_SGsAP_LU_REQ(template hexstring imsi, - template charstring mme_name := ?, + template octetstring mme_name := ?, template EPS_location_update_type eps_lu_type := ?, template LocationAreaIdValue new_lai := ?) := { sGsAP_LOCATION_UPDATE_REQUEST := { @@ -574,7 +574,7 @@ /* 8.14 */ template (value) PDU_SGsAP ts_SGsAP_PAGING_REQ(hexstring imsi, - template (value) charstring vlr_name, + template (value) octetstring vlr_name, template (value) Service_Indicator serv_ind, template (omit) OCT4 tmsi) := { @@ -596,7 +596,7 @@ } } template PDU_SGsAP tr_SGsAP_PAGING_REQ(template hexstring imsi, - template charstring vlr_name, + template octetstring vlr_name, template Service_Indicator serv_ind, template OCT4 tmsi) := { @@ -619,21 +619,21 @@ } /* 8.15 */ -template (value) PDU_SGsAP ts_SGsAP_RESET_ACK_MME(template (value) charstring mme_name) := { +template (value) PDU_SGsAP ts_SGsAP_RESET_ACK_MME(template (value) octetstring mme_name) := { sGsAP_RESET_ACK := { messageType := '00010110'B, mME_Name := ts_SGsAP_IE_MmeName(mme_name), vLR_Name := omit } } -template (value) PDU_SGsAP ts_SGsAP_RESET_ACK_VLR(template (value) charstring vlr_name) := { +template (value) PDU_SGsAP ts_SGsAP_RESET_ACK_VLR(template (value) octetstring vlr_name) := { sGsAP_RESET_ACK := { messageType := '00010110'B, mME_Name := omit, vLR_Name := ts_SGsAP_IE_VlrName(vlr_name) } } -template PDU_SGsAP tr_SGsAP_RESET_ACK(template charstring mme_name, template charstring vlr_name) := { +template PDU_SGsAP tr_SGsAP_RESET_ACK(template octetstring mme_name, template octetstring vlr_name) := { sGsAP_RESET_ACK := { messageType := '00010110'B, mME_Name := tr_SGsAP_IE_MmeName(mme_name), @@ -642,21 +642,21 @@ } /* 8.16 */ -template (value) PDU_SGsAP ts_SGsAP_RESET_IND_MME(template (value) charstring mme_name) := { +template (value) PDU_SGsAP ts_SGsAP_RESET_IND_MME(template (value) octetstring mme_name) := { sGsAP_RESET_INDICATION := { messageType := '00010101'B, mME_Name := ts_SGsAP_IE_MmeName(mme_name), vLR_Name := omit } } -template (value) PDU_SGsAP ts_SGsAP_RESET_IND_VLR(template (value) charstring vlr_name) := { +template (value) PDU_SGsAP ts_SGsAP_RESET_IND_VLR(template (value) octetstring vlr_name) := { sGsAP_RESET_INDICATION := { messageType := '00010101'B, mME_Name := omit, vLR_Name := ts_SGsAP_IE_VlrName(vlr_name) } } -template PDU_SGsAP tr_SGsAP_RESET_IND(template charstring mme_name, template charstring vlr_name) := { +template PDU_SGsAP tr_SGsAP_RESET_IND(template octetstring mme_name, template octetstring vlr_name) := { sGsAP_RESET_INDICATION := { messageType := '00010101'B, mME_Name := tr_SGsAP_IE_MmeName(mme_name), -- To view, visit https://gerrit.osmocom.org/11486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I31a8ea04ef508beba9014aac5479693c47b7b956 Gerrit-Change-Number: 11486 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 09:52:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 28 Oct 2018 09:52:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGsAP_Emulation: Add functions to send MME or VLR reset In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11487 ) Change subject: SGsAP_Emulation: Add functions to send MME or VLR reset ...................................................................... SGsAP_Emulation: Add functions to send MME or VLR reset ... including encoding/decoding of names between string and binary labels Change-Id: I981c7c1d34f0db60031b5436739cd924e5a09407 --- A library/DNS_Helpers.ttcn M library/SGsAP_Emulation.ttcn 2 files changed, 106 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/DNS_Helpers.ttcn b/library/DNS_Helpers.ttcn new file mode 100644 index 0000000..45c3a09 --- /dev/null +++ b/library/DNS_Helpers.ttcn @@ -0,0 +1,63 @@ +module DNS_Helpers { + +private function f_strchr(charstring s, char c) return integer { + var integer i; + for (i := 0; i < lengthof(s); i := i+1) { + if (s[i] == c) { + return i; + } + } + return -1; +} + +private function f_dns_enc_label(charstring str) return octetstring { + var octetstring ret; + + ret[0] := int2oct(lengthof(str), 1); + return ret & char2oct(str); +} + +function f_enc_dns_hostname(charstring str) return octetstring { + var octetstring ret := ''O; + while (lengthof(str) > 0) { + var integer dot_idx; + var octetstring lbl; + + dot_idx := f_strchr(str, "."); + if (dot_idx >= 0) { + /* there is another dot */ + lbl := f_dns_enc_label(substr(str, 0, dot_idx)); + str := substr(str, dot_idx+1, lengthof(str)-dot_idx-1); + } else { + /* no more dot */ + lbl := f_dns_enc_label(str); + str := ""; + } + ret := ret & lbl; + } + return ret; +} + + + + +function f_dec_dns_hostname(octetstring inp) return charstring { + var charstring ret := ""; + while (lengthof(inp) > 0) { + var integer label_len; + var charstring lbl; + + label_len := oct2int(substr(inp, 0, 1)); + lbl := oct2char(substr(inp, 1, label_len)); + inp := substr(inp, 1+label_len, lengthof(inp)-1-label_len); + + ret := ret & lbl; + if (lengthof(inp) > 0) { + ret := ret & "."; + } + } + return ret; +} + + +} diff --git a/library/SGsAP_Emulation.ttcn b/library/SGsAP_Emulation.ttcn index 0c37840..968bcdd 100644 --- a/library/SGsAP_Emulation.ttcn +++ b/library/SGsAP_Emulation.ttcn @@ -31,6 +31,7 @@ import from SGsAP_Templates all; import from Osmocom_Types all; import from IPL4asp_Types all; +import from DNS_Helpers all; type component SGsAP_ConnHdlr { port SGsAP_Conn_PT SGsAP; @@ -295,6 +296,7 @@ var hexstring imsi; var SGsAP_RecvFrom mrf; var PDU_SGsAP msg; + var charstring vlr_name, mme_name; alt { /* SGsAP from client */ @@ -329,6 +331,24 @@ f_create_expect(imsi, vc_conn); SGsAP_PROC.reply(SGsAPEM_register:{imsi, vc_conn}) to vc_conn; } + [] SGsAP_PROC.getcall(SGsAPEM_reset_mme:{?,-}) -> param(mme_name) { + var octetstring mme_enc, vlr_enc; + mme_enc := f_enc_dns_hostname(mme_name); + msg := f_sgsap_xceive(ts_SGsAP_RESET_IND_MME(mme_enc)); + vlr_enc := msg.sGsAP_RESET_ACK.vLR_Name.name; + vlr_name := f_dec_dns_hostname(vlr_enc); + SGsAP_PROC.reply(SGsAPEM_reset_mme:{mme_name, vlr_name}); + } + [] SGsAP_PROC.getcall(SGsAPEM_reset_vlr:{?,-}) -> param(vlr_name) { + var octetstring mme_enc, vlr_enc; + vlr_enc := f_enc_dns_hostname(vlr_name); + msg := f_sgsap_xceive(ts_SGsAP_RESET_IND_VLR(vlr_enc)); + mme_enc := msg.sGsAP_RESET_ACK.mME_Name.name; + mme_name := f_dec_dns_hostname(mme_enc); + SGsAP_PROC.reply(SGsAPEM_reset_vlr:{vlr_name, mme_name}); + } + + } } @@ -343,8 +363,11 @@ signature SGsAPEM_register(in hexstring imsi, in SGsAP_ConnHdlr hdlr); +signature SGsAPEM_reset_vlr(in charstring vlr_name, out charstring mme_name); +signature SGsAPEM_reset_mme(in charstring mme_name, out charstring vlr_name); + type port SGsAPEM_PROC_PT procedure { - inout SGsAPEM_register; + inout SGsAPEM_register, SGsAPEM_reset_vlr, SGsAPEM_reset_mme; } with { extension "internal" }; /* Function that can be used as create_cb and will usse the expect table */ @@ -399,6 +422,25 @@ } } +/* client/conn_hdlr side function to use procedure port to send RESET from emulated MME */ +function f_sgsap_reset_mme(charstring mme_name) runs on SGsAP_ConnHdlr return charstring { + var charstring vlr_name; + SGsAP_PROC.call(SGsAPEM_reset_mme:{mme_name, -}) { + [] SGsAP_PROC.getreply(SGsAPEM_reset_mme:{mme_name,?}) -> param(vlr_name) { + return vlr_name; + }; + } +} + +/* client/conn_hdlr side function to use procedure port to send RESET from emulated VLR */ +function f_sgsap_reset_vlr(charstring vlr_name) runs on SGsAP_ConnHdlr return charstring { + var charstring mme_name; + SGsAP_PROC.call(SGsAPEM_reset_vlr:{vlr_name, -}) { + [] SGsAP_PROC.getreply(SGsAPEM_reset_vlr:{vlr_name,?}) -> param(mme_name) { + return mme_name; + }; + } +} private function f_expect_table_init() runs on SGsAP_Emulation_CT { -- To view, visit https://gerrit.osmocom.org/11487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I981c7c1d34f0db60031b5436739cd924e5a09407 Gerrit-Change-Number: 11487 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 13:03:29 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 28 Oct 2018 13:03:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/VTY: fix prompt matching in f_vty_wait_for_prompt() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11489 Change subject: library/VTY: fix prompt matching in f_vty_wait_for_prompt() ...................................................................... library/VTY: fix prompt matching in f_vty_wait_for_prompt() Matching the prompt by a sequence of any alphanumeric characters (i.e. '\w+') is a bad idea, because it can led to false-positive matching results, for example: - '\w+> ' matches the following: * 'OsmoBlaBla> ', * 'Switching default route from to foobar'. Let's avoid using such implicit patterns, and replace the '\w+' by mp_prompt_prefix, that basically contains the process name. Change-Id: I8a0e3fcfb0c4e5854b7b1e39296052e679c63c73 Related: OS#3675 --- M library/Osmocom_VTY_Functions.ttcn 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/11489/1 diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn index b822645..b56b792 100644 --- a/library/Osmocom_VTY_Functions.ttcn +++ b/library/Osmocom_VTY_Functions.ttcn @@ -9,6 +9,9 @@ const charstring VTY_ENABLE_SUFFIX := "# "; const charstring VTY_CFG_SUFFIX := "(*)"; + template charstring t_vty_prompt_view := pattern mp_prompt_prefix & "> "; + template charstring t_vty_prompt_enable := pattern mp_prompt_prefix & "\# "; + template charstring t_vty_prompt_config := pattern mp_prompt_prefix & "(*)\# "; template charstring t_vty_unknown := pattern "*% Unknown command."; /* configure prompts in TELNETasp module */ @@ -51,9 +54,9 @@ T.start; alt { - [] pt.receive(pattern "\w+" & VTY_VIEW_SUFFIX) { }; - [] pt.receive(pattern "\w+\# ") { }; - [] pt.receive(pattern "\w+" & VTY_CFG_SUFFIX) { }; + [] pt.receive(t_vty_prompt_view) { }; + [] pt.receive(t_vty_prompt_enable) { }; + [] pt.receive(t_vty_prompt_config) { }; [] pt.receive(t_vty_unknown) { testcase.stop(fail, "VTY: Unknown Command"); }; -- To view, visit https://gerrit.osmocom.org/11489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8a0e3fcfb0c4e5854b7b1e39296052e679c63c73 Gerrit-Change-Number: 11489 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 13:21:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 28 Oct 2018 13:21:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/VTY: fix prompt matching in f_vty_wait_for_prompt() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11489 ) Change subject: library/VTY: fix prompt matching in f_vty_wait_for_prompt() ...................................................................... Patch Set 1: Thanks for looking into this, but... 14:19 <@LaF0rge> fixeria: did you check the commit history of the VTY_Functions.ttcn? 14:20 <@LaF0rge> fixeria: if you want to rvert I574b56c42fe95540af44a2c43d0fb469938c0e65, then simply revert it, rather than reimplementing the old code in a diffeernt way 14:20 <@LaF0rge> fixeria: the poit is that we cannot really rely on the module parameter, as that assumes threre's only a single VTY we talk to. This is too restrictive for more advanced testing whre we'd like to talk to multiple different VTY interfaces -- To view, visit https://gerrit.osmocom.org/11489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8a0e3fcfb0c4e5854b7b1e39296052e679c63c73 Gerrit-Change-Number: 11489 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Sun, 28 Oct 2018 13:21:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 13:22:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 28 Oct 2018 13:22:09 +0000 Subject: Change in libosmocore[master]: gsm23003: Add MME domain name related helper functions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11411 ) Change subject: gsm23003: Add MME domain name related helper functions ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia882d9db05ec0037e593aeebea21bc31adb680bb Gerrit-Change-Number: 11411 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 28 Oct 2018 13:22:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 13:22:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 28 Oct 2018 13:22:12 +0000 Subject: Change in libosmocore[master]: gsm23003: Add MME domain name related helper functions In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11411 ) Change subject: gsm23003: Add MME domain name related helper functions ...................................................................... gsm23003: Add MME domain name related helper functions osmo_gen_mme_group_domain(), osmo_gen_mme_group_domain() and osmo_gen_home_network_domain() Change-Id: Ia882d9db05ec0037e593aeebea21bc31adb680bb --- M include/osmocom/gsm/gsm23003.h M include/osmocom/gsm/protocol/gsm_23_003.h M src/gsm/gsm23003.c M src/gsm/libosmogsm.map M tests/gsm23003/gsm23003_test.c M tests/gsm23003/gsm23003_test.ok 6 files changed, 185 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/gsm/gsm23003.h b/include/osmocom/gsm/gsm23003.h index fd4f369..2f380ae 100644 --- a/include/osmocom/gsm/gsm23003.h +++ b/include/osmocom/gsm/gsm23003.h @@ -101,6 +101,7 @@ const char *osmo_lai_name(const struct osmo_location_area_id *lai); const char *osmo_cgi_name(const struct osmo_cell_global_id *cgi); const char *osmo_cgi_name2(const struct osmo_cell_global_id *cgi); +const char *osmo_gummei_name(const struct osmo_gummei *gummei); void osmo_plmn_to_bcd(uint8_t *bcd_dst, const struct osmo_plmn_id *plmn); void osmo_plmn_from_bcd(const uint8_t *bcd_src, struct osmo_plmn_id *plmn); @@ -120,3 +121,9 @@ int osmo_mnc_cmp(uint16_t a_mnc, bool a_mnc_3_digits, uint16_t b_mnc, bool b_mnc_3_digits); int osmo_plmn_cmp(const struct osmo_plmn_id *a, const struct osmo_plmn_id *b); + +int osmo_gen_home_network_domain(char *out, const struct osmo_plmn_id *plmn); +int osmo_parse_home_network_domain(struct osmo_plmn_id *out, const char *in); +int osmo_gen_mme_domain(char *out, const struct osmo_gummei *gummei); +int osmo_gen_mme_group_domain(char *out, uint16_t mmegi, const struct osmo_plmn_id *plmn); +int osmo_parse_mme_domain(struct osmo_gummei *out, const char *in); diff --git a/include/osmocom/gsm/protocol/gsm_23_003.h b/include/osmocom/gsm/protocol/gsm_23_003.h index 0e66939..ee697ff 100644 --- a/include/osmocom/gsm/protocol/gsm_23_003.h +++ b/include/osmocom/gsm/protocol/gsm_23_003.h @@ -24,3 +24,9 @@ GSM23003_IMEI_SNR_NUM_DIGITS + 1) #define GSM23003_IMEISV_NUM_DIGITS (GSM23003_IMEI_TAC_NUM_DIGITS + \ GSM23003_IMEI_SNR_NUM_DIGITS + 2) + +/* Chapter 19.2 "epc.mnc000.mcc000.3gppnetwork.org" */ +#define GSM23003_HOME_NETWORK_DOMAIN_LEN 33 + +/* Chapter 19.4.2.4: "mmec00.mmegi0000.mme.epc.mnc000.mcc000.3gppnetwork.org" */ +#define GSM23003_MME_DOMAIN_LEN 55 diff --git a/src/gsm/gsm23003.c b/src/gsm/gsm23003.c index 2c3b21e..4fdad48 100644 --- a/src/gsm/gsm23003.c +++ b/src/gsm/gsm23003.c @@ -169,6 +169,14 @@ bcd[0] = val % 10; } +const char *osmo_gummei_name(const struct osmo_gummei *gummei) +{ + static char buf[32]; + snprintf(buf, sizeof(buf), "%s-%04x-%02x", osmo_plmn_name(&gummei->plmn), + gummei->mme.group_id, gummei->mme.code); + return buf; +} + /* Convert MCC + MNC to BCD representation * \param[out] bcd_dst caller-allocated memory for output * \param[in] mcc Mobile Country Code @@ -297,3 +305,81 @@ return 1; return osmo_mnc_cmp(a->mnc, a->mnc_3_digits, b->mnc, b->mnc_3_digits); } + +/*! Generate TS 23.003 Section 19.2 Home Network Realm/Domain (text form) + * \param out[out] caller-provided output buffer, at least 33 bytes long + * \param plmn[in] Osmocom representation of PLMN ID (MCC + MNC) + * \returns number of characters printed (excluding NUL); negative on error */ +int osmo_gen_home_network_domain(char *out, const struct osmo_plmn_id *plmn) +{ + if (plmn->mcc > 999) + return -EINVAL; + if (plmn->mnc > 999) + return -EINVAL; + return sprintf(out, "epc.mnc%03u.mcc%03u.3gppnetwork.org", plmn->mnc, plmn->mcc); +} + +/*! Parse a TS 23.003 Section 19.2 Home Network Realm/Domain (text form) into a \ref osmo_plmn_id + * \param out[out] caller-allocated output structure + * \param in[in] character string representation to be parsed + * \returns 0 on success; negative on error */ +int osmo_parse_home_network_domain(struct osmo_plmn_id *out, const char *in) +{ + int rc; + + memset(out, 0, sizeof(*out)); + rc = sscanf(in, "epc.mnc%03hu.mcc%03hu.3gppnetwork.org", &out->mnc, &out->mcc); + if (rc < 0) + return rc; + if (rc != 2) + return -EINVAL; + return 0; +} + +/*! Generate TS 23.003 Section 19.4.2.4 MME Domain (text form) + * \param out[out] caller-provided output buffer, at least 56 bytes long + * \param gummei[in] Structure representing the Globally Unique MME Identifier + * \returns number of characters printed (excluding NUL); negative on error */ +int osmo_gen_mme_domain(char *out, const struct osmo_gummei *gummei) +{ + char domain[GSM23003_HOME_NETWORK_DOMAIN_LEN+1]; + int rc; + rc = osmo_gen_home_network_domain(domain, &gummei->plmn); + if (rc < 0) + return rc; + return sprintf(out, "mmec%02x.mmegi%04x.mme.%s", gummei->mme.code, gummei->mme.group_id, domain); +} + +/*! Parse a TS 23.003 Section 19.4.2.4 MME Domain (text form) into a \ref osmo_gummei + * \param out[out] caller-allocated output GUMMEI structure + * \param in[in] character string representation to be parsed + * \returns 0 on success; negative on error */ +int osmo_parse_mme_domain(struct osmo_gummei *out, const char *in) +{ + int rc; + + memset(out, 0, sizeof(*out)); + rc = sscanf(in, "mmec%02hhx.mmegi%04hx.mme.epc.mnc%03hu.mcc%03hu.3gppnetwork.org", + &out->mme.code, &out->mme.group_id, + &out->plmn.mnc, &out->plmn.mcc); + if (rc < 0) + return rc; + if (rc != 4) + return -EINVAL; + return 0; +} + +/*! Generate TS 23.003 Section 19.4.2.4 MME Group Domain (text form) + * \param out[out] caller-provided output buffer, at least 56 bytes long + * \param mmegi[in] MME Group Identifier + * \param plmn[in] Osmocom representation of PLMN ID (MCC + MNC) + * \returns number of characters printed (excluding NUL); negative on error */ +int osmo_gen_mme_group_domain(char *out, uint16_t mmegi, const struct osmo_plmn_id *plmn) +{ + char domain[GSM23003_HOME_NETWORK_DOMAIN_LEN+1]; + int rc; + rc = osmo_gen_home_network_domain(domain, plmn); + if (rc < 0) + return rc; + return sprintf(out, "mmegi%04x.mme.%s", mmegi, domain); +} diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 3cc2ec5..4813e13 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -315,9 +315,15 @@ osmo_rai_name; osmo_cgi_name; osmo_cgi_name2; +osmo_gummei_name; osmo_mnc_from_str; osmo_mnc_cmp; osmo_plmn_cmp; +osmo_gen_home_network_domain; +osmo_parse_home_network_domain; +osmo_gen_mme_domain; +osmo_parse_mme_domain; +osmo_gen_mme_group_domain; gsm48_chan_mode_names; gsm_chan_t_names; gsm48_pdisc_names; diff --git a/tests/gsm23003/gsm23003_test.c b/tests/gsm23003/gsm23003_test.c index 947aa18..79965cf 100644 --- a/tests/gsm23003/gsm23003_test.c +++ b/tests/gsm23003/gsm23003_test.c @@ -24,8 +24,10 @@ #include #include #include +#include #include +#include #include #define BOOL_STR(b) ((b)? "true" : "false") @@ -170,6 +172,76 @@ return pass; } +static bool test_gummei_name() +{ + static const struct osmo_gummei gummei = { + .plmn = { .mcc = 901, .mnc = 70 }, + .mme = { .group_id = 0xA123, .code = 0xB1 } + }; + const char *out; + bool pass = true; + + out = osmo_gummei_name(&gummei); + printf("%s\n", out); + if (strcmp(out, "901-70-a123-b1")) + pass = false; + + return pass; +} + +static bool test_domain_gen() +{ + static const struct osmo_gummei gummei = { + .plmn = { .mcc = 901, .mnc = 70 }, + .mme = { .group_id = 0xA123, .code = 0xB1 } + }; + char out[GSM23003_MME_DOMAIN_LEN]; + bool pass = true; + int rc; + + rc = osmo_gen_home_network_domain(out, &gummei.plmn); + if (rc < 0) + pass = false; + printf("%s -> %s\n", osmo_plmn_name(&gummei.plmn), out); + if (strcmp(out, "epc.mnc070.mcc901.3gppnetwork.org")) + pass = false; + + rc = osmo_gen_mme_domain(out, &gummei); + printf("%s -> %s\n", osmo_gummei_name(&gummei), out); + if (strcmp(out, "mmecb1.mmegia123.mme.epc.mnc070.mcc901.3gppnetwork.org")) + pass = false; + + return pass; +} + + +static bool test_domain_parse() +{ + static const char *mme_dom_valid = "mmec01.mmegiA001.mme.epc.mnc070.mcc901.3gppnetwork.org"; + static const char *home_dom_valid = "epc.mnc070.mcc901.3gppnetwork.org"; + struct osmo_gummei gummei; + struct osmo_plmn_id plmn; + bool pass = true; + int rc; + + rc = osmo_parse_home_network_domain(&plmn, home_dom_valid); + if (rc < 0) + pass = false; + printf("%s -> %s\n", home_dom_valid, osmo_plmn_name(&plmn)); + if (plmn.mcc != 901 || plmn.mnc != 70) + pass = false; + + rc = osmo_parse_mme_domain(&gummei, mme_dom_valid); + if (rc < 0) + pass = false; + printf("%s -> %s\n", mme_dom_valid, osmo_gummei_name(&gummei)); + if (gummei.plmn.mcc != 901 || gummei.plmn.mnc != 70 || + gummei.mme.group_id != 0xA001 || gummei.mme.code != 1) + pass = false; + + return pass; +} + int main(int argc, char **argv) { bool pass = true; @@ -177,6 +249,9 @@ pass = pass && test_valid_imsi(); pass = pass && test_valid_msisdn(); pass = pass && test_mnc_from_str(); + pass = pass && test_gummei_name(); + pass = pass && test_domain_gen(); + pass = pass && test_domain_parse(); OSMO_ASSERT(pass); diff --git a/tests/gsm23003/gsm23003_test.ok b/tests/gsm23003/gsm23003_test.ok index b435f45..c64f515 100644 --- a/tests/gsm23003/gsm23003_test.ok +++ b/tests/gsm23003/gsm23003_test.ok @@ -59,3 +59,8 @@ 13: " 023" rc=-22 mnc=0 mnc_3_digits=0 pass 14: "023 " rc=-22 mnc=0 mnc_3_digits=0 pass 15: "023 " rc=-22 mnc=0 mnc_3_digits=0 pass +901-70-a123-b1 +901-70 -> epc.mnc070.mcc901.3gppnetwork.org +901-70-a123-b1 -> mmecb1.mmegia123.mme.epc.mnc070.mcc901.3gppnetwork.org +epc.mnc070.mcc901.3gppnetwork.org -> 901-70 +mmec01.mmegiA001.mme.epc.mnc070.mcc901.3gppnetwork.org -> 901-70-a001-01 -- To view, visit https://gerrit.osmocom.org/11411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia882d9db05ec0037e593aeebea21bc31adb680bb Gerrit-Change-Number: 11411 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Oct 28 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 28 Oct 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#290?= In-Reply-To: <248828247.250.1540653007332.JavaMail.jenkins@jenkins.osmocom.org> References: <248828247.250.1540653007332.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <385043837.268.1540739407375.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun Oct 28 16:28:49 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 28 Oct 2018 16:28:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/VTY: fix CONFIG prompt matching in f_vty_wait_for_prompt() In-Reply-To: References: Message-ID: Hello daniel, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11489 to look at the new patch set (#2). Change subject: library/VTY: fix CONFIG prompt matching in f_vty_wait_for_prompt() ...................................................................... library/VTY: fix CONFIG prompt matching in f_vty_wait_for_prompt() Matching the CONFIG prompt using implicit '\w+(*)' pattern is a bad idea, because it can actually match almost anything: - 'OsmoBlaBla(config)# ', - 'OsmoBlaBla(config) ', - 'OsmoBlaBla> ', - 'Mahlzeit'! One problem is that the parentheses are interpreted as a matching operator (which is used to group an expression), so they should have been escaped by '\'. Another problem is that this pattern is not complete, because '\# ' is missing. Let's fix this! Change-Id: I8a0e3fcfb0c4e5854b7b1e39296052e679c63c73 Related: OS#3675 --- M library/Osmocom_VTY_Functions.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/11489/2 -- To view, visit https://gerrit.osmocom.org/11489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8a0e3fcfb0c4e5854b7b1e39296052e679c63c73 Gerrit-Change-Number: 11489 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 17:20:39 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 28 Oct 2018 17:20:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L1CTL_Types.ttcn: drop length limitation for traffic messages Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11490 Change subject: L1CTL_Types.ttcn: drop length limitation for traffic messages ...................................................................... L1CTL_Types.ttcn: drop length limitation for traffic messages There is no any reason to limit payload length. Change-Id: I1782856affe427b087fa3f7ef1c02a865d136372 --- M library/L1CTL_Types.ttcn 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/11490/1 diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn index 39732be..4273ba3 100644 --- a/library/L1CTL_Types.ttcn +++ b/library/L1CTL_Types.ttcn @@ -83,8 +83,6 @@ L1CTL_RES_T_SCHED } with { variant "FIELDLENGTH(8)" }; - const integer TRAFFIC_DATA_LEN := 40; - type record L1ctlHdrFlags { BIT7 padding, boolean f_done @@ -299,7 +297,7 @@ type record L1ctlTrafficReq { - octetstring data length(TRAFFIC_DATA_LEN) + octetstring data } with { variant (data) "BYTEORDER(first)" } -- To view, visit https://gerrit.osmocom.org/11490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1782856affe427b087fa3f7ef1c02a865d136372 Gerrit-Change-Number: 11490 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 17:21:25 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 28 Oct 2018 17:21:25 +0000 Subject: Change in osmocom-bb[master]: l1ctl_proto.h: use flexible array member for traffic messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11395 ) Change subject: l1ctl_proto.h: use flexible array member for traffic messages ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I119fa36c84e95c3003d57c19e25f8146ed45c3c6 Gerrit-Change-Number: 11395 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 28 Oct 2018 17:21:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 17:21:43 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 28 Oct 2018 17:21:43 +0000 Subject: Change in osmocom-bb[master]: l1ctl_proto.h: use flexible array member for traffic messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11395 ) Change subject: l1ctl_proto.h: use flexible array member for traffic messages ...................................................................... Patch Set 2: Please see: https://gerrit.osmocom.org/11490/ -- To view, visit https://gerrit.osmocom.org/11395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I119fa36c84e95c3003d57c19e25f8146ed45c3c6 Gerrit-Change-Number: 11395 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 28 Oct 2018 17:21:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 19:08:02 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 28 Oct 2018 19:08:02 +0000 Subject: Change in pysim[master]: pySim/transport: introduce Calypso based reader interface In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11480 to look at the new patch set (#3). Change subject: pySim/transport: introduce Calypso based reader interface ...................................................................... pySim/transport: introduce Calypso based reader interface This interface allows to use a Calypso based phone (e.g. Motorola C1XX) as a SIM card reader. It basically implements a few L1CTL messages that are used to interact with the SIM card through the OsmocomBB 'layer1' firmware. Please note, that this is an experimental implementation, and there is a risk that SIM programming would fail. Nevertheless, I've managed to program and read one of my SIMs a few times. Change-Id: Iec8101140581bf9e2cf7cf3a0b54bdf1875fc51b --- M pySim/exceptions.py A pySim/transport/calypso.py 2 files changed, 160 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/80/11480/3 -- To view, visit https://gerrit.osmocom.org/11480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iec8101140581bf9e2cf7cf3a0b54bdf1875fc51b Gerrit-Change-Number: 11480 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 19:08:02 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 28 Oct 2018 19:08:02 +0000 Subject: Change in pysim[master]: pySim-*.py: add command line option for Calypso reader In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11482 to look at the new patch set (#3). Change subject: pySim-*.py: add command line option for Calypso reader ...................................................................... pySim-*.py: add command line option for Calypso reader Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df --- M pySim-prog.py M pySim-read.py 2 files changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/82/11482/3 -- To view, visit https://gerrit.osmocom.org/11482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df Gerrit-Change-Number: 11482 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 19:08:03 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 28 Oct 2018 19:08:03 +0000 Subject: Change in pysim[master]: pySim-*.py: print info about selected reader interface Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11491 Change subject: pySim-*.py: print info about selected reader interface ...................................................................... pySim-*.py: print info about selected reader interface Change-Id: Idd791d7ef635e15915aab13274aefc15e70777b0 --- M pySim-prog.py M pySim-read.py 2 files changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/91/11491/1 diff --git a/pySim-prog.py b/pySim-prog.py index ba1b783..192fb5a 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -564,9 +564,13 @@ # Init card reader driver if opts.pcsc_dev is not None: + print("Using PC/SC reader (dev=%d) interface" + % opts.pcsc_dev) from pySim.transport.pcsc import PcscSimLink sl = PcscSimLink(opts.pcsc_dev) else: # Serial reader is default + print("Using serial reader (port=%s, baudrate=%d) interface" + % (opts.device, opts.baudrate)) from pySim.transport.serial import SerialSimLink sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) diff --git a/pySim-read.py b/pySim-read.py index 066b0df..3108f5f 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -72,9 +72,13 @@ # Init card reader driver if opts.pcsc_dev is not None: + print("Using PC/SC reader (dev=%d) interface" + % opts.pcsc_dev) from pySim.transport.pcsc import PcscSimLink sl = PcscSimLink(opts.pcsc_dev) else: # Serial reader is default + print("Using serial reader (port=%s, baudrate=%d) interface" + % (opts.device, opts.baudrate)) from pySim.transport.serial import SerialSimLink sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) -- To view, visit https://gerrit.osmocom.org/11491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idd791d7ef635e15915aab13274aefc15e70777b0 Gerrit-Change-Number: 11491 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 19:08:20 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 28 Oct 2018 19:08:20 +0000 Subject: Change in pysim[master]: (WIP/CHECK): dump parsed arguments In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/11485 ) Change subject: (WIP/CHECK): dump parsed arguments ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I08ddaf2040328aedb714debaf15707279cd7a0e3 Gerrit-Change-Number: 11485 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 19:46:26 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 28 Oct 2018 19:46:26 +0000 Subject: Change in pysim[master]: pySim-*.py: add command line option for Calypso reader In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11482 to look at the new patch set (#4). Change subject: pySim-*.py: add command line option for Calypso reader ...................................................................... pySim-*.py: add command line option for Calypso reader Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df --- M pySim-prog.py M pySim-read.py 2 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/82/11482/4 -- To view, visit https://gerrit.osmocom.org/11482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df Gerrit-Change-Number: 11482 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 19:46:26 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 28 Oct 2018 19:46:26 +0000 Subject: Change in pysim[master]: pySim-*.py: print info about selected reader interface In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11491 to look at the new patch set (#2). Change subject: pySim-*.py: print info about selected reader interface ...................................................................... pySim-*.py: print info about selected reader interface Change-Id: Idd791d7ef635e15915aab13274aefc15e70777b0 --- M pySim-prog.py M pySim-read.py 2 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/91/11491/2 -- To view, visit https://gerrit.osmocom.org/11491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idd791d7ef635e15915aab13274aefc15e70777b0 Gerrit-Change-Number: 11491 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 20:47:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 28 Oct 2018 20:47:50 +0000 Subject: Change in osmocom-bb[master]: l1ctl_proto.h: use flexible array member for traffic messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11395 ) Change subject: l1ctl_proto.h: use flexible array member for traffic messages ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11395/2/src/host/layer23/src/common/l1ctl.c File src/host/layer23/src/common/l1ctl.c: https://gerrit.osmocom.org/#/c/11395/2/src/host/layer23/src/common/l1ctl.c at 781 PS2, Line 781: size_t frame_len; : uint8_t *frame; I don't really see the point of introducing those two variables. Why not simply use msgb->l3h = (uint8_t *)data; and then use msgb_l3len(msg) where you want to access frame_len and mesb_l3(msg) when you want frame? -- To view, visit https://gerrit.osmocom.org/11395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I119fa36c84e95c3003d57c19e25f8146ed45c3c6 Gerrit-Change-Number: 11395 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 28 Oct 2018 20:47:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 20:48:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 28 Oct 2018 20:48:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/VTY: fix CONFIG prompt matching in f_vty_wait_for_prompt() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11489 ) Change subject: library/VTY: fix CONFIG prompt matching in f_vty_wait_for_prompt() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8a0e3fcfb0c4e5854b7b1e39296052e679c63c73 Gerrit-Change-Number: 11489 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Sun, 28 Oct 2018 20:48:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 20:49:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 28 Oct 2018 20:49:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/VTY: fix CONFIG prompt matching in f_vty_wait_for_prompt() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11489 ) Change subject: library/VTY: fix CONFIG prompt matching in f_vty_wait_for_prompt() ...................................................................... library/VTY: fix CONFIG prompt matching in f_vty_wait_for_prompt() Matching the CONFIG prompt using implicit '\w+(*)' pattern is a bad idea, because it can actually match almost anything: - 'OsmoBlaBla(config)# ', - 'OsmoBlaBla(config) ', - 'OsmoBlaBla> ', - 'Mahlzeit'! One problem is that the parentheses are interpreted as a matching operator (which is used to group an expression), so they should have been escaped by '\'. Another problem is that this pattern is not complete, because '\# ' is missing. Let's fix this! Change-Id: I8a0e3fcfb0c4e5854b7b1e39296052e679c63c73 Related: OS#3675 --- M library/Osmocom_VTY_Functions.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn index b822645..86f58f1 100644 --- a/library/Osmocom_VTY_Functions.ttcn +++ b/library/Osmocom_VTY_Functions.ttcn @@ -53,7 +53,7 @@ alt { [] pt.receive(pattern "\w+" & VTY_VIEW_SUFFIX) { }; [] pt.receive(pattern "\w+\# ") { }; - [] pt.receive(pattern "\w+" & VTY_CFG_SUFFIX) { }; + [] pt.receive(pattern "\w+\(*\)\# ") { }; [] pt.receive(t_vty_unknown) { testcase.stop(fail, "VTY: Unknown Command"); }; -- To view, visit https://gerrit.osmocom.org/11489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8a0e3fcfb0c4e5854b7b1e39296052e679c63c73 Gerrit-Change-Number: 11489 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 20:49:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 28 Oct 2018 20:49:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L1CTL_Types.ttcn: drop length limitation for traffic messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11490 ) Change subject: L1CTL_Types.ttcn: drop length limitation for traffic messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1782856affe427b087fa3f7ef1c02a865d136372 Gerrit-Change-Number: 11490 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 28 Oct 2018 20:49:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 20:49:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 28 Oct 2018 20:49:28 +0000 Subject: Change in osmo-ci[master]: gerrot-osmo-bts: Don't use unsupported '/' in labels of axis/matrix jobs In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11484 ) Change subject: gerrot-osmo-bts: Don't use unsupported '/' in labels of axis/matrix jobs ...................................................................... gerrot-osmo-bts: Don't use unsupported '/' in labels of axis/matrix jobs It seems jenkins cannot deal with this, so we cannot specify something like 'origin/nrw/oc2g-next' in a label. Let's work around by using only oc2g-next here and expanding that to 'origin/nrw/oc2g-next' only in the osmo-l1yer1-headers.sh script of osmo-ci.git Change-Id: I9130a2f349f06a0b46b50665cef7188ddb08f666 --- M jobs/gerrit-verifications.yml 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index a989760..71a0904 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -87,7 +87,7 @@ - osmo-bts: a1_name: FIRMWARE_VERSION - a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, origin/nrw/litecell15, origin/nrw/oc2g, origin/nrw/oc2g-next] + a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, litecell15, oc2g, oc2g-next] a2_name: BTS_MODEL a2: !!python/tuple [sysmo, oct, trx, oct+trx, lc15, oc2g] combination_filter: > @@ -98,9 +98,9 @@ (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo") || (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo") || (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15") || - (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15") || - (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g") || - (FIRMWARE_VERSION == "origin/nrw/oc2g-next" && BTS_MODEL == "oc2g") + (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15") || + (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g") || + (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g") cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL"' - osmo-ggsn: -- To view, visit https://gerrit.osmocom.org/11484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9130a2f349f06a0b46b50665cef7188ddb08f666 Gerrit-Change-Number: 11484 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 22:32:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 28 Oct 2018 22:32:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L1CTL_Types.ttcn: drop length limitation for traffic messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11490 ) Change subject: L1CTL_Types.ttcn: drop length limitation for traffic messages ...................................................................... L1CTL_Types.ttcn: drop length limitation for traffic messages There is no any reason to limit payload length. Change-Id: I1782856affe427b087fa3f7ef1c02a865d136372 --- M library/L1CTL_Types.ttcn 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn index 39732be..4273ba3 100644 --- a/library/L1CTL_Types.ttcn +++ b/library/L1CTL_Types.ttcn @@ -83,8 +83,6 @@ L1CTL_RES_T_SCHED } with { variant "FIELDLENGTH(8)" }; - const integer TRAFFIC_DATA_LEN := 40; - type record L1ctlHdrFlags { BIT7 padding, boolean f_done @@ -299,7 +297,7 @@ type record L1ctlTrafficReq { - octetstring data length(TRAFFIC_DATA_LEN) + octetstring data } with { variant (data) "BYTEORDER(first)" } -- To view, visit https://gerrit.osmocom.org/11490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1782856affe427b087fa3f7ef1c02a865d136372 Gerrit-Change-Number: 11490 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 23:19:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 28 Oct 2018 23:19:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates; add tr_ML3_MT_MM_AUTH_REQ_3G() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11492 Change subject: L3_Templates; add tr_ML3_MT_MM_AUTH_REQ_3G() ...................................................................... L3_Templates; add tr_ML3_MT_MM_AUTH_REQ_3G() this allows us to match on specifically 3G MM AUTH REQ, whereas so far we only had a generic template that matched the 2G and 3G auth req. Change-Id: I392d61d1348bee9c88abe4bb938e99b2c3702a94 --- M library/L3_Templates.ttcn 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/11492/1 diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index a05aba2..52d4a2a 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -1268,6 +1268,29 @@ } } +template PDU_ML3_NW_MS tr_ML3_MT_MM_AUTH_REQ_3G(template OCT16 rand := ?, template OCT16 autn) := { + discriminator := '0101'B, + tiOrSkip := { + skipIndicator := '0000'B + }, + msgs := { + mm := { + authenticationRequest := { + messageType := '010010'B, + nsd := '00'B, + cipheringKeySequenceNumber := ?, + spare2_4 := ?, + authenticationParRAND := rand, + authenticationParAUTN := { + elementIdentifier := '20'O, + lengthIndicator := ?, + autnValue := autn + } + } + } + } +} + template (value) PDU_ML3_MS_NW ts_ML3_MT_MM_AUTH_RESP_2G(OCT4 sres) := { discriminator := '0101'B, tiOrSkip := { -- To view, visit https://gerrit.osmocom.org/11492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I392d61d1348bee9c88abe4bb938e99b2c3702a94 Gerrit-Change-Number: 11492 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 23:21:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 28 Oct 2018 23:21:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates; add tr_ML3_MT_MM_AUTH_REQ_3G() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11492 ) Change subject: L3_Templates; add tr_ML3_MT_MM_AUTH_REQ_3G() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I392d61d1348bee9c88abe4bb938e99b2c3702a94 Gerrit-Change-Number: 11492 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 28 Oct 2018 23:21:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 28 23:21:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 28 Oct 2018 23:21:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates; add tr_ML3_MT_MM_AUTH_REQ_3G() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11492 ) Change subject: L3_Templates; add tr_ML3_MT_MM_AUTH_REQ_3G() ...................................................................... L3_Templates; add tr_ML3_MT_MM_AUTH_REQ_3G() this allows us to match on specifically 3G MM AUTH REQ, whereas so far we only had a generic template that matched the 2G and 3G auth req. Change-Id: I392d61d1348bee9c88abe4bb938e99b2c3702a94 --- M library/L3_Templates.ttcn 1 file changed, 23 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index a05aba2..52d4a2a 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -1268,6 +1268,29 @@ } } +template PDU_ML3_NW_MS tr_ML3_MT_MM_AUTH_REQ_3G(template OCT16 rand := ?, template OCT16 autn) := { + discriminator := '0101'B, + tiOrSkip := { + skipIndicator := '0000'B + }, + msgs := { + mm := { + authenticationRequest := { + messageType := '010010'B, + nsd := '00'B, + cipheringKeySequenceNumber := ?, + spare2_4 := ?, + authenticationParRAND := rand, + authenticationParAUTN := { + elementIdentifier := '20'O, + lengthIndicator := ?, + autnValue := autn + } + } + } + } +} + template (value) PDU_ML3_MS_NW ts_ML3_MT_MM_AUTH_RESP_2G(OCT4 sres) := { discriminator := '0101'B, tiOrSkip := { -- To view, visit https://gerrit.osmocom.org/11492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I392d61d1348bee9c88abe4bb938e99b2c3702a94 Gerrit-Change-Number: 11492 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 09:46:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 29 Oct 2018 09:46:20 +0000 Subject: Change in osmo-gsm-tester[master]: utils: Introduce show_usb_device.py In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11460 to look at the new patch set (#3). Change subject: utils: Introduce show_usb_device.py ...................................................................... utils: Introduce show_usb_device.py This is a small script written by Alexander Couzens that is useful to list modems and its properties in a quick and easy way in osmo-gsm-tester setup. Change-Id: Iec049e2d56d61ecd50b65b64d95d69641fa0f8be --- A utils/show_usb_device.py 1 file changed, 97 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/60/11460/3 -- To view, visit https://gerrit.osmocom.org/11460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iec049e2d56d61ecd50b65b64d95d69641fa0f8be Gerrit-Change-Number: 11460 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 09:46:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 29 Oct 2018 09:46:20 +0000 Subject: Change in osmo-gsm-tester[master]: utils: Introduce modem-netns-setup.py In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11461 to look at the new patch set (#3). Change subject: utils: Introduce modem-netns-setup.py ...................................................................... utils: Introduce modem-netns-setup.py Used to quickly set modem net interfaces into their own net namespace (named after modem USB ID path). The idea is that since osmo-gsm-tester ofono modem.py knowns the USB path from a modem (path yml attr), it can infer the netns from it and run a ping process inside it. Related: OS#2308 Change-Id: Iadb2df2974e132044fba1f1bc2db8b559912e4e1 --- A utils/modem-netns-setup.py 1 file changed, 87 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/61/11461/3 -- To view, visit https://gerrit.osmocom.org/11461 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iadb2df2974e132044fba1f1bc2db8b559912e4e1 Gerrit-Change-Number: 11461 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 09:46:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 29 Oct 2018 09:46:20 +0000 Subject: Change in osmo-gsm-tester[master]: utils: Add osmo-gsm-tester_setcap_net_*.sh scripts In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11473 to look at the new patch set (#2). Change subject: utils: Add osmo-gsm-tester_setcap_net_*.sh scripts ...................................................................... utils: Add osmo-gsm-tester_setcap_net_*.sh scripts This scripts were already being used by osmo-gsm-tester for a while, but were not avaialable in this repository. Let's put them here to easy find them and have all this kind of helper scripts together with code using it. Change-Id: Ib88a1b7818155fc608cc6ff763300fbd0e03a07a --- A utils/osmo-gsm-tester_setcap_net_admin.sh A utils/osmo-gsm-tester_setcap_net_raw.sh 2 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/73/11473/2 -- To view, visit https://gerrit.osmocom.org/11473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib88a1b7818155fc608cc6ff763300fbd0e03a07a Gerrit-Change-Number: 11473 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 09:46:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 29 Oct 2018 09:46:20 +0000 Subject: Change in osmo-gsm-tester[master]: Add support to test gprs IPv4 data plane In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11462 to look at the new patch set (#3). Change subject: Add support to test gprs IPv4 data plane ...................................................................... Add support to test gprs IPv4 data plane Since the modem iface and the GGSN iface are on the same host/netns, it's really difficult to conveniently test data plane without getting routing loops. As a result, either GGSN or modem iface must be moved to a different namespace. The decision after a few discussions was finally to move modem interfaces to a different netns. Expected setup: * ofono is patched to avoid removing modem if it detects through udev that its net iface was removed (due to for instance, net iface being moved to another netns and thus not being reachable anymore by systemd-udev process running in root netns). * After ofono is started (and successfully configured all the modems and detected its net ifaces through syfs/udev), script "modem-netns-setup.py start" which creates a netns for each modem, naming it after its usb path ID. net ifaces for that modem are moved into its netns. * Modem is configured to use 802-3 data format, and as a result the net iface is configured through DHCP (DHCP req only replied AFTER pdp ctx is activated!). * Since osmo-gsm-tester knowns the modem USB path ID (available in resources.conf), it can run required steps (ifup, DHCP) to configure the interface. The interface name is provided by ofono to osmo-gsm-tester. * As a result, any process willing to transmit data through the modem must be in the modem netns. Related: OS#2308 Change-Id: Icb06bdfcdd37c797be95ab5addb28da2d9f6681c --- M example/resources.conf.prod M example/resources.conf.rnd M src/osmo_gsm_tester/modem.py M src/osmo_gsm_tester/process.py M src/osmo_gsm_tester/suite.py M suites/gprs/ping.py A utils/osmo-gsm-tester_netns_exec.sh 7 files changed, 69 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/62/11462/3 -- To view, visit https://gerrit.osmocom.org/11462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icb06bdfcdd37c797be95ab5addb28da2d9f6681c Gerrit-Change-Number: 11462 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 09:46:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 29 Oct 2018 09:46:20 +0000 Subject: Change in osmo-gsm-tester[master]: pcap_recorder: Add support to run in netns In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11474 to look at the new patch set (#2). Change subject: pcap_recorder: Add support to run in netns ...................................................................... pcap_recorder: Add support to run in netns Change-Id: Ie1c848254f221f26c59e7f4bd8c079fe3e7bdfc2 --- M src/osmo_gsm_tester/pcap_recorder.py 1 file changed, 10 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/74/11474/2 -- To view, visit https://gerrit.osmocom.org/11474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie1c848254f221f26c59e7f4bd8c079fe3e7bdfc2 Gerrit-Change-Number: 11474 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 09:46:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 29 Oct 2018 09:46:20 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf: Add extra IPaddr to pool In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11475 to look at the new patch set (#2). Change subject: resources.conf: Add extra IPaddr to pool ...................................................................... resources.conf: Add extra IPaddr to pool Change-Id: If0f1a6a3f4e99091ed117bc7a77a5e60eccb2425 --- M example/resources.conf.prod M example/resources.conf.rnd 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/75/11475/2 -- To view, visit https://gerrit.osmocom.org/11475 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If0f1a6a3f4e99091ed117bc7a77a5e60eccb2425 Gerrit-Change-Number: 11475 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 09:46:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 29 Oct 2018 09:46:20 +0000 Subject: Change in osmo-gsm-tester[master]: Introduce iperf3 testing infrastructure In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11476 to look at the new patch set (#2). Change subject: Introduce iperf3 testing infrastructure ...................................................................... Introduce iperf3 testing infrastructure Change-Id: I6ff6bef14feb535d98ca41b9788700d699e1ef1e --- A src/osmo_gsm_tester/iperf3.py M src/osmo_gsm_tester/suite.py A suites/gprs/iperf3.py M suites/gprs/suite.conf 4 files changed, 189 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/76/11476/2 -- To view, visit https://gerrit.osmocom.org/11476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6ff6bef14feb535d98ca41b9788700d699e1ef1e Gerrit-Change-Number: 11476 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 10:12:41 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 29 Oct 2018 10:12:41 +0000 Subject: Change in osmo-bsc[master]: vty: add 'show rejected' Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11493 Change subject: vty: add 'show rejected' ...................................................................... vty: add 'show rejected' Print IDs and IPs of recently rejected BTS devices. Example output: OsmoBSC> show rejected Date Site ID BTS ID IP ------------------- ------- ------ --------------- 2018-10-25 09:36:28 1234 0 192.168.1.37 Related: OS#2841 Change-Id: Iba3bfe8fc9432b7ae8f819df8bd71b35b3ec507e --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c 4 files changed, 95 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/93/11493/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 7c91e59..d521708 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1129,6 +1129,16 @@ uint8_t chan_load_avg; /* current channel load average in percent (0 - 100). */ }; +/* One rejected BTS */ +struct gsm_bts_rejected { + /* list header in net->bts_rejected */ + struct llist_head list; + + uint16_t site_id; + uint16_t bts_id; + char ip[64]; + time_t time; +}; struct gsm_network *gsm_network_init(void *ctx); @@ -1404,6 +1414,7 @@ unsigned int num_bts; struct llist_head bts_list; + struct llist_head bts_rejected; /* shall reference gsm_network_T[] */ struct T_def *T_defs; diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c index b1388b8..2f44b20 100644 --- a/src/osmo-bsc/bsc_init.c +++ b/src/osmo-bsc/bsc_init.c @@ -257,6 +257,7 @@ return NULL; } + INIT_LLIST_HEAD(&net->bts_rejected); gsm_net_update_ctype(net); /* diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index dd540c1..cead6fc 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -541,6 +541,32 @@ return CMD_SUCCESS; } +DEFUN(show_rejected, show_rejected_cmd, "show rejected", + SHOW_STR "Display recently rejected BTS devices\n") +{ + /* empty list */ + struct llist_head *rejected = &gsmnet_from_vty(vty)->bts_rejected; + if (llist_empty(rejected)) { + vty_out(vty, "No BTS has been rejected.%s", VTY_NEWLINE); + return CMD_SUCCESS; + } + + /* table head */ + vty_out(vty, "Date Site ID BTS ID IP%s", VTY_NEWLINE); + vty_out(vty, "------------------- ------- ------ ---------------%s", VTY_NEWLINE); + + /* table body */ + struct gsm_bts_rejected *pos; + llist_for_each_entry(pos, rejected, list) { + /* timestamp formatted like: "2018-10-24 15:04:52" */ + char buf[20]; + strftime(buf, sizeof(buf), "%F %T", localtime(&pos->time)); + + vty_out(vty, "%s %7u %6u %15s%s", buf, pos->site_id, pos->bts_id, pos->ip, VTY_NEWLINE); + } + return CMD_SUCCESS; +} + /* utility functions */ static void parse_e1_link(struct gsm_e1_subslot *e1_link, const char *line, const char *ts, const char *ss) @@ -4867,6 +4893,7 @@ install_element_ve(&bsc_show_net_cmd); install_element_ve(&show_bts_cmd); + install_element_ve(&show_rejected_cmd); install_element_ve(&show_trx_cmd); install_element_ve(&show_ts_cmd); install_element_ve(&show_lchan_cmd); diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index fec4147..bbfcb05 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -458,6 +459,60 @@ } } +/* Reject BTS because of an unknown unit ID */ +static void ipaccess_sign_link_reject(const struct ipaccess_unit *dev, const struct e1inp_ts* ts) +{ + uint16_t site_id = dev->site_id; + uint16_t bts_id = dev->bts_id; + uint16_t trx_id = dev->trx_id; + + /* Write to log and increase counter */ + LOGP(DLINP, LOGL_ERROR, "Unable to find BTS configuration for %u/%u/%u, disconnecting\n", site_id, bts_id, + trx_id); + rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_UNKNOWN_UNIT_ID]); + + /* Get remote IP */ + char ip[64]; + if (osmo_sock_get_remote_ip(ts->driver.ipaccess.fd.fd, ip, sizeof(ip))) + return; + + /* Rejected list: unlink existing entry */ + struct gsm_bts_rejected *entry = NULL; + struct gsm_bts_rejected *pos; + llist_for_each_entry(pos, &bsc_gsmnet->bts_rejected, list) { + if (pos->site_id == site_id && pos->bts_id == bts_id && !strcmp(pos->ip, ip)) { + entry = pos; + llist_del(&entry->list); + break; + } + } + + /* Allocate new entry */ + if (!entry) { + entry = talloc_zero(tall_bsc_ctx, struct gsm_bts_rejected); + if (!entry) + return; + entry->site_id = site_id; + entry->bts_id = bts_id; + strncpy(entry->ip, ip, sizeof(entry->ip)); + } + + /* Add to beginning with current timestamp */ + llist_add(&entry->list, &bsc_gsmnet->bts_rejected); + entry->time = time(NULL); + + /* Cut off last (oldest) element if we have too many */ + uint8_t i=0; + llist_for_each_entry(pos, &bsc_gsmnet->bts_rejected, list) { + if (i >= 25) { + llist_del(&pos->list); + talloc_free(pos); + break; + } + i++; + } +} + /* This function is called once the OML/RSL link becomes up. */ static struct e1inp_sign_link * ipaccess_sign_link_up(void *unit_data, struct e1inp_line *line, @@ -471,10 +526,7 @@ bts = find_bts_by_unitid(bsc_gsmnet, dev->site_id, dev->bts_id); if (!bts) { - LOGP(DLINP, LOGL_ERROR, "Unable to find BTS configuration for " - " %u/%u/%u, disconnecting\n", dev->site_id, - dev->bts_id, dev->trx_id); - rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_UNKNOWN_UNIT_ID]); + ipaccess_sign_link_reject(dev, &line->ts[E1INP_SIGN_OML - 1]); return NULL; } DEBUGP(DLINP, "Identified BTS %u/%u/%u\n", -- To view, visit https://gerrit.osmocom.org/11493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iba3bfe8fc9432b7ae8f819df8bd71b35b3ec507e Gerrit-Change-Number: 11493 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 10:17:21 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 29 Oct 2018 10:17:21 +0000 Subject: Change in osmo-mgw[master]: add MGCP CRCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11463 ) Change subject: add MGCP CRCX command statistics to osmo-mgw ...................................................................... add MGCP CRCX command statistics to osmo-mgw Add a counter group for CRCX commands. The group contains counters for successful connection processing as well as various error conditions. This provides a quick overview of CRCX failures on each trunk throughout the lifetime of the osmo-mgw process. For example, after running the TTCN3 mgw test suite, the counters show the following values: OsmoMGW> show rate-counters crxc statistics: crcx:success: 88 (0/s 88/m 0/h 0/d) CRCX command processed successfully. crcx:bad_action: 0 (0/s 0/m 0/h 0/d) bad action in CRCX command. crcx:unhandled_param: 1 (0/s 1/m 0/h 0/d) unhandled parameter in CRCX command. crcx:missing_callid: 1 (0/s 1/m 0/h 0/d) missing CallId in CRCX command. crcx:invalid_mode: 1 (0/s 1/m 0/h 0/d) connection invalid mode in CRCX command. crcx:limit_exceeded: 0 (0/s 0/m 0/h 0/d) limit of concurrent connections was reached. crcx:unkown_callid: 0 (0/s 0/m 0/h 0/d) unknown CallId in CRCX command. crcx:alloc_conn_fail: 0 (0/s 0/m 0/h 0/d) connection allocation failure. crcx:no_remote_conn_desc: 1 (0/s 1/m 0/h 0/d) no opposite end specified for connection. crcx:start_rtp_failure: 0 (0/s 0/m 0/h 0/d) failure to start RTP processing. crcx:conn_rejected: 0 (0/s 0/m 0/h 0/d) connection rejected by policy. OsmoMGW> These same counters are now also shown by 'show mgcp stats' in the context of the trunk which they belong to. With input from Philipp Maier. Change-Id: Ida82fc340d5c66180e5fe9a0d195e9be6dc64c61 Related: OS#2660 --- M include/osmocom/mgcp/mgcp.h M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c 3 files changed, 86 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index bdc86fc..f9f0ac7 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -118,6 +118,21 @@ #define MGCP_KEEPALIVE_ONCE (-1) #define MGCP_KEEPALIVE_NEVER 0 +/* Global MCGP CRCX related rate counters */ +enum { + MGCP_CRCX_SUCCESS, + MGCP_CRCX_FAIL_BAD_ACTION, + MGCP_CRCX_FAIL_UNHANDLED_PARAM, + MGCP_CRCX_FAIL_MISSING_CALLID, + MGCP_CRCX_FAIL_INVALID_MODE, + MGCP_CRCX_FAIL_LIMIT_EXCEEDED, + MGCP_CRCX_FAIL_UNKNOWN_CALLID, + MGCP_CRCX_FAIL_ALLOC_CONN, + MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC, + MGCP_CRCX_FAIL_START_RTP, + MGCP_CRCX_FAIL_REJECTED_BY_POLICY, +}; + struct mgcp_trunk_config { struct llist_head entry; @@ -155,6 +170,9 @@ unsigned int number_endpoints; int vty_number_endpoints; struct mgcp_endpoint *endpoints; + + /* rate counters */ + struct rate_ctr_group *mgcp_crcx_ctr_group; }; enum mgcp_role { diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index e17bdae..bc35e5c 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -51,6 +52,28 @@ #define MGCP_REQUEST(NAME, REQ, DEBUG_NAME) \ { .name = NAME, .handle_request = REQ, .debug_name = DEBUG_NAME }, +static const struct rate_ctr_desc mgcp_crcx_ctr_desc[] = { + [MGCP_CRCX_SUCCESS] = {"crcx:success", "CRCX command processed successfully."}, + [MGCP_CRCX_FAIL_BAD_ACTION] = {"crcx:bad_action", "bad action in CRCX command."}, + [MGCP_CRCX_FAIL_UNHANDLED_PARAM] = {"crcx:unhandled_param", "unhandled parameter in CRCX command."}, + [MGCP_CRCX_FAIL_MISSING_CALLID] = {"crcx:missing_callid", "missing CallId in CRCX command."}, + [MGCP_CRCX_FAIL_INVALID_MODE] = {"crcx:invalid_mode", "connection invalid mode in CRCX command."}, + [MGCP_CRCX_FAIL_LIMIT_EXCEEDED] = {"crcx:limit_exceeded", "limit of concurrent connections was reached."}, + [MGCP_CRCX_FAIL_UNKNOWN_CALLID] = {"crcx:unkown_callid", "unknown CallId in CRCX command."}, + [MGCP_CRCX_FAIL_ALLOC_CONN] = {"crcx:alloc_conn_fail", "connection allocation failure."}, + [MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC] = {"crcx:no_remote_conn_desc", "no opposite end specified for connection."}, + [MGCP_CRCX_FAIL_START_RTP] = {"crcx:start_rtp_failure", "failure to start RTP processing."}, + [MGCP_CRCX_FAIL_REJECTED_BY_POLICY] = {"crcx:conn_rejected", "connection rejected by policy."}, +}; + +const static struct rate_ctr_group_desc mgcp_crcx_ctr_group_desc = { + .group_name_prefix = "crcx", + .group_description = "crxc statistics", + .class_id = OSMO_STATS_CLASS_GLOBAL, + .num_ctr = ARRAY_SIZE(mgcp_crcx_ctr_desc), + .ctr_desc = mgcp_crcx_ctr_desc +}; + static struct msgb *handle_audit_endpoint(struct mgcp_parse_data *data); static struct msgb *handle_create_con(struct mgcp_parse_data *data); static struct msgb *handle_delete_con(struct mgcp_parse_data *data); @@ -701,7 +724,7 @@ /* CRCX command handler, processes the received command */ static struct msgb *handle_create_con(struct mgcp_parse_data *p) { - struct mgcp_trunk_config *tcfg; + struct mgcp_trunk_config *tcfg = p->endp->tcfg; struct mgcp_endpoint *endp = p->endp; int error_code = 400; @@ -733,6 +756,7 @@ /* It is illegal to send a connection identifier * together with a CRCX, the MGW will assign the * connection identifier by itself on CRCX */ + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_BAD_ACTION]); return create_err_response(NULL, 523, "CRCX", p->trans); break; case 'M': @@ -759,19 +783,19 @@ LOGP(DLMGCP, LOGL_NOTICE, "CRCX: endpoint:%x unhandled option: '%c'/%d\n", ENDPOINT_NUMBER(endp), *line, *line); + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_UNHANDLED_PARAM]); return create_err_response(NULL, 539, "CRCX", p->trans); break; } } mgcp_header_done: - tcfg = p->endp->tcfg; - /* Check parameters */ if (!callid) { LOGP(DLMGCP, LOGL_ERROR, "CRCX: endpoint:%x insufficient parameters, missing callid\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_MISSING_CALLID]); return create_err_response(endp, 516, "CRCX", p->trans); } @@ -779,6 +803,7 @@ LOGP(DLMGCP, LOGL_ERROR, "CRCX: endpoint:%x insufficient parameters, missing mode\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_INVALID_MODE]); return create_err_response(endp, 517, "CRCX", p->trans); } @@ -795,6 +820,7 @@ } else { /* There is no more room for a connection, leave * everything as it is and return with an error */ + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_LIMIT_EXCEEDED]); return create_err_response(endp, 540, "CRCX", p->trans); } } @@ -812,6 +838,7 @@ else { /* This is not our call, leave everything as it is and * return with an error. */ + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_UNKNOWN_CALLID]); return create_err_response(endp, 400, "CRCX", p->trans); } } @@ -827,6 +854,7 @@ LOGP(DLMGCP, LOGL_ERROR, "CRCX: endpoint:0x%x unable to allocate RTP connection\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_ALLOC_CONN]); goto error2; } @@ -890,6 +918,7 @@ "CRCX: endpoint:%x selected connection mode type requires an opposite end!\n", ENDPOINT_NUMBER(endp)); error_code = 527; + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC]); goto error2; } @@ -901,6 +930,7 @@ LOGP(DLMGCP, LOGL_ERROR, "CRCX: endpoint:0x%x could not start RTP processing!\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_START_RTP]); goto error2; } @@ -915,6 +945,7 @@ "CRCX: endpoint:0x%x CRCX rejected by policy\n", ENDPOINT_NUMBER(endp)); mgcp_endp_release(endp); + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_REJECTED_BY_POLICY]); return create_err_response(endp, 400, "CRCX", p->trans); break; case MGCP_POLICY_DEFER: @@ -942,6 +973,7 @@ LOGP(DLMGCP, LOGL_NOTICE, "CRCX: endpoint:0x%x connection successfully created\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_SUCCESS]); return create_response_with_sdp(endp, conn, "CRCX", p->trans, true); error2: mgcp_endp_release(endp); @@ -1396,6 +1428,28 @@ tcfg->keepalive_interval, 0); } +static int free_rate_counter_group(struct rate_ctr_group *rate_ctr_group) +{ + rate_ctr_group_free(rate_ctr_group); + return 0; +} + +static void alloc_mgcp_crxc_rate_counters(struct mgcp_trunk_config *trunk, void *ctx) +{ + /* FIXME: Each new rate counter group requires a unique index. At the + * moment we generate an index using a counter, but perhaps there is + * a better way of assigning indices? */ + static unsigned int rate_ctr_index = 0; + + if (trunk->mgcp_crcx_ctr_group != NULL) + return; + + trunk->mgcp_crcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_crcx_ctr_group_desc, rate_ctr_index); + OSMO_ASSERT(trunk->mgcp_crcx_ctr_group); + talloc_set_destructor(trunk->mgcp_crcx_ctr_group, free_rate_counter_group); + rate_ctr_index++; +} + /*! allocate configuration with default values. * (called once at startup by main function) */ struct mgcp_config *mgcp_config_alloc(void) @@ -1433,6 +1487,7 @@ cfg->trunk.audio_send_name = 1; cfg->trunk.omit_rtcp = 0; mgcp_trunk_set_keepalive(&cfg->trunk, MGCP_KEEPALIVE_ONCE); + alloc_mgcp_crxc_rate_counters(&cfg->trunk, cfg); INIT_LLIST_HEAD(&cfg->trunks); @@ -1464,7 +1519,9 @@ trunk->vty_number_endpoints = 33; trunk->omit_rtcp = 0; mgcp_trunk_set_keepalive(trunk, MGCP_KEEPALIVE_ONCE); + alloc_mgcp_crxc_rate_counters(trunk, trunk); llist_add_tail(&trunk->entry, &cfg->trunks); + return trunk; } @@ -1509,6 +1566,8 @@ } tcfg->number_endpoints = tcfg->vty_number_endpoints; + alloc_mgcp_crxc_rate_counters(tcfg, tcfg->cfg); + return 0; } diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 75cc52f..fdcca91 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -22,6 +22,7 @@ */ #include +#include #include #include #include @@ -233,6 +234,11 @@ if (i < cfg->number_endpoints - 1) vty_out(vty, "%s", VTY_NEWLINE); } + + if (show_stats && cfg->mgcp_crcx_ctr_group) { + vty_out(vty, " %s:%s", cfg->mgcp_crcx_ctr_group->desc->group_description, VTY_NEWLINE); + vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h %D/d) %d", cfg->mgcp_crcx_ctr_group); + } } #define SHOW_MGCP_STR "Display information about the MGCP Media Gateway\n" -- To view, visit https://gerrit.osmocom.org/11463 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ida82fc340d5c66180e5fe9a0d195e9be6dc64c61 Gerrit-Change-Number: 11463 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 12:25:23 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 29 Oct 2018 12:25:23 +0000 Subject: Change in osmo-mgw[master]: show RTP TX/RX stats in 'mgcp show stats' output Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11494 Change subject: show RTP TX/RX stats in 'mgcp show stats' output ...................................................................... show RTP TX/RX stats in 'mgcp show stats' output Make the 'mgcp show stats' VTY command display TX/RX counters for an RTP stream. This command was already showing the counter for dropped packets from the same counter group, so it seems natural to display other relevant counters in the group as well. Change-Id: I1313e64d7d8b49964f21fc8d213cba6c9fb6c7cf Related: OS#2660 --- M src/libosmo-mgcp/mgcp_vty.c 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/94/11494/1 diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index fdcca91..5643180 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -162,11 +162,19 @@ struct mgcp_rtp_state *state = &conn->state; struct mgcp_rtp_end *end = &conn->end; struct mgcp_rtp_codec *codec = end->codec; + struct rate_ctr *tx_packets, *tx_bytes; + struct rate_ctr *rx_packets, *rx_bytes; struct rate_ctr *dropped_packets; + tx_packets = &conn->rate_ctr_group->ctr[RTP_PACKETS_TX_CTR]; + tx_bytes = &conn->rate_ctr_group->ctr[RTP_OCTETS_TX_CTR]; + rx_packets = &conn->rate_ctr_group->ctr[RTP_PACKETS_RX_CTR]; + rx_bytes = &conn->rate_ctr_group->ctr[RTP_OCTETS_RX_CTR]; dropped_packets = &conn->rate_ctr_group->ctr[RTP_DROPPED_PACKETS_CTR]; vty_out(vty, + " Packets Sent: %" PRIu64 " (%" PRIu64 " bytes total)%s" + " Packets Received: %" PRIu64 " (%" PRIu64 " bytes total)%s" " Timestamp Errs: %" PRIu64 "->%" PRIu64 "%s" " Dropped Packets: %" PRIu64 "%s" " Payload Type: %d Rate: %u Channels: %d %s" @@ -174,6 +182,8 @@ " FPP: %d Packet Duration: %u%s" " FMTP-Extra: %s Audio-Name: %s Sub-Type: %s%s" " Output-Enabled: %d Force-PTIME: %d%s", + tx_packets->current, tx_bytes->current, VTY_NEWLINE, + rx_packets->current, rx_bytes->current, VTY_NEWLINE, state->in_stream.err_ts_ctr->current, state->out_stream.err_ts_ctr->current, VTY_NEWLINE, -- To view, visit https://gerrit.osmocom.org/11494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1313e64d7d8b49964f21fc8d213cba6c9fb6c7cf Gerrit-Change-Number: 11494 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 13:22:10 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 29 Oct 2018 13:22:10 +0000 Subject: Change in osmo-mgw[master]: use local variable for rate counters in handle_create_con() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11495 Change subject: use local variable for rate counters in handle_create_con() ...................................................................... use local variable for rate counters in handle_create_con() Use a local variable to shorten the length of rate counter names. Cosmetic only; no functional change. Change-Id: If4f097c5e441914eaa24c7657813ebb3f9a49916 Related: OS#2660 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/95/11495/1 diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index bc35e5c..24c8e54 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -726,8 +726,8 @@ { struct mgcp_trunk_config *tcfg = p->endp->tcfg; struct mgcp_endpoint *endp = p->endp; + struct rate_ctr_group *rate_ctrs = tcfg->mgcp_crcx_ctr_group; int error_code = 400; - const char *local_options = NULL; const char *callid = NULL; const char *mode = NULL; @@ -756,7 +756,7 @@ /* It is illegal to send a connection identifier * together with a CRCX, the MGW will assign the * connection identifier by itself on CRCX */ - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_BAD_ACTION]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_BAD_ACTION]); return create_err_response(NULL, 523, "CRCX", p->trans); break; case 'M': @@ -783,7 +783,7 @@ LOGP(DLMGCP, LOGL_NOTICE, "CRCX: endpoint:%x unhandled option: '%c'/%d\n", ENDPOINT_NUMBER(endp), *line, *line); - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_UNHANDLED_PARAM]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_UNHANDLED_PARAM]); return create_err_response(NULL, 539, "CRCX", p->trans); break; } @@ -795,7 +795,7 @@ LOGP(DLMGCP, LOGL_ERROR, "CRCX: endpoint:%x insufficient parameters, missing callid\n", ENDPOINT_NUMBER(endp)); - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_MISSING_CALLID]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_MISSING_CALLID]); return create_err_response(endp, 516, "CRCX", p->trans); } @@ -803,7 +803,7 @@ LOGP(DLMGCP, LOGL_ERROR, "CRCX: endpoint:%x insufficient parameters, missing mode\n", ENDPOINT_NUMBER(endp)); - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_INVALID_MODE]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_INVALID_MODE]); return create_err_response(endp, 517, "CRCX", p->trans); } @@ -820,7 +820,7 @@ } else { /* There is no more room for a connection, leave * everything as it is and return with an error */ - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_LIMIT_EXCEEDED]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_LIMIT_EXCEEDED]); return create_err_response(endp, 540, "CRCX", p->trans); } } @@ -838,7 +838,7 @@ else { /* This is not our call, leave everything as it is and * return with an error. */ - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_UNKNOWN_CALLID]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_UNKNOWN_CALLID]); return create_err_response(endp, 400, "CRCX", p->trans); } } @@ -854,7 +854,7 @@ LOGP(DLMGCP, LOGL_ERROR, "CRCX: endpoint:0x%x unable to allocate RTP connection\n", ENDPOINT_NUMBER(endp)); - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_ALLOC_CONN]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_ALLOC_CONN]); goto error2; } @@ -918,7 +918,7 @@ "CRCX: endpoint:%x selected connection mode type requires an opposite end!\n", ENDPOINT_NUMBER(endp)); error_code = 527; - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC]); goto error2; } @@ -930,7 +930,7 @@ LOGP(DLMGCP, LOGL_ERROR, "CRCX: endpoint:0x%x could not start RTP processing!\n", ENDPOINT_NUMBER(endp)); - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_START_RTP]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_START_RTP]); goto error2; } @@ -945,7 +945,7 @@ "CRCX: endpoint:0x%x CRCX rejected by policy\n", ENDPOINT_NUMBER(endp)); mgcp_endp_release(endp); - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_REJECTED_BY_POLICY]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_REJECTED_BY_POLICY]); return create_err_response(endp, 400, "CRCX", p->trans); break; case MGCP_POLICY_DEFER: @@ -973,7 +973,7 @@ LOGP(DLMGCP, LOGL_NOTICE, "CRCX: endpoint:0x%x connection successfully created\n", ENDPOINT_NUMBER(endp)); - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_SUCCESS]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_SUCCESS]); return create_response_with_sdp(endp, conn, "CRCX", p->trans, true); error2: mgcp_endp_release(endp); -- To view, visit https://gerrit.osmocom.org/11495 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If4f097c5e441914eaa24c7657813ebb3f9a49916 Gerrit-Change-Number: 11495 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 13:22:23 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 29 Oct 2018 13:22:23 +0000 Subject: Change in osmo-mgw[master]: add more mgcp crxc error counters Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11496 Change subject: add more mgcp crxc error counters ...................................................................... add more mgcp crxc error counters Add counters for error conditions which I overlooked in commit 1e174875bf72c3d7840fa98cfad8c410a542919e Change-Id: Ia2004f8063f3a50b5d7a838ebe8a784a47fcc50d Depends: If4f097c5e441914eaa24c7657813ebb3f9a49916 Related: OS#2660 --- M include/osmocom/mgcp/mgcp.h M src/libosmo-mgcp/mgcp_protocol.c 2 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/96/11496/1 diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index f9f0ac7..b866f91 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -131,6 +131,10 @@ MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC, MGCP_CRCX_FAIL_START_RTP, MGCP_CRCX_FAIL_REJECTED_BY_POLICY, + MGCP_CRCX_FAIL_NO_OSMUX, + MGCP_CRCX_FAIL_INVALID_CONN_OPTIONS, + MGCP_CRCX_FAIL_CODEC_NEGOTIATION, + MGCP_CRCX_FAIL_BIND_PORT, }; struct mgcp_trunk_config { diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 24c8e54..ccbdfc8 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -64,6 +64,10 @@ [MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC] = {"crcx:no_remote_conn_desc", "no opposite end specified for connection."}, [MGCP_CRCX_FAIL_START_RTP] = {"crcx:start_rtp_failure", "failure to start RTP processing."}, [MGCP_CRCX_FAIL_REJECTED_BY_POLICY] = {"crcx:conn_rejected", "connection rejected by policy."}, + [MGCP_CRCX_FAIL_NO_OSMUX] = {"crcx:no_osmux", "no osmux offered by peer."}, + [MGCP_CRCX_FAIL_INVALID_CONN_OPTIONS] = {"crcx:conn_opt", "connection options invalid."}, + [MGCP_CRCX_FAIL_CODEC_NEGOTIATION] = {"crcx:codec_nego", "codec negotiation failure."}, + [MGCP_CRCX_FAIL_BIND_PORT] = {"crcx:bind_port", "port bind failure."}, }; const static struct rate_ctr_group_desc mgcp_crcx_ctr_group_desc = { @@ -863,6 +867,7 @@ if (mgcp_parse_conn_mode(mode, endp, conn->conn) != 0) { error_code = 517; + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_INVALID_MODE]); goto error2; } @@ -876,6 +881,7 @@ LOGP(DLMGCP, LOGL_ERROR, "CRCX: endpoint:0x%x osmux only and no osmux offered\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_NO_OSMUX]); goto error2; } @@ -888,6 +894,7 @@ "CRCX: endpoint:%x inavlid local connection options!\n", ENDPOINT_NUMBER(endp)); error_code = rc; + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_INVALID_CONN_OPTIONS]); goto error2; } } @@ -897,6 +904,7 @@ mgcp_codec_summary(conn); if (rc) { error_code = rc; + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_CODEC_NEGOTIATION]); goto error2; } @@ -923,6 +931,7 @@ } if (allocate_port(endp, conn) != 0) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_BIND_PORT]); goto error2; } -- To view, visit https://gerrit.osmocom.org/11496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2004f8063f3a50b5d7a838ebe8a784a47fcc50d Gerrit-Change-Number: 11496 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 13:24:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 29 Oct 2018 13:24:24 +0000 Subject: Change in osmo-gsm-tester[master]: Add support to enable EGPRS Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11497 Change subject: Add support to enable EGPRS ...................................................................... Add support to enable EGPRS Change-Id: I682f0c1b4cb97b704d646f18f54e748baaefd677 --- M example/defaults.conf A example/scenarios/mod-bts0-egprs.conf M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/schema.py M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl 7 files changed, 16 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/97/11497/1 diff --git a/example/defaults.conf b/example/defaults.conf index dc38030..582b0d7 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -31,6 +31,7 @@ stream_id: 255 osmobsc_bts_type: sysmobts channel_allocator: ascending + gprs_mode: gprs num_trx: 1 max_trx: 1 trx_list: diff --git a/example/scenarios/mod-bts0-egprs.conf b/example/scenarios/mod-bts0-egprs.conf new file mode 100644 index 0000000..542dd9d --- /dev/null +++ b/example/scenarios/mod-bts0-egprs.conf @@ -0,0 +1,3 @@ +modifiers: + bts: + - gprs_mode: egprs diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 86afeec..0c941e0 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -77,6 +77,7 @@ 'osmo_trx': { 'bts_ip': self.remote_addr(), 'trx_ip': self.trx_remote_ip(), + 'egprs': 'enable' if self.conf_for_bsc()['gprs_mode'] == 'egprs' else 'disable', 'channels': [{} for trx_i in range(self.num_trx())] } } diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index 3f2ddc7..6898926 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -57,6 +57,7 @@ 'bts[].direct_pcu': schema.BOOL_STR, 'bts[].ciphers[]': schema.CIPHER, 'bts[].channel_allocator': schema.CHAN_ALLOCATOR, + 'bts[].gprs_mode': schema.GPRS_MODE, 'bts[].num_trx': schema.UINT, 'bts[].max_trx': schema.UINT, 'bts[].trx_list[].addr': schema.IPV4, diff --git a/src/osmo_gsm_tester/schema.py b/src/osmo_gsm_tester/schema.py index 12cfd7a..14fe640 100644 --- a/src/osmo_gsm_tester/schema.py +++ b/src/osmo_gsm_tester/schema.py @@ -110,6 +110,11 @@ return raise ValueError('Unknown Channel Allocator Policy %r' % val) +def gprs_mode(val): + if val in ('none', 'gprs', 'egprs'): + return + raise ValueError('Unknown GPRS mode %r' % val) + def codec(val): if val in ('hr1', 'hr2', 'hr3', 'fr1', 'fr2', 'fr3'): return @@ -136,6 +141,7 @@ MODEM_FEATURE = 'modem_feature' PHY_CHAN = 'chan' CHAN_ALLOCATOR = 'chan_allocator' +GPRS_MODE = 'gprs_mode' CODEC = 'codec' OSMO_TRX_CLOCK_REF = 'osmo_trx_clock_ref' @@ -156,6 +162,7 @@ MODEM_FEATURE: modem_feature, PHY_CHAN: phy_channel_config, CHAN_ALLOCATOR: channel_allocator, + GPRS_MODE: gprs_mode, CODEC: codec, OSMO_TRX_CLOCK_REF: osmo_trx_clock_ref, } diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl index 0d53ccb..4f39f79 100644 --- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl @@ -57,8 +57,8 @@ % endif ip.access unit_id ${bts.ipa_unit_id} 0 oml ip.access stream_id ${bts.stream_id} line 0 -% if bts.get('sgsn', False): - gprs mode gprs +% if bts.get('sgsn', False) and bts['gprs_mode'] != 'none': + gprs mode ${bts.gprs_mode} gprs routing area ${bts.routing_area_code} gprs network-control-order nc1 gprs cell bvci ${bts.bvci} diff --git a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl index e7f2fb8..ede1902 100644 --- a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl @@ -18,7 +18,7 @@ bind-ip ${osmo_trx.trx_ip} remote-ip ${osmo_trx.bts_ip} base-port 5700 - egprs disable + egprs ${osmo_trx.egprs} %if osmo_trx.get('multi_arfcn', False): multi-arfcn enable %else: -- To view, visit https://gerrit.osmocom.org/11497 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I682f0c1b4cb97b704d646f18f54e748baaefd677 Gerrit-Change-Number: 11497 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 13:24:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 29 Oct 2018 13:24:25 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites.conf: Enable testing egprs Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11498 Change subject: default-suites.conf: Enable testing egprs ...................................................................... default-suites.conf: Enable testing egprs Change-Id: I1885e2a749e62547f60b9c35e15f1277b2627bb4 --- M example/default-suites.conf 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/98/11498/1 diff --git a/example/default-suites.conf b/example/default-suites.conf index 597dc0d..baf7bf1 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -10,6 +10,7 @@ - voice:sysmo+mod-bts0-dynts-ipa - voice:sysmo+mod-bts0-dynts-osmo - gprs:sysmo +- gprs:sysmo+mod-bts0-egprs - gprs:sysmo+mod-bts0-dynts-ipa - gprs:sysmo+mod-bts0-dynts-osmo - dynts:sysmo+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 @@ -28,6 +29,7 @@ - voice:trx-b200+mod-bts0-dynts-osmo - voice:trx-b200+mod-bts0-numtrx2+mod-bts0-chanallocdescend - gprs:trx-b200 +- gprs:trx-b200+mod-bts0-egprs - gprs:trx-b200+mod-bts0-dynts-ipa - gprs:trx-b200+mod-bts0-dynts-osmo - gprs:trx-b200+mod-bts0-numtrx2+mod-bts0-chanallocdescend @@ -46,6 +48,7 @@ - voice:trx-sysmocell5000+mod-bts0-dynts-ipa - voice:trx-sysmocell5000+mod-bts0-dynts-osmo - gprs:trx-sysmocell5000 +- gprs:trx-sysmocell5000+mod-bts0-egprs - gprs:trx-sysmocell5000+mod-bts0-dynts-ipa - gprs:trx-sysmocell5000+mod-bts0-dynts-osmo - dynts:trx-sysmocell5000+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 @@ -61,6 +64,7 @@ - voice:nanobts+band-1900+mod-bts0-ts-tchh+cfg-codec-hr3 - voice:nanobts+band-1900+mod-bts0-dynts-ipa - gprs:nanobts+band-1900 +- gprs:nanobts+band-1900+mod-bts0-egprs - gprs:nanobts+band-1900+mod-bts0-dynts-ipa - dynts:nanobts+band-1900+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 @@ -74,6 +78,7 @@ - voice:nanobts+band-900+mod-bts0-dynts-ipa - voice:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend - gprs:nanobts+band-900 +- gprs:nanobts+band-900+mod-bts0-egprs - gprs:nanobts+band-900+mod-bts0-dynts-ipa - gprs:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend - dynts:nanobts+band-900+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 -- To view, visit https://gerrit.osmocom.org/11498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1885e2a749e62547f60b9c35e15f1277b2627bb4 Gerrit-Change-Number: 11498 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 13:48:47 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 29 Oct 2018 13:48:47 +0000 Subject: Change in libosmocore[master]: stop printing group description in vty_out_rate_ctr_group_fmt() In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11467 ) Change subject: stop printing group description in vty_out_rate_ctr_group_fmt() ...................................................................... stop printing group description in vty_out_rate_ctr_group_fmt() When vty_out_rate_ctr_group_fmt() prints the description of a counter group, it assumes this description should appear at the beginning of a line. However, the caller might be printing counters in an indented context. So just let the caller worry about printing the group title if necessary (there is currently only one known caller, which is updated in this commit). Note that printing of the group title was an undocumented feature. Change-Id: I2c55cb54e8b7a7c8c6cf72f22287083767ed0201 Related: OS#2660 --- M src/vty/stats_vty.c M src/vty/utils.c 2 files changed, 1 insertion(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c index 5ded7a4..62153f3 100644 --- a/src/vty/stats_vty.c +++ b/src/vty/stats_vty.c @@ -533,6 +533,7 @@ static int rate_ctr_group_handler(struct rate_ctr_group *ctrg, void *sctx_) { struct vty *vty = sctx_; + vty_out(vty, "%s:%s", ctrg->desc->group_description, VTY_NEWLINE); vty_out_rate_ctr_group_fmt(vty, "%25n: %10c (%S/s %M/m %H/h %D/d) %d", ctrg); return 0; } diff --git a/src/vty/utils.c b/src/vty/utils.c index 0d663c6..0358d9b 100644 --- a/src/vty/utils.c +++ b/src/vty/utils.c @@ -214,9 +214,6 @@ struct rate_ctr_group *ctrg) { struct vty_out_context vctx = {vty, fmt}; - - vty_out(vty, "%s:%s", ctrg->desc->group_description, VTY_NEWLINE); - rate_ctr_for_each_counter(ctrg, rate_ctr_handler_fmt, &vctx); } -- To view, visit https://gerrit.osmocom.org/11467 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2c55cb54e8b7a7c8c6cf72f22287083767ed0201 Gerrit-Change-Number: 11467 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 13:58:56 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 29 Oct 2018 13:58:56 +0000 Subject: Change in osmo-mgw[master]: add MDCX command statistics to osmo-mgw Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11499 Change subject: add MDCX command statistics to osmo-mgw ...................................................................... add MDCX command statistics to osmo-mgw Add a counter group for MDCX commands. The group contains counters for successful connection processing as well as various error conditions. This provides a quick overview of MDCX failures on each trunk throughout the lifetime of the osmo-mgw process. The counters are displayed by 'show mgcp stats' and 'show rate-counters'. Change-Id: I79c27425ba40c3a85edc6cd846cba325d847298c Depends: Ia2004f8063f3a50b5d7a838ebe8a784a47fcc50d Related: OS#2660 --- M include/osmocom/mgcp/mgcp.h M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c 3 files changed, 79 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/99/11499/1 diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index b866f91..c8c2cfd 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -137,6 +137,25 @@ MGCP_CRCX_FAIL_BIND_PORT, }; +/* Global MCGP MDCX related rate counters */ +enum { + MGCP_MDCX_SUCCESS, + MGCP_MDCX_FAIL_WILDCARD, + MGCP_MDCX_FAIL_NO_CONN, + MGCP_MDCX_FAIL_INVALID_CALLID, + MGCP_MDCX_FAIL_INVALID_CONNID, + MGCP_MDCX_FAIL_UNHANDLED_PARAM, + MGCP_MDCX_FAIL_NO_CONNID, + MGCP_MDCX_FAIL_CONN_NOT_FOUND, + MGCP_MDCX_FAIL_INVALID_MODE, + MGCP_MDCX_FAIL_INVALID_CONN_OPTIONS, + MGCP_MDCX_FAIL_NO_REMOTE_CONN_DESC, + MGCP_MDCX_FAIL_START_RTP, + MGCP_MDCX_FAIL_REJECTED_BY_POLICY, + MGCP_MDCX_FAIL_DEFERRED_BY_POLICY +}; + + struct mgcp_trunk_config { struct llist_head entry; @@ -177,6 +196,7 @@ /* rate counters */ struct rate_ctr_group *mgcp_crcx_ctr_group; + struct rate_ctr_group *mgcp_mdcx_ctr_group; }; enum mgcp_role { diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index ccbdfc8..bef5be6 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -57,7 +57,7 @@ [MGCP_CRCX_FAIL_BAD_ACTION] = {"crcx:bad_action", "bad action in CRCX command."}, [MGCP_CRCX_FAIL_UNHANDLED_PARAM] = {"crcx:unhandled_param", "unhandled parameter in CRCX command."}, [MGCP_CRCX_FAIL_MISSING_CALLID] = {"crcx:missing_callid", "missing CallId in CRCX command."}, - [MGCP_CRCX_FAIL_INVALID_MODE] = {"crcx:invalid_mode", "connection invalid mode in CRCX command."}, + [MGCP_CRCX_FAIL_INVALID_MODE] = {"crcx:invalid_mode", "invalid connection mode in CRCX command."}, [MGCP_CRCX_FAIL_LIMIT_EXCEEDED] = {"crcx:limit_exceeded", "limit of concurrent connections was reached."}, [MGCP_CRCX_FAIL_UNKNOWN_CALLID] = {"crcx:unkown_callid", "unknown CallId in CRCX command."}, [MGCP_CRCX_FAIL_ALLOC_CONN] = {"crcx:alloc_conn_fail", "connection allocation failure."}, @@ -78,6 +78,31 @@ .ctr_desc = mgcp_crcx_ctr_desc }; +static const struct rate_ctr_desc mgcp_mdcx_ctr_desc[] = { + [MGCP_MDCX_SUCCESS] = {"mdcx:success", "MDCX command processed successfully."}, + [MGCP_MDCX_FAIL_WILDCARD] = {"mdcx:wildcard", "wildcard endpoint names in MDCX commands are unsupported."}, + [MGCP_MDCX_FAIL_NO_CONN] = {"mdcx:no_conn", "endpoint specified in MDCX command has no active connections."}, + [MGCP_MDCX_FAIL_INVALID_CALLID] = {"mdcx:callid", "invalid CallId specified in MDCX command."}, + [MGCP_MDCX_FAIL_INVALID_CONNID] = {"mdcx:connid", "invalid connection ID specified in MDCX command."}, + [MGCP_MDCX_FAIL_UNHANDLED_PARAM] = {"crcx:unhandled_param", "unhandled parameter in MDCX command."}, + [MGCP_MDCX_FAIL_NO_CONNID] = {"mdcx:no_connid", "no connection ID specified in MDCX command."}, + [MGCP_MDCX_FAIL_CONN_NOT_FOUND] = {"mdcx:conn_not_found", "connection specified in MDCX command does not exist."}, + [MGCP_MDCX_FAIL_INVALID_MODE] = {"mdcx:invalid_mode", "invalid connection mode in MDCX command."}, + [MGCP_MDCX_FAIL_INVALID_CONN_OPTIONS] = {"mdcx:conn_opt", "connection options invalid."}, + [MGCP_MDCX_FAIL_NO_REMOTE_CONN_DESC] = {"mdcx:no_remote_conn_desc", "no opposite end specified for connection."}, + [MGCP_MDCX_FAIL_START_RTP] = {"mdcx:start_rtp_failure", "failure to start RTP processing."}, + [MGCP_MDCX_FAIL_REJECTED_BY_POLICY] = {"mdcx:conn_rejected", "connection rejected by policy."}, + [MGCP_MDCX_FAIL_DEFERRED_BY_POLICY] = {"mdcx:conn_deferred", "connection deferred by policy."}, +}; + +const static struct rate_ctr_group_desc mgcp_mdcx_ctr_group_desc = { + .group_name_prefix = "mdcx", + .group_description = "mdcx statistics", + .class_id = OSMO_STATS_CLASS_GLOBAL, + .num_ctr = ARRAY_SIZE(mgcp_mdcx_ctr_desc), + .ctr_desc = mgcp_mdcx_ctr_desc +}; + static struct msgb *handle_audit_endpoint(struct mgcp_parse_data *data); static struct msgb *handle_create_con(struct mgcp_parse_data *data); static struct msgb *handle_delete_con(struct mgcp_parse_data *data); @@ -999,7 +1024,9 @@ /* MDCX command handler, processes the received command */ static struct msgb *handle_modify_con(struct mgcp_parse_data *p) { + struct mgcp_trunk_config *tcfg = p->endp->tcfg; struct mgcp_endpoint *endp = p->endp; + struct rate_ctr_group *rate_ctrs = tcfg->mgcp_mdcx_ctr_group; int error_code = 500; int silent = 0; int have_sdp = 0; @@ -1017,6 +1044,7 @@ LOGP(DLMGCP, LOGL_ERROR, "MDCX: endpoint:0x%x wildcarded endpoint names not supported.\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_WILDCARD]); return create_err_response(endp, 507, "MDCX", p->trans); } @@ -1024,6 +1052,7 @@ LOGP(DLMGCP, LOGL_ERROR, "MDCX: endpoint:0x%x endpoint is not holding a connection.\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_NO_CONN]); return create_err_response(endp, 400, "MDCX", p->trans); } @@ -1034,14 +1063,17 @@ switch (line[0]) { case 'C': if (mgcp_verify_call_id(endp, line + 3) != 0) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_INVALID_CALLID]); error_code = 516; goto error3; } break; case 'I': conn_id = (const char *)line + 3; - if ((error_code = mgcp_verify_ci(endp, conn_id))) + if ((error_code = mgcp_verify_ci(endp, conn_id))) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_INVALID_CONNID]); goto error3; + } break; case 'L': local_options = (const char *)line + 3; @@ -1060,6 +1092,7 @@ LOGP(DLMGCP, LOGL_NOTICE, "MDCX: endpoint:0x%x Unhandled MGCP option: '%c'/%d\n", ENDPOINT_NUMBER(endp), line[0], line[0]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_UNHANDLED_PARAM]); return create_err_response(NULL, 539, "MDCX", p->trans); break; } @@ -1070,15 +1103,19 @@ LOGP(DLMGCP, LOGL_ERROR, "MDCX: endpoint:0x%x insufficient parameters, missing ci (connectionIdentifier)\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_NO_CONNID]); return create_err_response(endp, 515, "MDCX", p->trans); } conn = mgcp_conn_get_rtp(endp, conn_id); - if (!conn) + if (!conn) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_CONN_NOT_FOUND]); return create_err_response(endp, 400, "MDCX", p->trans); + } if (mode) { if (mgcp_parse_conn_mode(mode, endp, conn->conn) != 0) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_INVALID_MODE]); error_code = 517; goto error3; } @@ -1091,9 +1128,10 @@ &endp->local_options, local_options); if (rc != 0) { LOGP(DLMGCP, LOGL_ERROR, - "MDCX: endpoint:%x inavlid local connection options!\n", + "MDCX: endpoint:%x invalid local connection options!\n", ENDPOINT_NUMBER(endp)); error_code = rc; + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_INVALID_CONN_OPTIONS]); goto error3; } } @@ -1114,12 +1152,15 @@ "MDCX: endpoint:%x selected connection mode type requires an opposite end!\n", ENDPOINT_NUMBER(endp)); error_code = 527; + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_NO_REMOTE_CONN_DESC]); goto error3; } - if (setup_rtp_processing(endp, conn) != 0) + if (setup_rtp_processing(endp, conn) != 0) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_START_RTP]); goto error3; + } /* policy CB */ @@ -1132,6 +1173,7 @@ LOGP(DLMGCP, LOGL_NOTICE, "MDCX: endpoint:0x%x rejected by policy\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_REJECTED_BY_POLICY]); if (silent) goto out_silent; return create_err_response(endp, 400, "MDCX", p->trans); @@ -1139,8 +1181,9 @@ case MGCP_POLICY_DEFER: /* stop processing */ LOGP(DLMGCP, LOGL_DEBUG, - "MDCX: endpoint:0x%x defered by policy\n", + "MDCX: endpoint:0x%x deferred by policy\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_DEFERRED_BY_POLICY]); return NULL; break; case MGCP_POLICY_CONT: @@ -1165,6 +1208,7 @@ && endp->tcfg->keepalive_interval != MGCP_KEEPALIVE_NEVER) send_dummy(endp, conn); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_SUCCESS]); if (silent) goto out_silent; @@ -1457,6 +1501,11 @@ OSMO_ASSERT(trunk->mgcp_crcx_ctr_group); talloc_set_destructor(trunk->mgcp_crcx_ctr_group, free_rate_counter_group); rate_ctr_index++; + + trunk->mgcp_mdcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_mdcx_ctr_group_desc, rate_ctr_index); + OSMO_ASSERT(trunk->mgcp_mdcx_ctr_group); + talloc_set_destructor(trunk->mgcp_mdcx_ctr_group, free_rate_counter_group); + rate_ctr_index++; } /*! allocate configuration with default values. diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index fdcca91..0d81e62 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -239,6 +239,10 @@ vty_out(vty, " %s:%s", cfg->mgcp_crcx_ctr_group->desc->group_description, VTY_NEWLINE); vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h %D/d) %d", cfg->mgcp_crcx_ctr_group); } + if (show_stats && cfg->mgcp_mdcx_ctr_group) { + vty_out(vty, " %s:%s", cfg->mgcp_mdcx_ctr_group->desc->group_description, VTY_NEWLINE); + vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h %D/d) %d", cfg->mgcp_mdcx_ctr_group); + } } #define SHOW_MGCP_STR "Display information about the MGCP Media Gateway\n" -- To view, visit https://gerrit.osmocom.org/11499 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I79c27425ba40c3a85edc6cd846cba325d847298c Gerrit-Change-Number: 11499 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Oct 29 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 29 Oct 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#291?= In-Reply-To: <385043837.268.1540739407375.JavaMail.jenkins@jenkins.osmocom.org> References: <385043837.268.1540739407375.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <495396751.290.1540825807446.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Oct 29 15:54:53 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 29 Oct 2018 15:54:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Use f_gen_test_hdlr_pars() to be aware of AoIP/sccplite Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11500 Change subject: bsc: Use f_gen_test_hdlr_pars() to be aware of AoIP/sccplite ...................................................................... bsc: Use f_gen_test_hdlr_pars() to be aware of AoIP/sccplite Some TC_no_out_fail_* testcases still used valueof() to get g_pars which always set aoip to true. Use f_gen_test_hdlr_pars() now so these tests can properly detect if they are run with sccplite of aoip and can adjust their expectations accordingly. Change-Id: Ic164827d63c9f5452888951bba4c197c3fe6f57b --- M bsc/BSC_Tests.ttcn 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/00/11500/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index fef5fd7..ae855bd 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2277,7 +2277,7 @@ /* BSC asks for inter-BSC HO, but the MSC decides that it won't happen and * simply never sends a BSSMAP Handover Command. */ private function f_tc_ho_out_fail_no_msc_response(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); var PDU_BSSAP ass_req := f_gen_ass_req(); ass_req.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); @@ -2323,7 +2323,7 @@ /* BSC asks for inter-BSC HO, receives BSSMAP Handover Command, but MS reports * RR Handover Failure. */ private function f_tc_ho_out_fail_rr_ho_failure(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); var PDU_BSSAP ass_req := f_gen_ass_req(); ass_req.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); @@ -2406,7 +2406,7 @@ /* BSC asks for inter-BSC HO, receives BSSMAP Handover Command, but MS reports * RR Handover Failure. */ private function f_tc_ho_out_fail_no_ho_detect(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); var PDU_BSSAP ass_req := f_gen_ass_req(); ass_req.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); -- To view, visit https://gerrit.osmocom.org/11500 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic164827d63c9f5452888951bba4c197c3fe6f57b Gerrit-Change-Number: 11500 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 15:54:53 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 29 Oct 2018 15:54:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Use Misc_Helpers.f_shutdown for setverdict(fail) Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11501 Change subject: bsc: Use Misc_Helpers.f_shutdown for setverdict(fail) ...................................................................... bsc: Use Misc_Helpers.f_shutdown for setverdict(fail) Unfortunately all component.stop can not be called from the non-mtc component. f_shutdown is a wrapper that will try to shutdown a test in the best way calling all component.stop if it is called from the mtc and just stopping the mtc if called from any other component. Change-Id: I9b71f7f7bd70d2da21fbad60c340d5bf8b3b9536 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 30 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/11501/1 diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index dfdf10c..546fa2d 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -1,5 +1,6 @@ module MSC_ConnectionHandler { +import from Misc_Helpers all; import from General_Types all; import from Osmocom_Types all; import from GSM_Types all; @@ -146,8 +147,9 @@ return i; } } - setverdict(fail, "Only 2 Connections per EP!"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Only 2 Connections per EP!"); + /* Should never be reached */ + return -1; } /* Helper function to pick a specific connection by its cid. Since we reach out @@ -159,8 +161,9 @@ return i; } } - setverdict(fail, "No Connection for ID ", cid); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("No Connection for ID ", cid)); + /* Should not be reached */ + return -1; } /* altstep for handling of IPACC media related commands. Activated by as_Media() to test @@ -188,8 +191,7 @@ /* Extract conn_id, ip, port, rtp_pt2 from request + use in response */ b_unused := f_rsl_find_ie(rsl, RSL_IE_IPAC_CONN_ID, ie); if (g_media.bts.conn_id != ie.ipa_conn_id) { - setverdict(fail, "IPA MDCX for unknown ConnId", rsl); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("IPA MDCX for unknown ConnId", rsl)); } /* mandatory */ b_unused := f_rsl_find_ie(rsl, RSL_IE_IPAC_REMOTE_IP, ie); @@ -232,8 +234,7 @@ /* Extract conn_id, ip, port, rtp_pt2 from request + use in response */ b_unused := f_rsl_find_ie(rsl, RSL_IE_IPAC_CONN_ID, ie); if (g_media.bts1.conn_id != ie.ipa_conn_id) { - setverdict(fail, "IPA MDCX for unknown ConnId", rsl); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("IPA MDCX for unknown ConnId", rsl)); } /* mandatory */ b_unused := f_rsl_find_ie(rsl, RSL_IE_IPAC_REMOTE_IP, ie); @@ -268,8 +269,7 @@ var integer cid := f_get_free_mgcp_conn(); if (match(mgcp_cmd.line.ep, t_MGCP_EP_wildcard)) { if (cid != 0) { - setverdict(fail, "MGCP wildcard EP only works in first CRCX"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "MGCP wildcard EP only works in first CRCX"); } /* we keep the endpoint name allocated during MediaState_init */ } else { @@ -305,7 +305,7 @@ g_media.mgcp_conn[cid].peer.host := sdp.connection.conn_addr.addr; g_media.mgcp_conn[cid].peer.port_nr := sdp.media_list[0].media_field.ports.port_number; } else { - setverdict(fail, "MDCX has no [recognizable] SDP"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "MDCX has no [recognizable] SDP"); } var MgcpConnState mgcp_conn := g_media.mgcp_conn[cid]; sdp := valueof(ts_SDP(mgcp_conn.peer.host, mgcp_conn.peer.host, "foo", "21", @@ -519,7 +519,7 @@ else if (alg_bssmap == '80'O) { return RSL_ALG_ID_A5_7; } else { - setverdict(fail, "Unexpected Encryption Algorithm"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected Encryption Algorithm"); return RSL_ALG_ID_A5_0; } } @@ -553,14 +553,14 @@ [] BSSAP.receive(tr_BSSMAP_CipherModeCompl) -> value bssap { // bssap.bssmap.cipherModeComplete.chosenEncryptionAlgorithm.algoritmhIdentifier if (exp_fail == true) { - setverdict(fail, "Unexpected Cipher Mode Complete"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected Cipher Mode Complete"); } else { setverdict(pass); } } [] BSSAP.receive(tr_BSSMAP_CipherModeRej) -> value bssap { if (exp_fail == false) { - setverdict(fail, "Ciphering Mode Reject"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Ciphering Mode Reject"); } else { setverdict(pass); } @@ -586,13 +586,11 @@ chan_nr := valueof(t_RslChanNr_SDCCH8(tn, bit2int(substr(inp, 2, 3)))); } else { - setverdict(fail, "Unknown ChDesc!"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unknown ChDesc!"); } if (ch_desc.octet3 and4b '10'O == '10'O) { - setverdict(fail, "No support for Hopping"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "No support for Hopping"); } else { var OCT2 concat := ch_desc.octet3 & ch_desc.octet4; arfcn := oct2int(concat); @@ -635,17 +633,17 @@ var RSL_IE_Body encr_info; if (ispresent(g_pars.encr) and g_pars.encr.enc_alg != '01'O) { if (not f_rsl_find_ie(chan_act, RSL_IE_ENCR_INFO, encr_info)) { - setverdict(fail, "Missing Encryption IE in CHAN ACT"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Missing Encryption IE in CHAN ACT"); } else { var RSL_AlgId alg := f_chipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg); if (not match(encr_info, tr_EncrInfo(alg, g_pars.encr.enc_key))) { - setverdict(fail, "Wrong Encryption IE in CHAN ACT"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Wrong Encryption IE in CHAN ACT"); } } } else { if (f_rsl_find_ie(chan_act, RSL_IE_ENCR_INFO, encr_info)) { if (encr_info.encr_info.alg_id != RSL_ALG_ID_A5_0) { - setverdict(fail, "Unexpected Encryption in CHAN ACT"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected Encryption in CHAN ACT"); } } } @@ -681,8 +679,7 @@ f_check_chan_act(st, chan_act); repeat; } else { - setverdict(fail, "Unexpected L3 received", l3); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected L3 received", l3)); } } [st.rr_ass_cmpl_seen] RSL.receive(tr_RSL_REL_REQ(st.old_chan_nr, tr_RslLinkID_DCCH(0))) { @@ -820,10 +817,10 @@ ", mdcx_seen=", g_media.mgcp_conn[i].mdcx_seen, ", mdcx_seen_exp=", g_media.mgcp_conn[i].mdcx_seen_exp); if(g_media.mgcp_conn[i].crcx_seen != g_media.mgcp_conn[i].crcx_seen_exp) { - setverdict(fail, "unexpected number of MGW-CRCX transactions"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "unexpected number of MGW-CRCX transactions"); } if(g_media.mgcp_conn[i].mdcx_seen != g_media.mgcp_conn[i].mdcx_seen_exp) { - setverdict(fail, "unexpected number of MGW-MDCX transactions"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "unexpected number of MGW-MDCX transactions"); } } } @@ -862,14 +859,10 @@ alt { [] BSSAP.receive(exp_l3_compl); [] BSSAP.receive(tr_BSSMAP_ComplL3) { - setverdict(fail, "Received non-matching COMPLETE LAYER 3 INFORMATION"); - all component.stop; - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Received non-matching COMPLETE LAYER 3 INFORMATION"); } [] T.timeout { - setverdict(fail, "Timeout waiting for COMPLETE LAYER 3 INFORMATION"); - all component.stop; - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for COMPLETE LAYER 3 INFORMATION"); } } @@ -965,29 +958,19 @@ [(st.is_assignment and st.assignment_done or (not st.is_assignment and (st.modify_done or not exp_modify))) and exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentComplete) { - setverdict(fail, "Received non-matching ASSIGNMENT COMPLETE"); - all component.stop; - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Received non-matching ASSIGNMENT COMPLETE"); } [exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentFail) { - setverdict(fail, "Received unexpected ASSIGNMENT FAIL"); - all component.stop; - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Received unexpected ASSIGNMENT FAIL"); } [not exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentComplete) { - setverdict(fail, "Received unexpected ASSIGNMENT COMPLETE"); - all component.stop; - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Received unexpected ASSIGNMENT COMPLETE"); } [not exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentFail) { - setverdict(fail, "Received non-matching ASSIGNMENT FAIL"); - all component.stop; - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Received non-matching ASSIGNMENT FAIL"); } [] T.timeout { - setverdict(fail, "Timeout waiting for ASSIGNMENT COMPLETE"); - all component.stop; - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for ASSIGNMENT COMPLETE"); } } log("g_media ", g_media); @@ -1055,8 +1038,7 @@ st.mdcx_seen_before_ho := g_media.mgcp_conn[0].mdcx_seen; repeat; } else { - setverdict(fail, "Unexpected L3 received", l3); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected L3 received", l3)); } } [st.rr_ho_cmpl_seen] as_Media_ipacc(); -- To view, visit https://gerrit.osmocom.org/11501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9b71f7f7bd70d2da21fbad60c340d5bf8b3b9536 Gerrit-Change-Number: 11501 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 16:48:59 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 29 Oct 2018 16:48:59 +0000 Subject: Change in osmo-mgw[master]: add MDCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11499 to look at the new patch set (#2). Change subject: add MDCX command statistics to osmo-mgw ...................................................................... add MDCX command statistics to osmo-mgw Add a counter group for MDCX commands. The group contains counters for successful connection processing as well as various error conditions. This provides a quick overview of MDCX failures on each trunk throughout the lifetime of the osmo-mgw process. The counters are displayed by 'show mgcp stats' and 'show rate-counters'. Change-Id: I79c27425ba40c3a85edc6cd846cba325d847298c Depends: Ia2004f8063f3a50b5d7a838ebe8a784a47fcc50d Related: OS#2660 --- M include/osmocom/mgcp/mgcp.h M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c 3 files changed, 92 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/99/11499/2 -- To view, visit https://gerrit.osmocom.org/11499 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I79c27425ba40c3a85edc6cd846cba325d847298c Gerrit-Change-Number: 11499 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 16:50:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 29 Oct 2018 16:50:00 +0000 Subject: Change in osmo-gsm-tester[master]: defaults.conf: Set valid default codec_list matching avail TS types Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11502 Change subject: defaults.conf: Set valid default codec_list matching avail TS types ...................................................................... defaults.conf: Set valid default codec_list matching avail TS types By default, all channels are TCH/F, and as a result we cannot run half rate codecs on it. Since recent versions of osmo-bsc, it checks this kind of misconfigurations and answers with an Assignment Failure: .... 20181029162133430 DMSC <0007> codec_pref.c:445 codec-support/trx config of BTS 0 does not intersect with codec-list of MSC 0 20181029162133430 DMSC <0007> osmo_bsc_main.c:887 Configuration contains mutually exclusive codec settings -- check configuration! .... 20181029162255253 DMSC <0007> osmo_bsc_bssap.c:859 Rx MSC DT1 BSSMAP ASSIGNMENT REQ 20181029162255254 DMSC <0007> osmo_bsc_bssap.c:718 No supported audio type found for channel_type = { ch_indctr=0x1, ch_rate_type=0xa, perm_spch=[ 42 21 11 01 25 05 ] Change-Id: Ie6b37839fe363b5d1ba64c267d751221434cdedb --- M example/defaults.conf 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/02/11502/1 diff --git a/example/defaults.conf b/example/defaults.conf index dc38030..1855883 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -15,7 +15,7 @@ long_name: osmo-gsm-tester-msc encryption: a5_0 codec_list: - - hr3 + - fr1 msc: net: -- To view, visit https://gerrit.osmocom.org/11502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6b37839fe363b5d1ba64c267d751221434cdedb Gerrit-Change-Number: 11502 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 16:52:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 29 Oct 2018 16:52:49 +0000 Subject: Change in osmo-gsm-tester[master]: defaults.conf: Set valid default codec_list matching avail TS types In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11502 ) Change subject: defaults.conf: Set valid default codec_list matching avail TS types ...................................................................... Patch Set 1: I'm not sure whether one can still run 1 half rate codec in 1 TCH/F (allocating all of it). Of curse it's not optimal but maybe still possible. If that's the case, we should fix osmo-bsc to allow it (maybe print a warning a t startup). -- To view, visit https://gerrit.osmocom.org/11502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie6b37839fe363b5d1ba64c267d751221434cdedb Gerrit-Change-Number: 11502 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 16:52:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 16:54:37 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 29 Oct 2018 16:54:37 +0000 Subject: Change in osmo-gsm-tester[master]: defaults.conf: Set valid default codec_list matching avail TS types In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11502 ) Change subject: defaults.conf: Set valid default codec_list matching avail TS types ...................................................................... Patch Set 1: Code-Review+1 > I'm not sure whether one can still run 1 half rate codec in 1 TCH/F > (allocating all of it). Of curse it's not optimal but maybe still > possible. If that's the case, we should fix osmo-bsc to allow it > (maybe print a warning a t startup). -- To view, visit https://gerrit.osmocom.org/11502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie6b37839fe363b5d1ba64c267d751221434cdedb Gerrit-Change-Number: 11502 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 16:54:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 16:56:05 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 29 Oct 2018 16:56:05 +0000 Subject: Change in libosmocore[master]: make 'show rate-counters' show group index Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11503 Change subject: make 'show rate-counters' show group index ...................................................................... make 'show rate-counters' show group index Show each rate counter group's index in the output of the 'show rate-counters' command, to provide some way of telling apart distinct instances of the same rate counter group. This is not a very user-friendly UI because these indices are generated internally by libosmocore and/or applications, so users cannot easily assign meaning to these indices. However, the current rate counter implementation doesn't allow for more. Change-Id: Ieb151239407e4b2f8859fefec8d0670f5ddf908a Related: OS#3674 --- M src/vty/stats_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/11503/1 diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c index 62153f3..c911087 100644 --- a/src/vty/stats_vty.c +++ b/src/vty/stats_vty.c @@ -533,7 +533,7 @@ static int rate_ctr_group_handler(struct rate_ctr_group *ctrg, void *sctx_) { struct vty *vty = sctx_; - vty_out(vty, "%s:%s", ctrg->desc->group_description, VTY_NEWLINE); + vty_out(vty, "%s %u:%s", ctrg->desc->group_description, ctrg->idx, VTY_NEWLINE); vty_out_rate_ctr_group_fmt(vty, "%25n: %10c (%S/s %M/m %H/h %D/d) %d", ctrg); return 0; } -- To view, visit https://gerrit.osmocom.org/11503 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb151239407e4b2f8859fefec8d0670f5ddf908a Gerrit-Change-Number: 11503 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 17:01:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 29 Oct 2018 17:01:23 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11504 Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... gsm0808: add BSSMAP Cell Identifier matching API Add * osmo_lai_cmp() (to use in gsm0808_cell_id_u_matches()) * osmo_cgi_cmp() (to use in gsm0808_cell_id_u_matches()) * gsm0808_cell_id_u_matches() (to re-use for single IDs and lists) * gsm0808_cell_ids_match() * gsm0808_cell_id_matches_list() * Unit tests in gsm0808_test.c Rationale: For inter-BSC handover, it is interesting to find matches between *differing* Cell Identity kinds. For example, if a cell as CGI 23-42-3-5, and a HO for LAC-CI 3-5 should be handled, we need to see the match. This is most interesting for osmo-msc, i.e. to direct the BSSMAP Handover Request towards the correct BSC -- not yet being implemented ATM though. It is also interesting for osmo-bsc's VTY interface, to be able to manage cells' neighbors and to trigger manual handovers by various Cell Identity handles, as the user would expect them. Granted, the osmo-bsc VTY UI isn't a really pressing need to be adding this at this moment, but with the future perspective of osmo-msc also using it, I preferred to do the UI "properly" as well now. Change-Id: I5535f0d149c2173294538df75764dd181b023312 --- M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/gsm23003.h M src/gsm/gsm0808_utils.c M src/gsm/gsm23003.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 7 files changed, 574 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/04/11504/1 diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index f70dbdb..29730c2 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -67,6 +67,12 @@ int gsm0808_cell_id_list_name_buf(char *buf, size_t buflen, const struct gsm0808_cell_id_list2 *cil); int gsm0808_cell_id_u_name(char *buf, size_t buflen, enum CELL_IDENT id_discr, const union gsm0808_cell_id_u *u); +bool gsm0808_cell_id_u_matches(enum CELL_IDENT discr1, const union gsm0808_cell_id_u *u1, + enum CELL_IDENT discr2, const union gsm0808_cell_id_u *u2); +bool gsm0808_cell_ids_match(const struct gsm0808_cell_id *id1, const struct gsm0808_cell_id *id2); +int gsm0808_cell_id_matches_list(const struct gsm0808_cell_id *id, + const struct gsm0808_cell_id_list2 *list, + unsigned int match_nr); uint8_t gsm0808_enc_aoip_trasp_addr(struct msgb *msg, const struct sockaddr_storage *ss); diff --git a/include/osmocom/gsm/gsm23003.h b/include/osmocom/gsm/gsm23003.h index 2f380ae..cb228b7 100644 --- a/include/osmocom/gsm/gsm23003.h +++ b/include/osmocom/gsm/gsm23003.h @@ -121,6 +121,8 @@ int osmo_mnc_cmp(uint16_t a_mnc, bool a_mnc_3_digits, uint16_t b_mnc, bool b_mnc_3_digits); int osmo_plmn_cmp(const struct osmo_plmn_id *a, const struct osmo_plmn_id *b); +int osmo_lai_cmp(const struct osmo_location_area_id *a, const struct osmo_location_area_id *b); +int osmo_cgi_cmp(const struct osmo_cell_global_id *a, const struct osmo_cell_global_id *b); int osmo_gen_home_network_domain(char *out, const struct osmo_plmn_id *plmn); int osmo_parse_home_network_domain(struct osmo_plmn_id *out, const char *in); diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 2348105..147d069 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -1266,6 +1266,146 @@ } } +/* Store individual Cell Identifier information in a CGI, without clearing the remaining ones. + * This is useful to supplement one CGI with information from more than one Cell Identifier, + * which in turn is useful to match Cell Identifiers of differing kinds to each other. + * Before first invocation, clear the *dst struct externally, this function does only write those members + * that are present in parameter u. + */ +static void cell_id_to_cgi(struct osmo_cell_global_id *dst, + enum CELL_IDENT discr, const union gsm0808_cell_id_u *u) +{ + switch (discr) { + case CELL_IDENT_WHOLE_GLOBAL: + *dst = u->global; + return; + + case CELL_IDENT_LAC_AND_CI: + dst->lai.lac = u->lac_and_ci.lac; + dst->cell_identity = u->lac_and_ci.ci; + return; + + case CELL_IDENT_CI: + dst->cell_identity = u->ci; + return; + + case CELL_IDENT_LAI_AND_LAC: + dst->lai = u->lai_and_lac; + return; + + case CELL_IDENT_LAC: + dst->lai.lac = u->lac; + return; + + case CELL_IDENT_NO_CELL: + case CELL_IDENT_BSS: + case CELL_IDENT_UTRAN_PLMN_LAC_RNC: + case CELL_IDENT_UTRAN_RNC: + case CELL_IDENT_UTRAN_LAC_RNC: + /* No values to set. */ + return; + } +} + +/*! Return true if the common information between the two Cell Identifiers match. + * For example, if a LAC+CI is compared to LAC, return true if the LAC are the same. + * Note that CELL_IDENT_NO_CELL will always return false. + * Also CELL_IDENT_BSS will always return false, since this function cannot possibly + * know the bounds of the BSS, so the caller must handle CELL_IDENT_BSS specially. + * \param[in] discr1 Cell Identifier type. + * \param[in] u1 Cell Identifier value. + * \param[in] discr2 Other Cell Identifier type. + * \param[in] u2 Other Cell Identifier value. + * \returns True if the common fields of the above match. + */ +bool gsm0808_cell_id_u_match(enum CELL_IDENT discr1, const union gsm0808_cell_id_u *u1, + enum CELL_IDENT discr2, const union gsm0808_cell_id_u *u2) +{ + struct osmo_cell_global_id a = {}; + struct osmo_cell_global_id b = {}; + + /* First handle the odd wildcard like CELL_IDENT kinds. We can't really match any of these. */ + switch (discr1) { + case CELL_IDENT_NO_CELL: + case CELL_IDENT_UTRAN_PLMN_LAC_RNC: + case CELL_IDENT_UTRAN_RNC: + case CELL_IDENT_UTRAN_LAC_RNC: + case CELL_IDENT_BSS: + return false; + default: + break; + } + switch (discr2) { + case CELL_IDENT_NO_CELL: + case CELL_IDENT_UTRAN_PLMN_LAC_RNC: + case CELL_IDENT_UTRAN_RNC: + case CELL_IDENT_UTRAN_LAC_RNC: + case CELL_IDENT_BSS: + return false; + default: + break; + } + + /* Enrich both sides to full CGI, then compare those. First set the *other* ID's values in case + * they assign more items. For example: + * u1 = LAC:42 + * u2 = LAC+CI:23+5 + * 1) a <- LAC+CI:23+5 + * 2) a <- LAC:42 so that a = LAC+CI:42+5 + * Now we can compare those two and find a mismatch. If the LAC were the same, we would get + * identical LAC+CI and hence a match. */ + + cell_id_to_cgi(&a, discr2, u2); + cell_id_to_cgi(&a, discr1, u1); + + cell_id_to_cgi(&b, discr1, u1); + cell_id_to_cgi(&b, discr2, u2); + + return osmo_cgi_cmp(&a, &b) == 0; +} + +/*! Return true if the common information between the two Cell Identifiers match. + * For example, if a LAC+CI is compared to LAC, return true if the LAC are the same. + * Note that CELL_IDENT_NO_CELL will always return false. + * Also CELL_IDENT_BSS will always return false, since this function cannot possibly + * know the bounds of the BSS, so the caller must handle CELL_IDENT_BSS specially. + * \param[in] id1 Cell Identifier. + * \param[in] id2 Other Cell Identifier. + * \returns True if the common fields of the above match. + */ +bool gsm0808_cell_ids_match(const struct gsm0808_cell_id *id1, const struct gsm0808_cell_id *id2) +{ + return gsm0808_cell_id_u_match(id1->id_discr, &id1->id, + id2->id_discr, &id2->id); +} + +/*! Find an index in a Cell Identifier list that matches a given single Cell Identifer. + * Compare \a id against each entry in \a list using gsm0808_cell_ids_match(), and return the list index + * if a match is found. \a match_nr allows iterating all matches in the list. A match_nr <= 0 returns the + * first match in the list, match_nr == 1 the second match, etc., and if match_nr exceeds the available + * matches in the list, -1 is returned. + * \param[in] id Cell Identifier to match. + * \param[in] list Cell Identifier list to search in. + * \param[in] match_nr Ignore this many matches. + * \returns -1 if no match is found, list index if a match is found. + */ +int gsm0808_cell_id_matches_list(const struct gsm0808_cell_id *id, + const struct gsm0808_cell_id_list2 *list, + unsigned int match_nr) +{ + int i; + for (i = 0; i < list->id_list_len; i++) { + if (gsm0808_cell_id_u_match(id->id_discr, &id->id, + list->id_discr, &list->id_list[i])) { + if (match_nr) + match_nr --; + else + return i; + } + } + return -1; +} + /*! value_string[] for enum CELL_IDENT. */ const struct value_string gsm0808_cell_id_discr_names[] = { { CELL_IDENT_WHOLE_GLOBAL, "CGI" }, diff --git a/src/gsm/gsm23003.c b/src/gsm/gsm23003.c index 4fdad48..6abda41 100644 --- a/src/gsm/gsm23003.c +++ b/src/gsm/gsm23003.c @@ -306,6 +306,40 @@ return osmo_mnc_cmp(a->mnc, a->mnc_3_digits, b->mnc, b->mnc_3_digits); } +/* Compare two LAI. + * The order of comparison is MCC, MNC, LAC. See also osmo_plmn_cmp(). + * \param a[in] "Left" side LAI. + * \param b[in] "Right" side LAI. + * \returns 0 if the LAI are equal, -1 if a < b, 1 if a > b. */ +int osmo_lai_cmp(const struct osmo_location_area_id *a, const struct osmo_location_area_id *b) +{ + int rc = osmo_plmn_cmp(&a->plmn, &b->plmn); + if (rc) + return rc; + if (a->lac < b->lac) + return -1; + if (a->lac > b->lac) + return 1; + return 0; +} + +/* Compare two CGI. + * The order of comparison is MCC, MNC, LAC, CI. See also osmo_lai_cmp(). + * \param a[in] "Left" side CGI. + * \param b[in] "Right" side CGI. + * \returns 0 if the CGI are equal, -1 if a < b, 1 if a > b. */ +int osmo_cgi_cmp(const struct osmo_cell_global_id *a, const struct osmo_cell_global_id *b) +{ + int rc = osmo_lai_cmp(&a->lai, &b->lai); + if (rc) + return rc; + if (a->cell_identity < b->cell_identity) + return -1; + if (a->cell_identity > b->cell_identity) + return 1; + return 0; +} + /*! Generate TS 23.003 Section 19.2 Home Network Realm/Domain (text form) * \param out[out] caller-provided output buffer, at least 33 bytes long * \param plmn[in] Osmocom representation of PLMN ID (MCC + MNC) diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 4813e13..ecc368e 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -203,6 +203,9 @@ gsm0808_cell_id_list_name_buf; gsm0808_cell_id_discr_names; gsm0808_cell_id_u_name; +gsm0808_cell_id_u_matches; +gsm0808_cell_ids_match; +gsm0808_cell_id_matches_list; gsm0808_chan_type_to_speech_codec; gsm0808_speech_codec_from_chan_type; gsm0808_sc_cfg_from_gsm48_mr_cfg; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 0b2794f..7f121aa 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -1718,6 +1718,270 @@ (GSM0808_SC_CFG_DEFAULT_AMR_7_95 | GSM0808_SC_CFG_DEFAULT_AMR_12_2); } +struct test_cell_id_matching_data { + struct gsm0808_cell_id id; + struct gsm0808_cell_id match_id; + bool expect_match; +}; + +const struct gsm0808_cell_id lac_23 = { .id_discr = CELL_IDENT_LAC, .id.lac = 23, }; +const struct gsm0808_cell_id lac_42 = { .id_discr = CELL_IDENT_LAC, .id.lac = 42, }; +const struct gsm0808_cell_id ci_5 = { .id_discr = CELL_IDENT_CI, .id.ci = 5, }; +const struct gsm0808_cell_id ci_6 = { .id_discr = CELL_IDENT_CI, .id.ci = 6, }; +const struct gsm0808_cell_id lac_ci_23_5 = { + .id_discr = CELL_IDENT_LAC_AND_CI, + .id.lac_and_ci = { .lac = 23, .ci = 5, }, + }; +const struct gsm0808_cell_id lac_ci_42_6 = { + .id_discr = CELL_IDENT_LAC_AND_CI, + .id.lac_and_ci = { .lac = 42, .ci = 6, }, + }; +const struct gsm0808_cell_id lai_23_042_23 = { + .id_discr = CELL_IDENT_LAI_AND_LAC, + .id.lai_and_lac = { .plmn = { .mcc = 23, .mnc = 42, .mnc_3_digits = true }, .lac = 23, }, + }; +const struct gsm0808_cell_id lai_23_042_42 = { + .id_discr = CELL_IDENT_LAI_AND_LAC, + .id.lai_and_lac = { .plmn = { .mcc = 23, .mnc = 42, .mnc_3_digits = true }, .lac = 42, }, + }; +const struct gsm0808_cell_id lai_23_99_23 = { + .id_discr = CELL_IDENT_LAI_AND_LAC, + .id.lai_and_lac = { .plmn = { .mcc = 23, .mnc = 99, .mnc_3_digits = false }, .lac = 23, }, + }; +const struct gsm0808_cell_id lai_23_42_23 = { + .id_discr = CELL_IDENT_LAI_AND_LAC, + .id.lai_and_lac = { .plmn = { .mcc = 23, .mnc = 42, .mnc_3_digits = false }, .lac = 23, }, + }; +const struct gsm0808_cell_id cgi_23_042_23_5 = { + .id_discr = CELL_IDENT_WHOLE_GLOBAL, + .id.global = { + .lai = { .plmn = { .mcc = 23, .mnc = 42, .mnc_3_digits = true }, .lac = 23, }, + .cell_identity = 5, + }, + }; +const struct gsm0808_cell_id cgi_23_042_42_6 = { + .id_discr = CELL_IDENT_WHOLE_GLOBAL, + .id.global = { + .lai = { .plmn = { .mcc = 23, .mnc = 42, .mnc_3_digits = true }, .lac = 42, }, + .cell_identity = 6, + }, + }; +const struct gsm0808_cell_id cgi_23_99_23_5 = { + .id_discr = CELL_IDENT_WHOLE_GLOBAL, + .id.global = { + .lai = { .plmn = { .mcc = 23, .mnc = 99, .mnc_3_digits = false }, .lac = 23, }, + .cell_identity = 5, + }, + }; + + +const struct test_cell_id_matching_data test_cell_id_matching_tests[] = { + { .id = lac_23, .match_id = lac_23, .expect_match = true }, + { .id = lac_23, .match_id = lac_42, .expect_match = false }, + { .id = lac_23, .match_id = ci_5, .expect_match = true }, + { .id = lac_23, .match_id = ci_6, .expect_match = true }, + { .id = lac_23, .match_id = lac_ci_23_5, .expect_match = true }, + { .id = lac_23, .match_id = lac_ci_42_6, .expect_match = false }, + { .id = lac_23, .match_id = lai_23_042_23, .expect_match = true }, + { .id = lac_23, .match_id = lai_23_042_42, .expect_match = false }, + { .id = lac_23, .match_id = lai_23_99_23, .expect_match = true }, + { .id = lac_23, .match_id = lai_23_42_23, .expect_match = true }, + { .id = lac_23, .match_id = cgi_23_042_23_5, .expect_match = true }, + { .id = lac_23, .match_id = cgi_23_042_42_6, .expect_match = false }, + { .id = lac_23, .match_id = cgi_23_99_23_5, .expect_match = true }, + { .id = ci_5, .match_id = lac_23, .expect_match = true }, + { .id = ci_5, .match_id = lac_42, .expect_match = true }, + { .id = ci_5, .match_id = ci_5, .expect_match = true }, + { .id = ci_5, .match_id = ci_6, .expect_match = false }, + { .id = ci_5, .match_id = lac_ci_23_5, .expect_match = true }, + { .id = ci_5, .match_id = lac_ci_42_6, .expect_match = false }, + { .id = ci_5, .match_id = lai_23_042_23, .expect_match = true }, + { .id = ci_5, .match_id = lai_23_042_42, .expect_match = true }, + { .id = ci_5, .match_id = lai_23_99_23, .expect_match = true }, + { .id = ci_5, .match_id = lai_23_42_23, .expect_match = true }, + { .id = ci_5, .match_id = cgi_23_042_23_5, .expect_match = true }, + { .id = ci_5, .match_id = cgi_23_042_42_6, .expect_match = false }, + { .id = ci_5, .match_id = cgi_23_99_23_5, .expect_match = true }, + { .id = lac_ci_23_5, .match_id = lac_23, .expect_match = true }, + { .id = lac_ci_23_5, .match_id = lac_42, .expect_match = false }, + { .id = lac_ci_23_5, .match_id = ci_5, .expect_match = true }, + { .id = lac_ci_23_5, .match_id = ci_6, .expect_match = false }, + { .id = lac_ci_23_5, .match_id = lac_ci_23_5, .expect_match = true }, + { .id = lac_ci_23_5, .match_id = lac_ci_42_6, .expect_match = false }, + { .id = lac_ci_23_5, .match_id = lai_23_042_23, .expect_match = true }, + { .id = lac_ci_23_5, .match_id = lai_23_042_42, .expect_match = false }, + { .id = lac_ci_23_5, .match_id = lai_23_99_23, .expect_match = true }, + { .id = lac_ci_23_5, .match_id = lai_23_42_23, .expect_match = true }, + { .id = lac_ci_23_5, .match_id = cgi_23_042_23_5, .expect_match = true }, + { .id = lac_ci_23_5, .match_id = cgi_23_042_42_6, .expect_match = false }, + { .id = lac_ci_23_5, .match_id = cgi_23_99_23_5, .expect_match = true }, + { .id = lai_23_042_23, .match_id = lac_23, .expect_match = true }, + { .id = lai_23_042_23, .match_id = lac_42, .expect_match = false }, + { .id = lai_23_042_23, .match_id = ci_5, .expect_match = true }, + { .id = lai_23_042_23, .match_id = ci_6, .expect_match = true }, + { .id = lai_23_042_23, .match_id = lac_ci_23_5, .expect_match = true }, + { .id = lai_23_042_23, .match_id = lac_ci_42_6, .expect_match = false }, + { .id = lai_23_042_23, .match_id = lai_23_042_23, .expect_match = true }, + { .id = lai_23_042_23, .match_id = lai_23_042_42, .expect_match = false }, + { .id = lai_23_042_23, .match_id = lai_23_99_23, .expect_match = false }, + { .id = lai_23_042_23, .match_id = lai_23_42_23, .expect_match = false }, + { .id = lai_23_042_23, .match_id = cgi_23_042_23_5, .expect_match = true }, + { .id = lai_23_042_23, .match_id = cgi_23_042_42_6, .expect_match = false }, + { .id = lai_23_042_23, .match_id = cgi_23_99_23_5, .expect_match = false }, + { .id = cgi_23_042_23_5, .match_id = lac_23, .expect_match = true }, + { .id = cgi_23_042_23_5, .match_id = lac_42, .expect_match = false }, + { .id = cgi_23_042_23_5, .match_id = ci_5, .expect_match = true }, + { .id = cgi_23_042_23_5, .match_id = ci_6, .expect_match = false }, + { .id = cgi_23_042_23_5, .match_id = lac_ci_23_5, .expect_match = true }, + { .id = cgi_23_042_23_5, .match_id = lac_ci_42_6, .expect_match = false }, + { .id = cgi_23_042_23_5, .match_id = lai_23_042_23, .expect_match = true }, + { .id = cgi_23_042_23_5, .match_id = lai_23_042_42, .expect_match = false }, + { .id = cgi_23_042_23_5, .match_id = lai_23_99_23, .expect_match = false }, + { .id = cgi_23_042_23_5, .match_id = lai_23_42_23, .expect_match = false }, + { .id = cgi_23_042_23_5, .match_id = cgi_23_042_23_5, .expect_match = true }, + { .id = cgi_23_042_23_5, .match_id = cgi_23_042_42_6, .expect_match = false }, + { .id = cgi_23_042_23_5, .match_id = cgi_23_99_23_5, .expect_match = false }, +}; + + +static void test_cell_id_matching() +{ + int i; + bool ok = true; + printf("\n%s\n", __func__); + + for (i = 0; i < ARRAY_SIZE(test_cell_id_matching_tests); i++) { + const struct test_cell_id_matching_data *d = &test_cell_id_matching_tests[i]; + bool result; + + result = gsm0808_cell_ids_match(&d->id, &d->match_id); + + printf("[%d] %s %s %s\n", + i, + gsm0808_cell_id_name(&d->id), + gsm0808_cell_id_name2(&d->match_id), + result ? "MATCH" : "don't match"); + if (result != d->expect_match) { + printf(" ERROR: expected %s\n", d->expect_match ? "MATCH" : "no match"); + ok = false; + } + } + + OSMO_ASSERT(ok); +} + +static bool test_cell_id_list_matching_discrs(bool test_match, + enum CELL_IDENT id_discr, + enum CELL_IDENT list_discr) +{ + int i, j; + const struct gsm0808_cell_id *id = NULL; + struct gsm0808_cell_id_list2 list = {}; + int match_idx = -1; + int result; + + for (i = 0; i < ARRAY_SIZE(test_cell_id_matching_tests); i++) { + const struct test_cell_id_matching_data *d = &test_cell_id_matching_tests[i]; + if (id_discr != d->id.id_discr) + continue; + id = &d->id; + break; + } + + if (!id) { + printf("Did not find any entry for %s\n", gsm0808_cell_id_discr_name(id_discr)); + return true; + } + + /* Collect those entries with exactly this id on the left, of type list_discr on the right. + * Collect the mismatches first, for more interesting match indexes in the results. */ + for (j = 0; j < 2; j++) { + bool collect_matches = (bool)j; + + /* If we want to have a mismatching list, don't add any entries that match. */ + if (!test_match && collect_matches) + continue; + + for (i = 0; i < ARRAY_SIZE(test_cell_id_matching_tests); i++) { + const struct test_cell_id_matching_data *d = &test_cell_id_matching_tests[i]; + struct gsm0808_cell_id_list2 add; + + /* Ignore those with a different d->id */ + if (d->id.id_discr != id->id_discr + || !gsm0808_cell_ids_match(&d->id, id)) + continue; + + /* Ignore those with a different d->match_id discr */ + if (d->match_id.id_discr != list_discr) + continue; + + if (collect_matches != d->expect_match) + continue; + + if (match_idx < 0 && d->expect_match) { + match_idx = list.id_list_len; + } + + gsm0808_cell_id_to_list(&add, &d->match_id); + gsm0808_cell_id_list_add(&list, &add); + } + } + + if (!list.id_list_len) { + printf("%s vs. %s: No match_id entries to test %s\n", + gsm0808_cell_id_name(id), + gsm0808_cell_id_discr_name(list_discr), + test_match ? "MATCH" : "mismatch"); + return true; + } + + result = gsm0808_cell_id_matches_list(id, &list, 0); + + printf("%s and %s: ", + gsm0808_cell_id_name(id), + gsm0808_cell_id_list_name(&list)); + if (result >= 0) + printf("MATCH at [%d]\n", result); + else + printf("mismatch\n"); + + if (test_match + && (result < 0 || result != match_idx)) { + printf(" ERROR: expected MATCH at %d\n", match_idx); + return false; + } + + if (!test_match && result >= 0) { + printf(" ERROR: expected mismatch\n"); + return false; + } + + return true; +} + +static void test_cell_id_list_matching(bool test_match) +{ + int i, j; + bool ok = true; + + const enum CELL_IDENT discrs[] = { + CELL_IDENT_LAC, CELL_IDENT_CI, CELL_IDENT_LAC_AND_CI, CELL_IDENT_LAI_AND_LAC, + CELL_IDENT_WHOLE_GLOBAL, + }; + + printf("\n%s(%s)\n", __func__, test_match ? "test match" : "test mismatch"); + + /* Autogenerate Cell ID lists from above dataset, which should match / not match. */ + for (i = 0; i < ARRAY_SIZE(discrs); i++) { + for (j = 0; j < ARRAY_SIZE(discrs); j++) + if (!test_cell_id_list_matching_discrs(test_match, + discrs[i], discrs[j])) + ok = false; + } + + OSMO_ASSERT(ok); +} + int main(int argc, char **argv) { printf("Testing generation of GSM0808 messages\n"); @@ -1773,6 +2037,10 @@ test_gsm0808_sc_cfg_from_gsm48_mr_cfg(); test_gsm48_mr_cfg_from_gsm0808_sc_cfg(); + test_cell_id_matching(); + test_cell_id_list_matching(true); + test_cell_id_list_matching(false); + printf("Done\n"); return EXIT_SUCCESS; } diff --git a/tests/gsm0808/gsm0808_test.ok b/tests/gsm0808/gsm0808_test.ok index 58bc509..9ee54df 100644 --- a/tests/gsm0808/gsm0808_test.ok +++ b/tests/gsm0808/gsm0808_test.ok @@ -432,4 +432,125 @@ m10_2= 0 m12_2= 1 + +test_cell_id_matching +[0] LAC:23 LAC:23 MATCH +[1] LAC:23 LAC:42 don't match +[2] LAC:23 CI:5 MATCH +[3] LAC:23 CI:6 MATCH +[4] LAC:23 LAC-CI:23-5 MATCH +[5] LAC:23 LAC-CI:42-6 don't match +[6] LAC:23 LAI:023-042-23 MATCH +[7] LAC:23 LAI:023-042-42 don't match +[8] LAC:23 LAI:023-99-23 MATCH +[9] LAC:23 LAI:023-42-23 MATCH +[10] LAC:23 CGI:023-042-23-5 MATCH +[11] LAC:23 CGI:023-042-42-6 don't match +[12] LAC:23 CGI:023-99-23-5 MATCH +[13] CI:5 LAC:23 MATCH +[14] CI:5 LAC:42 MATCH +[15] CI:5 CI:5 MATCH +[16] CI:5 CI:6 don't match +[17] CI:5 LAC-CI:23-5 MATCH +[18] CI:5 LAC-CI:42-6 don't match +[19] CI:5 LAI:023-042-23 MATCH +[20] CI:5 LAI:023-042-42 MATCH +[21] CI:5 LAI:023-99-23 MATCH +[22] CI:5 LAI:023-42-23 MATCH +[23] CI:5 CGI:023-042-23-5 MATCH +[24] CI:5 CGI:023-042-42-6 don't match +[25] CI:5 CGI:023-99-23-5 MATCH +[26] LAC-CI:23-5 LAC:23 MATCH +[27] LAC-CI:23-5 LAC:42 don't match +[28] LAC-CI:23-5 CI:5 MATCH +[29] LAC-CI:23-5 CI:6 don't match +[30] LAC-CI:23-5 LAC-CI:23-5 MATCH +[31] LAC-CI:23-5 LAC-CI:42-6 don't match +[32] LAC-CI:23-5 LAI:023-042-23 MATCH +[33] LAC-CI:23-5 LAI:023-042-42 don't match +[34] LAC-CI:23-5 LAI:023-99-23 MATCH +[35] LAC-CI:23-5 LAI:023-42-23 MATCH +[36] LAC-CI:23-5 CGI:023-042-23-5 MATCH +[37] LAC-CI:23-5 CGI:023-042-42-6 don't match +[38] LAC-CI:23-5 CGI:023-99-23-5 MATCH +[39] LAI:023-042-23 LAC:23 MATCH +[40] LAI:023-042-23 LAC:42 don't match +[41] LAI:023-042-23 CI:5 MATCH +[42] LAI:023-042-23 CI:6 MATCH +[43] LAI:023-042-23 LAC-CI:23-5 MATCH +[44] LAI:023-042-23 LAC-CI:42-6 don't match +[45] LAI:023-042-23 LAI:023-042-23 MATCH +[46] LAI:023-042-23 LAI:023-042-42 don't match +[47] LAI:023-042-23 LAI:023-99-23 don't match +[48] LAI:023-042-23 LAI:023-42-23 don't match +[49] LAI:023-042-23 CGI:023-042-23-5 MATCH +[50] LAI:023-042-23 CGI:023-042-42-6 don't match +[51] LAI:023-042-23 CGI:023-99-23-5 don't match +[52] CGI:023-042-23-5 LAC:23 MATCH +[53] CGI:023-042-23-5 LAC:42 don't match +[54] CGI:023-042-23-5 CI:5 MATCH +[55] CGI:023-042-23-5 CI:6 don't match +[56] CGI:023-042-23-5 LAC-CI:23-5 MATCH +[57] CGI:023-042-23-5 LAC-CI:42-6 don't match +[58] CGI:023-042-23-5 LAI:023-042-23 MATCH +[59] CGI:023-042-23-5 LAI:023-042-42 don't match +[60] CGI:023-042-23-5 LAI:023-99-23 don't match +[61] CGI:023-042-23-5 LAI:023-42-23 don't match +[62] CGI:023-042-23-5 CGI:023-042-23-5 MATCH +[63] CGI:023-042-23-5 CGI:023-042-42-6 don't match +[64] CGI:023-042-23-5 CGI:023-99-23-5 don't match + +test_cell_id_list_matching(test match) +LAC:23 and LAC[2]:{42, 23}: MATCH at [1] +LAC:23 and CI[2]:{5, 6}: MATCH at [0] +LAC:23 and LAC-CI[2]:{42-6, 23-5}: MATCH at [1] +LAC:23 and LAI[4]:{023-042-42, 023-042-23, 023-99-23, 023-42-23}: MATCH at [1] +LAC:23 and CGI[3]:{023-042-42-6, 023-042-23-5, 023-99-23-5}: MATCH at [1] +CI:5 and LAC[2]:{23, 42}: MATCH at [0] +CI:5 and CI[2]:{6, 5}: MATCH at [1] +CI:5 and LAC-CI[2]:{42-6, 23-5}: MATCH at [1] +CI:5 and LAI[4]:{023-042-23, 023-042-42, 023-99-23, 023-42-23}: MATCH at [0] +CI:5 and CGI[3]:{023-042-42-6, 023-042-23-5, 023-99-23-5}: MATCH at [1] +LAC-CI:23-5 and LAC[2]:{42, 23}: MATCH at [1] +LAC-CI:23-5 and CI[2]:{6, 5}: MATCH at [1] +LAC-CI:23-5 and LAC-CI[2]:{42-6, 23-5}: MATCH at [1] +LAC-CI:23-5 and LAI[4]:{023-042-42, 023-042-23, 023-99-23, 023-42-23}: MATCH at [1] +LAC-CI:23-5 and CGI[3]:{023-042-42-6, 023-042-23-5, 023-99-23-5}: MATCH at [1] +LAI:023-042-23 and LAC[2]:{42, 23}: MATCH at [1] +LAI:023-042-23 and CI[2]:{5, 6}: MATCH at [0] +LAI:023-042-23 and LAC-CI[2]:{42-6, 23-5}: MATCH at [1] +LAI:023-042-23 and LAI[4]:{023-042-42, 023-99-23, 023-42-23, 023-042-23}: MATCH at [3] +LAI:023-042-23 and CGI[3]:{023-042-42-6, 023-99-23-5, 023-042-23-5}: MATCH at [2] +CGI:023-042-23-5 and LAC[2]:{42, 23}: MATCH at [1] +CGI:023-042-23-5 and CI[2]:{6, 5}: MATCH at [1] +CGI:023-042-23-5 and LAC-CI[2]:{42-6, 23-5}: MATCH at [1] +CGI:023-042-23-5 and LAI[4]:{023-042-42, 023-99-23, 023-42-23, 023-042-23}: MATCH at [3] +CGI:023-042-23-5 and CGI[3]:{023-042-42-6, 023-99-23-5, 023-042-23-5}: MATCH at [2] + +test_cell_id_list_matching(test mismatch) +LAC:23 and LAC[1]:{42}: mismatch +LAC:23 vs. CI: No match_id entries to test mismatch +LAC:23 and LAC-CI[1]:{42-6}: mismatch +LAC:23 and LAI[1]:{023-042-42}: mismatch +LAC:23 and CGI[1]:{023-042-42-6}: mismatch +CI:5 vs. LAC: No match_id entries to test mismatch +CI:5 and CI[1]:{6}: mismatch +CI:5 and LAC-CI[1]:{42-6}: mismatch +CI:5 vs. LAI: No match_id entries to test mismatch +CI:5 and CGI[1]:{023-042-42-6}: mismatch +LAC-CI:23-5 and LAC[1]:{42}: mismatch +LAC-CI:23-5 and CI[1]:{6}: mismatch +LAC-CI:23-5 and LAC-CI[1]:{42-6}: mismatch +LAC-CI:23-5 and LAI[1]:{023-042-42}: mismatch +LAC-CI:23-5 and CGI[1]:{023-042-42-6}: mismatch +LAI:023-042-23 and LAC[1]:{42}: mismatch +LAI:023-042-23 vs. CI: No match_id entries to test mismatch +LAI:023-042-23 and LAC-CI[1]:{42-6}: mismatch +LAI:023-042-23 and LAI[3]:{023-042-42, 023-99-23, 023-42-23}: mismatch +LAI:023-042-23 and CGI[2]:{023-042-42-6, 023-99-23-5}: mismatch +CGI:023-042-23-5 and LAC[1]:{42}: mismatch +CGI:023-042-23-5 and CI[1]:{6}: mismatch +CGI:023-042-23-5 and LAC-CI[1]:{42-6}: mismatch +CGI:023-042-23-5 and LAI[3]:{023-042-42, 023-99-23, 023-42-23}: mismatch +CGI:023-042-23-5 and CGI[2]:{023-042-42-6, 023-99-23-5}: mismatch Done -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 17:17:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 29 Oct 2018 17:17:17 +0000 Subject: Change in osmo-bts[master]: {oc2g, sysmo}-mgr-calib: Fix build against gpsd >= 3.18 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11505 Change subject: {oc2g,sysmo}-mgr-calib: Fix build against gpsd >= 3.18 ...................................................................... {oc2g,sysmo}-mgr-calib: Fix build against gpsd >= 3.18 Change-Id: I1f9176432b3a01bd5e8c179dc269e391df2d446f --- M src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c M src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c 2 files changed, 22 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/05/11505/1 diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c index 9616262..104d279 100644 --- a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c +++ b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c @@ -69,6 +69,16 @@ CALIB_SUCCESS, }; +static inline int compat_gps_read(struct gps_data_t *data) +{ +/* API break in gpsd 6bba8b329fc7687b15863d30471d5af402467802 */ +#if GPSD_API_MAJOR_VERSION >= 7 && GPSD_API_MINOR_VERSION >= 0 + return gps_read(data, NULL, 0); +#else + return gps_read(data); +#endif +} + static int oc2gbts_par_get_uptime(void *ctx, int *ret) { char *fpath; @@ -173,7 +183,7 @@ int rc; struct oc2gbts_mgr_instance *mgr = fd->data; - rc = gps_read(&mgr->gps.gpsdata); + rc = compat_gps_read(&mgr->gps.gpsdata); if (rc == -1) { LOGP(DCALIB, LOGL_ERROR, "gpsd vanished during read.\n"); calib_state_reset(mgr, CALIB_FAIL_GPSFIX); diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c index 62509f2..b0b5edd 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c @@ -57,6 +57,16 @@ CALIB_SUCESS, }; +static inline int compat_gps_read(struct gps_data_t *data) +{ +/* API break in gpsd 6bba8b329fc7687b15863d30471d5af402467802 */ +#if GPSD_API_MAJOR_VERSION >= 7 && GPSD_API_MINOR_VERSION >= 0 + return gps_read(data, NULL, 0); +#else + return gps_read(data); +#endif +} + static void calib_loop_run(void *_data) { int rc; @@ -109,8 +119,7 @@ { int rc; struct sysmobts_mgr_instance *mgr = fd->data; - - rc = gps_read(&mgr->calib.gpsdata); + rc = compat_gps_read(&mgr->calib.gpsdata); if (rc == -1) { LOGP(DCALIB, LOGL_ERROR, "gpsd vanished during read.\n"); calib_state_reset(mgr, CALIB_FAIL_GPS); -- To view, visit https://gerrit.osmocom.org/11505 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1f9176432b3a01bd5e8c179dc269e391df2d446f Gerrit-Change-Number: 11505 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 17:21:33 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 29 Oct 2018 17:21:33 +0000 Subject: Change in osmo-iuh[master]: add a VTY command which shows a specific HNB Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11506 Change subject: add a VTY command which shows a specific HNB ...................................................................... add a VTY command which shows a specific HNB Add the 'show hnb NAME' VTY command which displays just one specific HNB, addressed by its identity string. This augments the functionality provided by 'show hnb all'. Change-Id: Iab12aa4ab090b72c472358b84daf6919b30747f6 Related: OS#2774 --- M src/hnbgw_vty.c 1 file changed, 26 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/06/11506/1 diff --git a/src/hnbgw_vty.c b/src/hnbgw_vty.c index 859cd31..1561aed 100644 --- a/src/hnbgw_vty.c +++ b/src/hnbgw_vty.c @@ -200,7 +200,7 @@ vty_out(vty, "UE IMSI \"%s\" context ID %u%s", ue->imsi, ue->context_id, VTY_NEWLINE); } -DEFUN(show_hnb, show_hnb_cmd, "show hnb all", SHOW_STR "Display information about a HNB") +DEFUN(show_hnb, show_hnb_cmd, "show hnb all", SHOW_STR "Display information about all HNB") { struct hnb_context *hnb; unsigned int count = 0; @@ -220,6 +220,30 @@ return CMD_SUCCESS; } +DEFUN(show_one_hnb, show_one_hnb_cmd, "show hnb NAME ", SHOW_STR "Display information about a HNB") +{ + struct hnb_context *hnb; + int found = 0; + const char *name = argv[0]; + + if (llist_empty(&g_hnb_gw->hnb_list)) { + vty_out(vty, "No HNB connected%s", VTY_NEWLINE); + return CMD_SUCCESS; + } + + llist_for_each_entry(hnb, &g_hnb_gw->hnb_list, list) { + if (strcmp(name, hnb->identity_info) != 0) + continue; + vty_dump_hnb_info(vty, hnb); + found = 1; + break; + } + + if (!found) + vty_out(vty, "No HNB found with identity '%s'%s", name, VTY_NEWLINE); + return CMD_SUCCESS; +} + DEFUN(show_ue, show_ue_cmd, "show ue all", SHOW_STR "Display information about a UE") { struct ue_context *ue; @@ -377,6 +401,7 @@ install_element_ve(&show_cnlink_cmd); install_element_ve(&show_hnb_cmd); + install_element_ve(&show_one_hnb_cmd); install_element_ve(&show_ue_cmd); install_element_ve(&show_talloc_cmd); } -- To view, visit https://gerrit.osmocom.org/11506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iab12aa4ab090b72c472358b84daf6919b30747f6 Gerrit-Change-Number: 11506 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 17:33:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 29 Oct 2018 17:33:48 +0000 Subject: Change in libsmpp34[master]: esme.c: mark switch statement fall-thru for coverity Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11507 Change subject: esme.c: mark switch statement fall-thru for coverity ...................................................................... esme.c: mark switch statement fall-thru for coverity Change-Id: I2d8f16242b8ddca855fa387ad93f52adf8bcdeec --- M test_apps/esme.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libsmpp34 refs/changes/07/11507/1 diff --git a/test_apps/esme.c b/test_apps/esme.c index 31ea222..77fb198 100644 --- a/test_apps/esme.c +++ b/test_apps/esme.c @@ -56,6 +56,7 @@ break; default: printf("Error: unrecognized option\n"); + /* fall thru */ case 'h': printf("usage: %s %s\n", argv[0], HELP_FORMAT); return( -1 ); -- To view, visit https://gerrit.osmocom.org/11507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2d8f16242b8ddca855fa387ad93f52adf8bcdeec Gerrit-Change-Number: 11507 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 17:36:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 29 Oct 2018 17:36:32 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf: ec20: Enable voice support Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11508 Change subject: resources.conf: ec20: Enable voice support ...................................................................... resources.conf: ec20: Enable voice support It was tested that it could do MO and MT voicecall just fine as SierraW modems. Change-Id: Ie14c00f9f80e00fdbb52ab82a53b4b5a187d41e7 --- M example/resources.conf.prod M example/resources.conf.rnd 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/08/11508/1 diff --git a/example/resources.conf.prod b/example/resources.conf.prod index 0c8792e..b4ab445 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -137,7 +137,7 @@ ki: '07F35D0A9476646169669401215580E0' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] - features: ['sms', 'ussd', 'gprs', 'sim'] + features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] - label: gobi2k path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.5' diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd index dd9dc8f..61c328e 100644 --- a/example/resources.conf.rnd +++ b/example/resources.conf.rnd @@ -87,7 +87,7 @@ ki: 'BB70807226393CDBAC8DD3439FF54252' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] - features: ['sms', 'ussd', 'gprs', 'sim'] + features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] - label: gobi2k path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.5' -- To view, visit https://gerrit.osmocom.org/11508 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie14c00f9f80e00fdbb52ab82a53b4b5a187d41e7 Gerrit-Change-Number: 11508 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 18:30:22 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 29 Oct 2018 18:30:22 +0000 Subject: Change in libosmo-sccp[master]: skip simple-client default as/asp when saving VTY config Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11509 Change subject: skip simple-client default as/asp when saving VTY config ...................................................................... skip simple-client default as/asp when saving VTY config When saving the current VTY config to a configuration file, do not write out AS/ASP configuration items which are generated as a fallback by osmo_sccp_simple_client_on_ss7_id(). Since the user did not explicitly configure these configuration items they should not be saved to the user's configuration file. Change-Id: Id8a3afc6dee29ae1ee9c862cbe404a61fe979dba Related: OS#3616 --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7_vty.c M src/sccp_user.c 3 files changed, 11 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/09/11509/1 diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 34d5408..414606a 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -298,6 +298,9 @@ /*! Were we dynamically allocated by RKM? */ bool rkm_dyn_allocated; + /*! Were we allocated by "simple client" support? */ + bool simple_client_allocated; + struct { char *name; char *description; @@ -380,6 +383,9 @@ /*! Were we dynamically allocated */ bool dyn_allocated; + /*! Were we allocated by "simple client" support? */ + bool simple_client_allocated; + /*! Pending message for non-blocking IPA read */ struct msgb *pending_msg; diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 7ef58cf..1b7bcb9 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -679,9 +679,8 @@ static void write_one_asp(struct vty *vty, struct osmo_ss7_asp *asp) { - /* skip any dynamically created ASPs (auto-created at connect - * time) */ - if (asp->dyn_allocated) + /* skip any dynamically created ASPs (e.g. auto-created at connect time) */ + if (asp->dyn_allocated || asp->simple_client_allocated) return; vty_out(vty, " asp %s %u %u %s%s", @@ -939,7 +938,7 @@ unsigned int i; /* skip any dynamically allocated AS definitions */ - if (as->rkm_dyn_allocated) + if (as->rkm_dyn_allocated || as->simple_client_allocated) return; vty_out(vty, " as %s %s%s", as->cfg.name, diff --git a/src/sccp_user.c b/src/sccp_user.c index 793e08c..8a98e46 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -409,6 +409,7 @@ goto out_ss7; as_created = true; as->cfg.routing_key.pc = ss7->cfg.primary_pc; + as->simple_client_allocated = true; } LOGP(DLSCCP, LOGL_NOTICE, "%s: Using AS instance %s\n", name, as->cfg.name); @@ -457,6 +458,7 @@ asp->cfg.remote.host = talloc_strdup(asp, default_remote_ip); } + asp->simple_client_allocated = true; } else talloc_free(asp_name); -- To view, visit https://gerrit.osmocom.org/11509 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id8a3afc6dee29ae1ee9c862cbe404a61fe979dba Gerrit-Change-Number: 11509 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 18:59:07 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 29 Oct 2018 18:59:07 +0000 Subject: Change in osmo-bsc[master]: abis_rsl.c: fix uninitialized RSL cause issues Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11510 Change subject: abis_rsl.c: fix uninitialized RSL cause issues ...................................................................... abis_rsl.c: fix uninitialized RSL cause issues Separate the cause value passed to further functions from the log string. The code tried to be nice by composing the RSL cause string and returning the RSL cause at the same time, which falls on its face when the string composition happens only within conditional logging. Change-Id: Ibadd06102f162bca9182c39b77b0651568d3e6f8 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 18 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/10/11510/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 589d673..b86780d 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -172,21 +172,22 @@ return lchan->encr.key_len + 1; } -/* If the TLV contain an RSL Cause IE, return the RSL cause name and point *rsl_cause_pp at the cause - * value. If there is no Cause IE, return NULL and write NULL to *rsl_cause_pp. If NULL is passed as - * rsl_cause_pp, ignore it. Implementation choice: presence of a Cause IE cannot be indicated by a zero - * cause, because that would mean RSL_ERR_RADIO_IF_FAIL; a pointer-to-pointer can return NULL or point to - * a cause value. */ -static const char *rsl_cause_name(struct tlv_parsed *tp, const uint8_t **rsl_cause_pp) +/* If the TLV contain an RSL Cause IE, return pointer to the cause value. If there is no Cause IE, return + * NULL. Implementation choice: presence of a Cause IE cannot be indicated by a zero cause, because that + * would mean RSL_ERR_RADIO_IF_FAIL; a pointer can return NULL or point to a cause value. */ +static const uint8_t *rsl_cause(struct tlv_parsed *tp) +{ + if (TLVP_PRESENT(tp, RSL_IE_CAUSE)) + return (const uint8_t *)TLVP_VAL(tp, RSL_IE_CAUSE); + return NULL; +} + +/* If the TLV contain an RSL Cause IE, return the RSL cause name; otherwise return "". */ +static const char *rsl_cause_name(struct tlv_parsed *tp) { static char buf[128]; - if (rsl_cause_pp) - *rsl_cause_pp = NULL; - if (TLVP_PRESENT(tp, RSL_IE_CAUSE)) { const uint8_t *cause = TLVP_VAL(tp, RSL_IE_CAUSE); - if (rsl_cause_pp) - *rsl_cause_pp = cause; snprintf(buf, sizeof(buf), " (cause=%s [ %s])", rsl_err_name(*cause), osmo_hexdump(cause, TLVP_LEN(tp, RSL_IE_CAUSE))); @@ -871,7 +872,8 @@ } rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh)); - LOG_LCHAN(lchan, LOGL_ERROR, "CHANNEL ACTIVATE NACK%s\n", rsl_cause_name(&tp, &cause_p)); + cause_p = rsl_cause(&tp); + LOG_LCHAN(lchan, LOGL_ERROR, "CHANNEL ACTIVATE NACK%s\n", rsl_cause_name(&tp)); if (msg_for_osmocom_dyn_ts(msg)) osmo_fsm_inst_dispatch(lchan->ts->fi, TS_EV_PDCH_ACT_NACK, (void*)cause_p); @@ -889,8 +891,9 @@ const uint8_t *cause_p; rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh)); + cause_p = rsl_cause(&tp); - LOG_LCHAN(lchan, LOGL_ERROR, "CONNECTION FAIL%s\n", rsl_cause_name(&tp, &cause_p)); + LOG_LCHAN(lchan, LOGL_ERROR, "CONNECTION FAIL%s\n", rsl_cause_name(&tp)); rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL]); @@ -1208,7 +1211,7 @@ rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg)-sizeof(*rslh)); LOGP(DRSL, LOGL_ERROR, "%s ERROR REPORT%s\n", - gsm_trx_name(sign_link->trx), rsl_cause_name(&tp, NULL)); + gsm_trx_name(sign_link->trx), rsl_cause_name(&tp)); return 0; } @@ -1978,7 +1981,7 @@ rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg)-sizeof(*dh)); LOG_LCHAN(msg->lchan, LOGL_NOTICE, "Rx IPACC DLCX IND%s\n", - rsl_cause_name(&tv, NULL)); + rsl_cause_name(&tv)); return 0; } -- To view, visit https://gerrit.osmocom.org/11510 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibadd06102f162bca9182c39b77b0651568d3e6f8 Gerrit-Change-Number: 11510 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 18:59:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 29 Oct 2018 18:59:08 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: fix missing newline for log statement Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11511 Change subject: handover_fsm: fix missing newline for log statement ...................................................................... handover_fsm: fix missing newline for log statement Change-Id: I41c04cfedaae4da69a2bc7d50b1f7fe0e467e0fa --- M src/osmo-bsc/handover_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/11/11511/1 diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 68230e1..a45e33b 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -564,7 +564,7 @@ /* Figure out channel type */ if (match_codec_pref(&mode, &full_rate, &s15_s0, &req->ct, &req->scl, msc, bts)) { LOG_HO(conn, LOGL_DEBUG, - "BTS %u has no matching channel codec (%s, speech codec list len = %u)", + "BTS %u has no matching channel codec (%s, speech codec list len = %u)\n", bts->nr, gsm0808_channel_type_name(&req->ct), req->scl.len); continue; } -- To view, visit https://gerrit.osmocom.org/11511 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I41c04cfedaae4da69a2bc7d50b1f7fe0e467e0fa Gerrit-Change-Number: 11511 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 18:59:09 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 29 Oct 2018 18:59:09 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: fix failure logging of uninitialized chan mode Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11512 Change subject: handover_fsm: fix failure logging of uninitialized chan mode ...................................................................... handover_fsm: fix failure logging of uninitialized chan mode The chan mode is figured out per-BTS, but may remain uninitialized. Rather log info about the channel request, like further above. Change-Id: I07b89b6101879fb7c070c87be9bd38cc05ffa0b1 --- M src/osmo-bsc/handover_fsm.c 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/12/11512/1 diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index a45e33b..0107ef0 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -592,9 +592,8 @@ } if (!ho->new_lchan) { - ho_fail(HO_RESULT_ERROR, "No free/matching lchan found for %s %s %s\n", - req->cell_id_target_name, - gsm48_chan_mode_name(mode), full_rate ? "full-rate" : "half-rate"); + ho_fail(HO_RESULT_ERROR, "No free/matching lchan found for %s %s (speech codec list len = %u)", + req->cell_id_target_name, gsm0808_channel_type_name(&req->ct), req->scl.len); return; } -- To view, visit https://gerrit.osmocom.org/11512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I07b89b6101879fb7c070c87be9bd38cc05ffa0b1 Gerrit-Change-Number: 11512 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 22:56:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 22:56:14 +0000 Subject: Change in osmo-bsc[master]: abis_rsl.c: fix uninitialized RSL cause issues In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11510 ) Change subject: abis_rsl.c: fix uninitialized RSL cause issues ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11510 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibadd06102f162bca9182c39b77b0651568d3e6f8 Gerrit-Change-Number: 11510 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 22:56:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 22:56:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 22:56:17 +0000 Subject: Change in osmo-bsc[master]: abis_rsl.c: fix uninitialized RSL cause issues In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11510 ) Change subject: abis_rsl.c: fix uninitialized RSL cause issues ...................................................................... abis_rsl.c: fix uninitialized RSL cause issues Separate the cause value passed to further functions from the log string. The code tried to be nice by composing the RSL cause string and returning the RSL cause at the same time, which falls on its face when the string composition happens only within conditional logging. Change-Id: Ibadd06102f162bca9182c39b77b0651568d3e6f8 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 18 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 589d673..b86780d 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -172,21 +172,22 @@ return lchan->encr.key_len + 1; } -/* If the TLV contain an RSL Cause IE, return the RSL cause name and point *rsl_cause_pp at the cause - * value. If there is no Cause IE, return NULL and write NULL to *rsl_cause_pp. If NULL is passed as - * rsl_cause_pp, ignore it. Implementation choice: presence of a Cause IE cannot be indicated by a zero - * cause, because that would mean RSL_ERR_RADIO_IF_FAIL; a pointer-to-pointer can return NULL or point to - * a cause value. */ -static const char *rsl_cause_name(struct tlv_parsed *tp, const uint8_t **rsl_cause_pp) +/* If the TLV contain an RSL Cause IE, return pointer to the cause value. If there is no Cause IE, return + * NULL. Implementation choice: presence of a Cause IE cannot be indicated by a zero cause, because that + * would mean RSL_ERR_RADIO_IF_FAIL; a pointer can return NULL or point to a cause value. */ +static const uint8_t *rsl_cause(struct tlv_parsed *tp) +{ + if (TLVP_PRESENT(tp, RSL_IE_CAUSE)) + return (const uint8_t *)TLVP_VAL(tp, RSL_IE_CAUSE); + return NULL; +} + +/* If the TLV contain an RSL Cause IE, return the RSL cause name; otherwise return "". */ +static const char *rsl_cause_name(struct tlv_parsed *tp) { static char buf[128]; - if (rsl_cause_pp) - *rsl_cause_pp = NULL; - if (TLVP_PRESENT(tp, RSL_IE_CAUSE)) { const uint8_t *cause = TLVP_VAL(tp, RSL_IE_CAUSE); - if (rsl_cause_pp) - *rsl_cause_pp = cause; snprintf(buf, sizeof(buf), " (cause=%s [ %s])", rsl_err_name(*cause), osmo_hexdump(cause, TLVP_LEN(tp, RSL_IE_CAUSE))); @@ -871,7 +872,8 @@ } rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh)); - LOG_LCHAN(lchan, LOGL_ERROR, "CHANNEL ACTIVATE NACK%s\n", rsl_cause_name(&tp, &cause_p)); + cause_p = rsl_cause(&tp); + LOG_LCHAN(lchan, LOGL_ERROR, "CHANNEL ACTIVATE NACK%s\n", rsl_cause_name(&tp)); if (msg_for_osmocom_dyn_ts(msg)) osmo_fsm_inst_dispatch(lchan->ts->fi, TS_EV_PDCH_ACT_NACK, (void*)cause_p); @@ -889,8 +891,9 @@ const uint8_t *cause_p; rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh)); + cause_p = rsl_cause(&tp); - LOG_LCHAN(lchan, LOGL_ERROR, "CONNECTION FAIL%s\n", rsl_cause_name(&tp, &cause_p)); + LOG_LCHAN(lchan, LOGL_ERROR, "CONNECTION FAIL%s\n", rsl_cause_name(&tp)); rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL]); @@ -1208,7 +1211,7 @@ rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg)-sizeof(*rslh)); LOGP(DRSL, LOGL_ERROR, "%s ERROR REPORT%s\n", - gsm_trx_name(sign_link->trx), rsl_cause_name(&tp, NULL)); + gsm_trx_name(sign_link->trx), rsl_cause_name(&tp)); return 0; } @@ -1978,7 +1981,7 @@ rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg)-sizeof(*dh)); LOG_LCHAN(msg->lchan, LOGL_NOTICE, "Rx IPACC DLCX IND%s\n", - rsl_cause_name(&tv, NULL)); + rsl_cause_name(&tv)); return 0; } -- To view, visit https://gerrit.osmocom.org/11510 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibadd06102f162bca9182c39b77b0651568d3e6f8 Gerrit-Change-Number: 11510 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 22:56:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 22:56:25 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: fix missing newline for log statement In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11511 ) Change subject: handover_fsm: fix missing newline for log statement ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11511 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I41c04cfedaae4da69a2bc7d50b1f7fe0e467e0fa Gerrit-Change-Number: 11511 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 22:56:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 22:56:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 22:56:42 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: fix failure logging of uninitialized chan mode In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11512 ) Change subject: handover_fsm: fix failure logging of uninitialized chan mode ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I07b89b6101879fb7c070c87be9bd38cc05ffa0b1 Gerrit-Change-Number: 11512 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 22:56:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 22:56:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 22:56:43 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: fix missing newline for log statement In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11511 ) Change subject: handover_fsm: fix missing newline for log statement ...................................................................... handover_fsm: fix missing newline for log statement Change-Id: I41c04cfedaae4da69a2bc7d50b1f7fe0e467e0fa --- M src/osmo-bsc/handover_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 68230e1..a45e33b 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -564,7 +564,7 @@ /* Figure out channel type */ if (match_codec_pref(&mode, &full_rate, &s15_s0, &req->ct, &req->scl, msc, bts)) { LOG_HO(conn, LOGL_DEBUG, - "BTS %u has no matching channel codec (%s, speech codec list len = %u)", + "BTS %u has no matching channel codec (%s, speech codec list len = %u)\n", bts->nr, gsm0808_channel_type_name(&req->ct), req->scl.len); continue; } -- To view, visit https://gerrit.osmocom.org/11511 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I41c04cfedaae4da69a2bc7d50b1f7fe0e467e0fa Gerrit-Change-Number: 11511 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 22:56:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 22:56:43 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: fix failure logging of uninitialized chan mode In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11512 ) Change subject: handover_fsm: fix failure logging of uninitialized chan mode ...................................................................... handover_fsm: fix failure logging of uninitialized chan mode The chan mode is figured out per-BTS, but may remain uninitialized. Rather log info about the channel request, like further above. Change-Id: I07b89b6101879fb7c070c87be9bd38cc05ffa0b1 --- M src/osmo-bsc/handover_fsm.c 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index a45e33b..0107ef0 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -592,9 +592,8 @@ } if (!ho->new_lchan) { - ho_fail(HO_RESULT_ERROR, "No free/matching lchan found for %s %s %s\n", - req->cell_id_target_name, - gsm48_chan_mode_name(mode), full_rate ? "full-rate" : "half-rate"); + ho_fail(HO_RESULT_ERROR, "No free/matching lchan found for %s %s (speech codec list len = %u)", + req->cell_id_target_name, gsm0808_channel_type_name(&req->ct), req->scl.len); return; } -- To view, visit https://gerrit.osmocom.org/11512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I07b89b6101879fb7c070c87be9bd38cc05ffa0b1 Gerrit-Change-Number: 11512 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:06:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:06:48 +0000 Subject: Change in osmo-bsc[master]: vty: add 'show rejected' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11493 ) Change subject: vty: add 'show rejected' ...................................................................... Patch Set 1: Code-Review-1 (4 comments) https://gerrit.osmocom.org/#/c/11493/1/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11493/1/src/osmo-bsc/bsc_vty.c at 544 PS1, Line 544: show rejected I think in terms of naming this needs to be further qualified. "show rejected-bts"? "show rejected-oml"? Many things can be rejected at many different levels, so just "reejcted" is a bit too generic. https://gerrit.osmocom.org/#/c/11493/1/src/osmo-bsc/bts_ipaccess_nanobts.c File src/osmo-bsc/bts_ipaccess_nanobts.c: https://gerrit.osmocom.org/#/c/11493/1/src/osmo-bsc/bts_ipaccess_nanobts.c at 475 PS1, Line 475: 64 I've seen this magic number appearing two times now. I think this warrants a #define, probably next to the osmo_sock_get_remote* which specifies the maximum required buffer size for those kind of buffers. Also, we generally declare all variables at the top of the block, so it should be declared at the line below 'uint16_t trx_id'. https://gerrit.osmocom.org/#/c/11493/1/src/osmo-bsc/bts_ipaccess_nanobts.c at 480 PS1, Line 480: struct gsm_bts_rejected *entry = NULL; : struct gsm_bts_rejected *pos; same for those variables, they should be at the top of the block. Or you split the block into a separate function like "rejected_bts_find(site_id, bts_id, ip)" which then has those variables as local variables in the scope of that function. https://gerrit.osmocom.org/#/c/11493/1/src/osmo-bsc/bts_ipaccess_nanobts.c at 506 PS1, Line 506: llist_for_each_entry(pos, &bsc_gsmnet->bts_rejected, list) { : if (i >= 25) we do have llist_count() to count the number of entries. So you culd do something like for (i = llist_count(); i > 25; i--) { } -- To view, visit https://gerrit.osmocom.org/11493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iba3bfe8fc9432b7ae8f819df8bd71b35b3ec507e Gerrit-Change-Number: 11493 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 23:06:48 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:07:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:07:30 +0000 Subject: Change in osmo-mgw[master]: show RTP TX/RX stats in 'mgcp show stats' output In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11494 ) Change subject: show RTP TX/RX stats in 'mgcp show stats' output ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1313e64d7d8b49964f21fc8d213cba6c9fb6c7cf Gerrit-Change-Number: 11494 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 23:07:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:07:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:07:32 +0000 Subject: Change in osmo-mgw[master]: show RTP TX/RX stats in 'mgcp show stats' output In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11494 ) Change subject: show RTP TX/RX stats in 'mgcp show stats' output ...................................................................... show RTP TX/RX stats in 'mgcp show stats' output Make the 'mgcp show stats' VTY command display TX/RX counters for an RTP stream. This command was already showing the counter for dropped packets from the same counter group, so it seems natural to display other relevant counters in the group as well. Change-Id: I1313e64d7d8b49964f21fc8d213cba6c9fb6c7cf Related: OS#2660 --- M src/libosmo-mgcp/mgcp_vty.c 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index fdcca91..5643180 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -162,11 +162,19 @@ struct mgcp_rtp_state *state = &conn->state; struct mgcp_rtp_end *end = &conn->end; struct mgcp_rtp_codec *codec = end->codec; + struct rate_ctr *tx_packets, *tx_bytes; + struct rate_ctr *rx_packets, *rx_bytes; struct rate_ctr *dropped_packets; + tx_packets = &conn->rate_ctr_group->ctr[RTP_PACKETS_TX_CTR]; + tx_bytes = &conn->rate_ctr_group->ctr[RTP_OCTETS_TX_CTR]; + rx_packets = &conn->rate_ctr_group->ctr[RTP_PACKETS_RX_CTR]; + rx_bytes = &conn->rate_ctr_group->ctr[RTP_OCTETS_RX_CTR]; dropped_packets = &conn->rate_ctr_group->ctr[RTP_DROPPED_PACKETS_CTR]; vty_out(vty, + " Packets Sent: %" PRIu64 " (%" PRIu64 " bytes total)%s" + " Packets Received: %" PRIu64 " (%" PRIu64 " bytes total)%s" " Timestamp Errs: %" PRIu64 "->%" PRIu64 "%s" " Dropped Packets: %" PRIu64 "%s" " Payload Type: %d Rate: %u Channels: %d %s" @@ -174,6 +182,8 @@ " FPP: %d Packet Duration: %u%s" " FMTP-Extra: %s Audio-Name: %s Sub-Type: %s%s" " Output-Enabled: %d Force-PTIME: %d%s", + tx_packets->current, tx_bytes->current, VTY_NEWLINE, + rx_packets->current, rx_bytes->current, VTY_NEWLINE, state->in_stream.err_ts_ctr->current, state->out_stream.err_ts_ctr->current, VTY_NEWLINE, -- To view, visit https://gerrit.osmocom.org/11494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1313e64d7d8b49964f21fc8d213cba6c9fb6c7cf Gerrit-Change-Number: 11494 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:07:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:07:55 +0000 Subject: Change in osmo-mgw[master]: use local variable for rate counters in handle_create_con() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11495 ) Change subject: use local variable for rate counters in handle_create_con() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11495 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If4f097c5e441914eaa24c7657813ebb3f9a49916 Gerrit-Change-Number: 11495 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 23:07:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:08:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:08:09 +0000 Subject: Change in osmo-mgw[master]: add more mgcp crxc error counters In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11496 ) Change subject: add more mgcp crxc error counters ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia2004f8063f3a50b5d7a838ebe8a784a47fcc50d Gerrit-Change-Number: 11496 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 23:08:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:08:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:08:36 +0000 Subject: Change in osmo-mgw[master]: add MDCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11499 ) Change subject: add MDCX command statistics to osmo-mgw ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11499 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I79c27425ba40c3a85edc6cd846cba325d847298c Gerrit-Change-Number: 11499 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 23:08:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:08:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:08:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Use f_gen_test_hdlr_pars() to be aware of AoIP/sccplite In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11500 ) Change subject: bsc: Use f_gen_test_hdlr_pars() to be aware of AoIP/sccplite ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11500 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic164827d63c9f5452888951bba4c197c3fe6f57b Gerrit-Change-Number: 11500 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 23:08:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:09:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:09:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Use Misc_Helpers.f_shutdown for setverdict(fail) In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11501 ) Change subject: bsc: Use Misc_Helpers.f_shutdown for setverdict(fail) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9b71f7f7bd70d2da21fbad60c340d5bf8b3b9536 Gerrit-Change-Number: 11501 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 23:09:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:09:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:09:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Use f_gen_test_hdlr_pars() to be aware of AoIP/sccplite In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11500 ) Change subject: bsc: Use f_gen_test_hdlr_pars() to be aware of AoIP/sccplite ...................................................................... bsc: Use f_gen_test_hdlr_pars() to be aware of AoIP/sccplite Some TC_no_out_fail_* testcases still used valueof() to get g_pars which always set aoip to true. Use f_gen_test_hdlr_pars() now so these tests can properly detect if they are run with sccplite of aoip and can adjust their expectations accordingly. Change-Id: Ic164827d63c9f5452888951bba4c197c3fe6f57b --- M bsc/BSC_Tests.ttcn 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index fef5fd7..ae855bd 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2277,7 +2277,7 @@ /* BSC asks for inter-BSC HO, but the MSC decides that it won't happen and * simply never sends a BSSMAP Handover Command. */ private function f_tc_ho_out_fail_no_msc_response(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); var PDU_BSSAP ass_req := f_gen_ass_req(); ass_req.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); @@ -2323,7 +2323,7 @@ /* BSC asks for inter-BSC HO, receives BSSMAP Handover Command, but MS reports * RR Handover Failure. */ private function f_tc_ho_out_fail_rr_ho_failure(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); var PDU_BSSAP ass_req := f_gen_ass_req(); ass_req.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); @@ -2406,7 +2406,7 @@ /* BSC asks for inter-BSC HO, receives BSSMAP Handover Command, but MS reports * RR Handover Failure. */ private function f_tc_ho_out_fail_no_ho_detect(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); + g_pars := f_gen_test_hdlr_pars(); var PDU_BSSAP ass_req := f_gen_ass_req(); ass_req.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); -- To view, visit https://gerrit.osmocom.org/11500 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic164827d63c9f5452888951bba4c197c3fe6f57b Gerrit-Change-Number: 11500 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:09:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:09:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Use Misc_Helpers.f_shutdown for setverdict(fail) In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11501 ) Change subject: bsc: Use Misc_Helpers.f_shutdown for setverdict(fail) ...................................................................... bsc: Use Misc_Helpers.f_shutdown for setverdict(fail) Unfortunately all component.stop can not be called from the non-mtc component. f_shutdown is a wrapper that will try to shutdown a test in the best way calling all component.stop if it is called from the mtc and just stopping the mtc if called from any other component. Change-Id: I9b71f7f7bd70d2da21fbad60c340d5bf8b3b9536 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 30 insertions(+), 48 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index dfdf10c..546fa2d 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -1,5 +1,6 @@ module MSC_ConnectionHandler { +import from Misc_Helpers all; import from General_Types all; import from Osmocom_Types all; import from GSM_Types all; @@ -146,8 +147,9 @@ return i; } } - setverdict(fail, "Only 2 Connections per EP!"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Only 2 Connections per EP!"); + /* Should never be reached */ + return -1; } /* Helper function to pick a specific connection by its cid. Since we reach out @@ -159,8 +161,9 @@ return i; } } - setverdict(fail, "No Connection for ID ", cid); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("No Connection for ID ", cid)); + /* Should not be reached */ + return -1; } /* altstep for handling of IPACC media related commands. Activated by as_Media() to test @@ -188,8 +191,7 @@ /* Extract conn_id, ip, port, rtp_pt2 from request + use in response */ b_unused := f_rsl_find_ie(rsl, RSL_IE_IPAC_CONN_ID, ie); if (g_media.bts.conn_id != ie.ipa_conn_id) { - setverdict(fail, "IPA MDCX for unknown ConnId", rsl); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("IPA MDCX for unknown ConnId", rsl)); } /* mandatory */ b_unused := f_rsl_find_ie(rsl, RSL_IE_IPAC_REMOTE_IP, ie); @@ -232,8 +234,7 @@ /* Extract conn_id, ip, port, rtp_pt2 from request + use in response */ b_unused := f_rsl_find_ie(rsl, RSL_IE_IPAC_CONN_ID, ie); if (g_media.bts1.conn_id != ie.ipa_conn_id) { - setverdict(fail, "IPA MDCX for unknown ConnId", rsl); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("IPA MDCX for unknown ConnId", rsl)); } /* mandatory */ b_unused := f_rsl_find_ie(rsl, RSL_IE_IPAC_REMOTE_IP, ie); @@ -268,8 +269,7 @@ var integer cid := f_get_free_mgcp_conn(); if (match(mgcp_cmd.line.ep, t_MGCP_EP_wildcard)) { if (cid != 0) { - setverdict(fail, "MGCP wildcard EP only works in first CRCX"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "MGCP wildcard EP only works in first CRCX"); } /* we keep the endpoint name allocated during MediaState_init */ } else { @@ -305,7 +305,7 @@ g_media.mgcp_conn[cid].peer.host := sdp.connection.conn_addr.addr; g_media.mgcp_conn[cid].peer.port_nr := sdp.media_list[0].media_field.ports.port_number; } else { - setverdict(fail, "MDCX has no [recognizable] SDP"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "MDCX has no [recognizable] SDP"); } var MgcpConnState mgcp_conn := g_media.mgcp_conn[cid]; sdp := valueof(ts_SDP(mgcp_conn.peer.host, mgcp_conn.peer.host, "foo", "21", @@ -519,7 +519,7 @@ else if (alg_bssmap == '80'O) { return RSL_ALG_ID_A5_7; } else { - setverdict(fail, "Unexpected Encryption Algorithm"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected Encryption Algorithm"); return RSL_ALG_ID_A5_0; } } @@ -553,14 +553,14 @@ [] BSSAP.receive(tr_BSSMAP_CipherModeCompl) -> value bssap { // bssap.bssmap.cipherModeComplete.chosenEncryptionAlgorithm.algoritmhIdentifier if (exp_fail == true) { - setverdict(fail, "Unexpected Cipher Mode Complete"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected Cipher Mode Complete"); } else { setverdict(pass); } } [] BSSAP.receive(tr_BSSMAP_CipherModeRej) -> value bssap { if (exp_fail == false) { - setverdict(fail, "Ciphering Mode Reject"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Ciphering Mode Reject"); } else { setverdict(pass); } @@ -586,13 +586,11 @@ chan_nr := valueof(t_RslChanNr_SDCCH8(tn, bit2int(substr(inp, 2, 3)))); } else { - setverdict(fail, "Unknown ChDesc!"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unknown ChDesc!"); } if (ch_desc.octet3 and4b '10'O == '10'O) { - setverdict(fail, "No support for Hopping"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "No support for Hopping"); } else { var OCT2 concat := ch_desc.octet3 & ch_desc.octet4; arfcn := oct2int(concat); @@ -635,17 +633,17 @@ var RSL_IE_Body encr_info; if (ispresent(g_pars.encr) and g_pars.encr.enc_alg != '01'O) { if (not f_rsl_find_ie(chan_act, RSL_IE_ENCR_INFO, encr_info)) { - setverdict(fail, "Missing Encryption IE in CHAN ACT"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Missing Encryption IE in CHAN ACT"); } else { var RSL_AlgId alg := f_chipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg); if (not match(encr_info, tr_EncrInfo(alg, g_pars.encr.enc_key))) { - setverdict(fail, "Wrong Encryption IE in CHAN ACT"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Wrong Encryption IE in CHAN ACT"); } } } else { if (f_rsl_find_ie(chan_act, RSL_IE_ENCR_INFO, encr_info)) { if (encr_info.encr_info.alg_id != RSL_ALG_ID_A5_0) { - setverdict(fail, "Unexpected Encryption in CHAN ACT"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected Encryption in CHAN ACT"); } } } @@ -681,8 +679,7 @@ f_check_chan_act(st, chan_act); repeat; } else { - setverdict(fail, "Unexpected L3 received", l3); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected L3 received", l3)); } } [st.rr_ass_cmpl_seen] RSL.receive(tr_RSL_REL_REQ(st.old_chan_nr, tr_RslLinkID_DCCH(0))) { @@ -820,10 +817,10 @@ ", mdcx_seen=", g_media.mgcp_conn[i].mdcx_seen, ", mdcx_seen_exp=", g_media.mgcp_conn[i].mdcx_seen_exp); if(g_media.mgcp_conn[i].crcx_seen != g_media.mgcp_conn[i].crcx_seen_exp) { - setverdict(fail, "unexpected number of MGW-CRCX transactions"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "unexpected number of MGW-CRCX transactions"); } if(g_media.mgcp_conn[i].mdcx_seen != g_media.mgcp_conn[i].mdcx_seen_exp) { - setverdict(fail, "unexpected number of MGW-MDCX transactions"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "unexpected number of MGW-MDCX transactions"); } } } @@ -862,14 +859,10 @@ alt { [] BSSAP.receive(exp_l3_compl); [] BSSAP.receive(tr_BSSMAP_ComplL3) { - setverdict(fail, "Received non-matching COMPLETE LAYER 3 INFORMATION"); - all component.stop; - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Received non-matching COMPLETE LAYER 3 INFORMATION"); } [] T.timeout { - setverdict(fail, "Timeout waiting for COMPLETE LAYER 3 INFORMATION"); - all component.stop; - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for COMPLETE LAYER 3 INFORMATION"); } } @@ -965,29 +958,19 @@ [(st.is_assignment and st.assignment_done or (not st.is_assignment and (st.modify_done or not exp_modify))) and exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentComplete) { - setverdict(fail, "Received non-matching ASSIGNMENT COMPLETE"); - all component.stop; - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Received non-matching ASSIGNMENT COMPLETE"); } [exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentFail) { - setverdict(fail, "Received unexpected ASSIGNMENT FAIL"); - all component.stop; - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Received unexpected ASSIGNMENT FAIL"); } [not exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentComplete) { - setverdict(fail, "Received unexpected ASSIGNMENT COMPLETE"); - all component.stop; - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Received unexpected ASSIGNMENT COMPLETE"); } [not exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentFail) { - setverdict(fail, "Received non-matching ASSIGNMENT FAIL"); - all component.stop; - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Received non-matching ASSIGNMENT FAIL"); } [] T.timeout { - setverdict(fail, "Timeout waiting for ASSIGNMENT COMPLETE"); - all component.stop; - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for ASSIGNMENT COMPLETE"); } } log("g_media ", g_media); @@ -1055,8 +1038,7 @@ st.mdcx_seen_before_ho := g_media.mgcp_conn[0].mdcx_seen; repeat; } else { - setverdict(fail, "Unexpected L3 received", l3); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected L3 received", l3)); } } [st.rr_ho_cmpl_seen] as_Media_ipacc(); -- To view, visit https://gerrit.osmocom.org/11501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9b71f7f7bd70d2da21fbad60c340d5bf8b3b9536 Gerrit-Change-Number: 11501 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:09:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:09:48 +0000 Subject: Change in libosmocore[master]: make 'show rate-counters' show group index In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11503 ) Change subject: make 'show rate-counters' show group index ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11503 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieb151239407e4b2f8859fefec8d0670f5ddf908a Gerrit-Change-Number: 11503 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 23:09:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:09:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:09:49 +0000 Subject: Change in libosmocore[master]: make 'show rate-counters' show group index In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11503 ) Change subject: make 'show rate-counters' show group index ...................................................................... make 'show rate-counters' show group index Show each rate counter group's index in the output of the 'show rate-counters' command, to provide some way of telling apart distinct instances of the same rate counter group. This is not a very user-friendly UI because these indices are generated internally by libosmocore and/or applications, so users cannot easily assign meaning to these indices. However, the current rate counter implementation doesn't allow for more. Change-Id: Ieb151239407e4b2f8859fefec8d0670f5ddf908a Related: OS#3674 --- M src/vty/stats_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c index 62153f3..c911087 100644 --- a/src/vty/stats_vty.c +++ b/src/vty/stats_vty.c @@ -533,7 +533,7 @@ static int rate_ctr_group_handler(struct rate_ctr_group *ctrg, void *sctx_) { struct vty *vty = sctx_; - vty_out(vty, "%s:%s", ctrg->desc->group_description, VTY_NEWLINE); + vty_out(vty, "%s %u:%s", ctrg->desc->group_description, ctrg->idx, VTY_NEWLINE); vty_out_rate_ctr_group_fmt(vty, "%25n: %10c (%S/s %M/m %H/h %D/d) %d", ctrg); return 0; } -- To view, visit https://gerrit.osmocom.org/11503 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ieb151239407e4b2f8859fefec8d0670f5ddf908a Gerrit-Change-Number: 11503 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:10:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:10:11 +0000 Subject: Change in osmo-bts[master]: {oc2g, sysmo}-mgr-calib: Fix build against gpsd >= 3.18 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11505 ) Change subject: {oc2g,sysmo}-mgr-calib: Fix build against gpsd >= 3.18 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11505 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1f9176432b3a01bd5e8c179dc269e391df2d446f Gerrit-Change-Number: 11505 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 23:10:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:10:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:10:16 +0000 Subject: Change in osmo-bts[master]: {oc2g, sysmo}-mgr-calib: Fix build against gpsd >= 3.18 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11505 ) Change subject: {oc2g,sysmo}-mgr-calib: Fix build against gpsd >= 3.18 ...................................................................... {oc2g,sysmo}-mgr-calib: Fix build against gpsd >= 3.18 Change-Id: I1f9176432b3a01bd5e8c179dc269e391df2d446f --- M src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c M src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c 2 files changed, 22 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c index 9616262..104d279 100644 --- a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c +++ b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c @@ -69,6 +69,16 @@ CALIB_SUCCESS, }; +static inline int compat_gps_read(struct gps_data_t *data) +{ +/* API break in gpsd 6bba8b329fc7687b15863d30471d5af402467802 */ +#if GPSD_API_MAJOR_VERSION >= 7 && GPSD_API_MINOR_VERSION >= 0 + return gps_read(data, NULL, 0); +#else + return gps_read(data); +#endif +} + static int oc2gbts_par_get_uptime(void *ctx, int *ret) { char *fpath; @@ -173,7 +183,7 @@ int rc; struct oc2gbts_mgr_instance *mgr = fd->data; - rc = gps_read(&mgr->gps.gpsdata); + rc = compat_gps_read(&mgr->gps.gpsdata); if (rc == -1) { LOGP(DCALIB, LOGL_ERROR, "gpsd vanished during read.\n"); calib_state_reset(mgr, CALIB_FAIL_GPSFIX); diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c index 62509f2..b0b5edd 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c @@ -57,6 +57,16 @@ CALIB_SUCESS, }; +static inline int compat_gps_read(struct gps_data_t *data) +{ +/* API break in gpsd 6bba8b329fc7687b15863d30471d5af402467802 */ +#if GPSD_API_MAJOR_VERSION >= 7 && GPSD_API_MINOR_VERSION >= 0 + return gps_read(data, NULL, 0); +#else + return gps_read(data); +#endif +} + static void calib_loop_run(void *_data) { int rc; @@ -109,8 +119,7 @@ { int rc; struct sysmobts_mgr_instance *mgr = fd->data; - - rc = gps_read(&mgr->calib.gpsdata); + rc = compat_gps_read(&mgr->calib.gpsdata); if (rc == -1) { LOGP(DCALIB, LOGL_ERROR, "gpsd vanished during read.\n"); calib_state_reset(mgr, CALIB_FAIL_GPS); -- To view, visit https://gerrit.osmocom.org/11505 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1f9176432b3a01bd5e8c179dc269e391df2d446f Gerrit-Change-Number: 11505 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:12:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:12:48 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 23:12:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:12:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:12:59 +0000 Subject: Change in libsmpp34[master]: esme.c: mark switch statement fall-thru for coverity In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11507 ) Change subject: esme.c: mark switch statement fall-thru for coverity ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2d8f16242b8ddca855fa387ad93f52adf8bcdeec Gerrit-Change-Number: 11507 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 23:12:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:13:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:13:00 +0000 Subject: Change in libsmpp34[master]: esme.c: mark switch statement fall-thru for coverity In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11507 ) Change subject: esme.c: mark switch statement fall-thru for coverity ...................................................................... esme.c: mark switch statement fall-thru for coverity Change-Id: I2d8f16242b8ddca855fa387ad93f52adf8bcdeec --- M test_apps/esme.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/test_apps/esme.c b/test_apps/esme.c index 31ea222..77fb198 100644 --- a/test_apps/esme.c +++ b/test_apps/esme.c @@ -56,6 +56,7 @@ break; default: printf("Error: unrecognized option\n"); + /* fall thru */ case 'h': printf("usage: %s %s\n", argv[0], HELP_FORMAT); return( -1 ); -- To view, visit https://gerrit.osmocom.org/11507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2d8f16242b8ddca855fa387ad93f52adf8bcdeec Gerrit-Change-Number: 11507 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:16:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:16:47 +0000 Subject: Change in osmo-iuh[master]: add a VTY command which shows a specific HNB In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11506 ) Change subject: add a VTY command which shows a specific HNB ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11506/1/src/hnbgw_vty.c File src/hnbgw_vty.c: https://gerrit.osmocom.org/#/c/11506/1/src/hnbgw_vty.c at 234 PS1, Line 234: llist_for_each_entry(hnb, &g_hnb_gw->hnb_list, list) { I suggest to add a hnb_context_by_identity_info() function, similar to hnb_context_by_id() which we alraeady have, and then simply use that and dump it. Or is it a common/expected case that there would be multiple hnb with the same identity? My gut feeling says that's somehow wrong... -- To view, visit https://gerrit.osmocom.org/11506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iab12aa4ab090b72c472358b84daf6919b30747f6 Gerrit-Change-Number: 11506 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 29 Oct 2018 23:16:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:18:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:18:04 +0000 Subject: Change in libosmo-sccp[master]: skip simple-client default as/asp when saving VTY config In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11509 ) Change subject: skip simple-client default as/asp when saving VTY config ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11509 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id8a3afc6dee29ae1ee9c862cbe404a61fe979dba Gerrit-Change-Number: 11509 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 23:18:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:18:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:18:07 +0000 Subject: Change in libosmo-sccp[master]: skip simple-client default as/asp when saving VTY config In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11509 ) Change subject: skip simple-client default as/asp when saving VTY config ...................................................................... skip simple-client default as/asp when saving VTY config When saving the current VTY config to a configuration file, do not write out AS/ASP configuration items which are generated as a fallback by osmo_sccp_simple_client_on_ss7_id(). Since the user did not explicitly configure these configuration items they should not be saved to the user's configuration file. Change-Id: Id8a3afc6dee29ae1ee9c862cbe404a61fe979dba Related: OS#3616 --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7_vty.c M src/sccp_user.c 3 files changed, 11 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 34d5408..414606a 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -298,6 +298,9 @@ /*! Were we dynamically allocated by RKM? */ bool rkm_dyn_allocated; + /*! Were we allocated by "simple client" support? */ + bool simple_client_allocated; + struct { char *name; char *description; @@ -380,6 +383,9 @@ /*! Were we dynamically allocated */ bool dyn_allocated; + /*! Were we allocated by "simple client" support? */ + bool simple_client_allocated; + /*! Pending message for non-blocking IPA read */ struct msgb *pending_msg; diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 7ef58cf..1b7bcb9 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -679,9 +679,8 @@ static void write_one_asp(struct vty *vty, struct osmo_ss7_asp *asp) { - /* skip any dynamically created ASPs (auto-created at connect - * time) */ - if (asp->dyn_allocated) + /* skip any dynamically created ASPs (e.g. auto-created at connect time) */ + if (asp->dyn_allocated || asp->simple_client_allocated) return; vty_out(vty, " asp %s %u %u %s%s", @@ -939,7 +938,7 @@ unsigned int i; /* skip any dynamically allocated AS definitions */ - if (as->rkm_dyn_allocated) + if (as->rkm_dyn_allocated || as->simple_client_allocated) return; vty_out(vty, " as %s %s%s", as->cfg.name, diff --git a/src/sccp_user.c b/src/sccp_user.c index 793e08c..8a98e46 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -409,6 +409,7 @@ goto out_ss7; as_created = true; as->cfg.routing_key.pc = ss7->cfg.primary_pc; + as->simple_client_allocated = true; } LOGP(DLSCCP, LOGL_NOTICE, "%s: Using AS instance %s\n", name, as->cfg.name); @@ -457,6 +458,7 @@ asp->cfg.remote.host = talloc_strdup(asp, default_remote_ip); } + asp->simple_client_allocated = true; } else talloc_free(asp_name); -- To view, visit https://gerrit.osmocom.org/11509 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id8a3afc6dee29ae1ee9c862cbe404a61fe979dba Gerrit-Change-Number: 11509 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:18:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:18:16 +0000 Subject: Change in osmo-mgw[master]: use local variable for rate counters in handle_create_con() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11495 ) Change subject: use local variable for rate counters in handle_create_con() ...................................................................... use local variable for rate counters in handle_create_con() Use a local variable to shorten the length of rate counter names. Cosmetic only; no functional change. Change-Id: If4f097c5e441914eaa24c7657813ebb3f9a49916 Related: OS#2660 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 12 insertions(+), 12 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index bc35e5c..24c8e54 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -726,8 +726,8 @@ { struct mgcp_trunk_config *tcfg = p->endp->tcfg; struct mgcp_endpoint *endp = p->endp; + struct rate_ctr_group *rate_ctrs = tcfg->mgcp_crcx_ctr_group; int error_code = 400; - const char *local_options = NULL; const char *callid = NULL; const char *mode = NULL; @@ -756,7 +756,7 @@ /* It is illegal to send a connection identifier * together with a CRCX, the MGW will assign the * connection identifier by itself on CRCX */ - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_BAD_ACTION]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_BAD_ACTION]); return create_err_response(NULL, 523, "CRCX", p->trans); break; case 'M': @@ -783,7 +783,7 @@ LOGP(DLMGCP, LOGL_NOTICE, "CRCX: endpoint:%x unhandled option: '%c'/%d\n", ENDPOINT_NUMBER(endp), *line, *line); - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_UNHANDLED_PARAM]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_UNHANDLED_PARAM]); return create_err_response(NULL, 539, "CRCX", p->trans); break; } @@ -795,7 +795,7 @@ LOGP(DLMGCP, LOGL_ERROR, "CRCX: endpoint:%x insufficient parameters, missing callid\n", ENDPOINT_NUMBER(endp)); - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_MISSING_CALLID]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_MISSING_CALLID]); return create_err_response(endp, 516, "CRCX", p->trans); } @@ -803,7 +803,7 @@ LOGP(DLMGCP, LOGL_ERROR, "CRCX: endpoint:%x insufficient parameters, missing mode\n", ENDPOINT_NUMBER(endp)); - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_INVALID_MODE]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_INVALID_MODE]); return create_err_response(endp, 517, "CRCX", p->trans); } @@ -820,7 +820,7 @@ } else { /* There is no more room for a connection, leave * everything as it is and return with an error */ - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_LIMIT_EXCEEDED]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_LIMIT_EXCEEDED]); return create_err_response(endp, 540, "CRCX", p->trans); } } @@ -838,7 +838,7 @@ else { /* This is not our call, leave everything as it is and * return with an error. */ - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_UNKNOWN_CALLID]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_UNKNOWN_CALLID]); return create_err_response(endp, 400, "CRCX", p->trans); } } @@ -854,7 +854,7 @@ LOGP(DLMGCP, LOGL_ERROR, "CRCX: endpoint:0x%x unable to allocate RTP connection\n", ENDPOINT_NUMBER(endp)); - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_ALLOC_CONN]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_ALLOC_CONN]); goto error2; } @@ -918,7 +918,7 @@ "CRCX: endpoint:%x selected connection mode type requires an opposite end!\n", ENDPOINT_NUMBER(endp)); error_code = 527; - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC]); goto error2; } @@ -930,7 +930,7 @@ LOGP(DLMGCP, LOGL_ERROR, "CRCX: endpoint:0x%x could not start RTP processing!\n", ENDPOINT_NUMBER(endp)); - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_START_RTP]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_START_RTP]); goto error2; } @@ -945,7 +945,7 @@ "CRCX: endpoint:0x%x CRCX rejected by policy\n", ENDPOINT_NUMBER(endp)); mgcp_endp_release(endp); - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_REJECTED_BY_POLICY]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_REJECTED_BY_POLICY]); return create_err_response(endp, 400, "CRCX", p->trans); break; case MGCP_POLICY_DEFER: @@ -973,7 +973,7 @@ LOGP(DLMGCP, LOGL_NOTICE, "CRCX: endpoint:0x%x connection successfully created\n", ENDPOINT_NUMBER(endp)); - rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_SUCCESS]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_SUCCESS]); return create_response_with_sdp(endp, conn, "CRCX", p->trans, true); error2: mgcp_endp_release(endp); -- To view, visit https://gerrit.osmocom.org/11495 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If4f097c5e441914eaa24c7657813ebb3f9a49916 Gerrit-Change-Number: 11495 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:18:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:18:16 +0000 Subject: Change in osmo-mgw[master]: add more mgcp crxc error counters In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11496 ) Change subject: add more mgcp crxc error counters ...................................................................... add more mgcp crxc error counters Add counters for error conditions which I overlooked in commit 1e174875bf72c3d7840fa98cfad8c410a542919e Change-Id: Ia2004f8063f3a50b5d7a838ebe8a784a47fcc50d Depends: If4f097c5e441914eaa24c7657813ebb3f9a49916 Related: OS#2660 --- M include/osmocom/mgcp/mgcp.h M src/libosmo-mgcp/mgcp_protocol.c 2 files changed, 13 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index f9f0ac7..b866f91 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -131,6 +131,10 @@ MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC, MGCP_CRCX_FAIL_START_RTP, MGCP_CRCX_FAIL_REJECTED_BY_POLICY, + MGCP_CRCX_FAIL_NO_OSMUX, + MGCP_CRCX_FAIL_INVALID_CONN_OPTIONS, + MGCP_CRCX_FAIL_CODEC_NEGOTIATION, + MGCP_CRCX_FAIL_BIND_PORT, }; struct mgcp_trunk_config { diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 24c8e54..ccbdfc8 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -64,6 +64,10 @@ [MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC] = {"crcx:no_remote_conn_desc", "no opposite end specified for connection."}, [MGCP_CRCX_FAIL_START_RTP] = {"crcx:start_rtp_failure", "failure to start RTP processing."}, [MGCP_CRCX_FAIL_REJECTED_BY_POLICY] = {"crcx:conn_rejected", "connection rejected by policy."}, + [MGCP_CRCX_FAIL_NO_OSMUX] = {"crcx:no_osmux", "no osmux offered by peer."}, + [MGCP_CRCX_FAIL_INVALID_CONN_OPTIONS] = {"crcx:conn_opt", "connection options invalid."}, + [MGCP_CRCX_FAIL_CODEC_NEGOTIATION] = {"crcx:codec_nego", "codec negotiation failure."}, + [MGCP_CRCX_FAIL_BIND_PORT] = {"crcx:bind_port", "port bind failure."}, }; const static struct rate_ctr_group_desc mgcp_crcx_ctr_group_desc = { @@ -863,6 +867,7 @@ if (mgcp_parse_conn_mode(mode, endp, conn->conn) != 0) { error_code = 517; + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_INVALID_MODE]); goto error2; } @@ -876,6 +881,7 @@ LOGP(DLMGCP, LOGL_ERROR, "CRCX: endpoint:0x%x osmux only and no osmux offered\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_NO_OSMUX]); goto error2; } @@ -888,6 +894,7 @@ "CRCX: endpoint:%x inavlid local connection options!\n", ENDPOINT_NUMBER(endp)); error_code = rc; + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_INVALID_CONN_OPTIONS]); goto error2; } } @@ -897,6 +904,7 @@ mgcp_codec_summary(conn); if (rc) { error_code = rc; + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_CODEC_NEGOTIATION]); goto error2; } @@ -923,6 +931,7 @@ } if (allocate_port(endp, conn) != 0) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_BIND_PORT]); goto error2; } -- To view, visit https://gerrit.osmocom.org/11496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia2004f8063f3a50b5d7a838ebe8a784a47fcc50d Gerrit-Change-Number: 11496 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:18:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:18:17 +0000 Subject: Change in osmo-mgw[master]: add MDCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11499 ) Change subject: add MDCX command statistics to osmo-mgw ...................................................................... add MDCX command statistics to osmo-mgw Add a counter group for MDCX commands. The group contains counters for successful connection processing as well as various error conditions. This provides a quick overview of MDCX failures on each trunk throughout the lifetime of the osmo-mgw process. The counters are displayed by 'show mgcp stats' and 'show rate-counters'. Change-Id: I79c27425ba40c3a85edc6cd846cba325d847298c Depends: Ia2004f8063f3a50b5d7a838ebe8a784a47fcc50d Related: OS#2660 --- M include/osmocom/mgcp/mgcp.h M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c 3 files changed, 92 insertions(+), 18 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index b866f91..c8c2cfd 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -137,6 +137,25 @@ MGCP_CRCX_FAIL_BIND_PORT, }; +/* Global MCGP MDCX related rate counters */ +enum { + MGCP_MDCX_SUCCESS, + MGCP_MDCX_FAIL_WILDCARD, + MGCP_MDCX_FAIL_NO_CONN, + MGCP_MDCX_FAIL_INVALID_CALLID, + MGCP_MDCX_FAIL_INVALID_CONNID, + MGCP_MDCX_FAIL_UNHANDLED_PARAM, + MGCP_MDCX_FAIL_NO_CONNID, + MGCP_MDCX_FAIL_CONN_NOT_FOUND, + MGCP_MDCX_FAIL_INVALID_MODE, + MGCP_MDCX_FAIL_INVALID_CONN_OPTIONS, + MGCP_MDCX_FAIL_NO_REMOTE_CONN_DESC, + MGCP_MDCX_FAIL_START_RTP, + MGCP_MDCX_FAIL_REJECTED_BY_POLICY, + MGCP_MDCX_FAIL_DEFERRED_BY_POLICY +}; + + struct mgcp_trunk_config { struct llist_head entry; @@ -177,6 +196,7 @@ /* rate counters */ struct rate_ctr_group *mgcp_crcx_ctr_group; + struct rate_ctr_group *mgcp_mdcx_ctr_group; }; enum mgcp_role { diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index ccbdfc8..3a0e4ea 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -57,7 +57,7 @@ [MGCP_CRCX_FAIL_BAD_ACTION] = {"crcx:bad_action", "bad action in CRCX command."}, [MGCP_CRCX_FAIL_UNHANDLED_PARAM] = {"crcx:unhandled_param", "unhandled parameter in CRCX command."}, [MGCP_CRCX_FAIL_MISSING_CALLID] = {"crcx:missing_callid", "missing CallId in CRCX command."}, - [MGCP_CRCX_FAIL_INVALID_MODE] = {"crcx:invalid_mode", "connection invalid mode in CRCX command."}, + [MGCP_CRCX_FAIL_INVALID_MODE] = {"crcx:invalid_mode", "invalid connection mode in CRCX command."}, [MGCP_CRCX_FAIL_LIMIT_EXCEEDED] = {"crcx:limit_exceeded", "limit of concurrent connections was reached."}, [MGCP_CRCX_FAIL_UNKNOWN_CALLID] = {"crcx:unkown_callid", "unknown CallId in CRCX command."}, [MGCP_CRCX_FAIL_ALLOC_CONN] = {"crcx:alloc_conn_fail", "connection allocation failure."}, @@ -78,6 +78,31 @@ .ctr_desc = mgcp_crcx_ctr_desc }; +static const struct rate_ctr_desc mgcp_mdcx_ctr_desc[] = { + [MGCP_MDCX_SUCCESS] = {"mdcx:success", "MDCX command processed successfully."}, + [MGCP_MDCX_FAIL_WILDCARD] = {"mdcx:wildcard", "wildcard endpoint names in MDCX commands are unsupported."}, + [MGCP_MDCX_FAIL_NO_CONN] = {"mdcx:no_conn", "endpoint specified in MDCX command has no active connections."}, + [MGCP_MDCX_FAIL_INVALID_CALLID] = {"mdcx:callid", "invalid CallId specified in MDCX command."}, + [MGCP_MDCX_FAIL_INVALID_CONNID] = {"mdcx:connid", "invalid connection ID specified in MDCX command."}, + [MGCP_MDCX_FAIL_UNHANDLED_PARAM] = {"crcx:unhandled_param", "unhandled parameter in MDCX command."}, + [MGCP_MDCX_FAIL_NO_CONNID] = {"mdcx:no_connid", "no connection ID specified in MDCX command."}, + [MGCP_MDCX_FAIL_CONN_NOT_FOUND] = {"mdcx:conn_not_found", "connection specified in MDCX command does not exist."}, + [MGCP_MDCX_FAIL_INVALID_MODE] = {"mdcx:invalid_mode", "invalid connection mode in MDCX command."}, + [MGCP_MDCX_FAIL_INVALID_CONN_OPTIONS] = {"mdcx:conn_opt", "connection options invalid."}, + [MGCP_MDCX_FAIL_NO_REMOTE_CONN_DESC] = {"mdcx:no_remote_conn_desc", "no opposite end specified for connection."}, + [MGCP_MDCX_FAIL_START_RTP] = {"mdcx:start_rtp_failure", "failure to start RTP processing."}, + [MGCP_MDCX_FAIL_REJECTED_BY_POLICY] = {"mdcx:conn_rejected", "connection rejected by policy."}, + [MGCP_MDCX_FAIL_DEFERRED_BY_POLICY] = {"mdcx:conn_deferred", "connection deferred by policy."}, +}; + +const static struct rate_ctr_group_desc mgcp_mdcx_ctr_group_desc = { + .group_name_prefix = "mdcx", + .group_description = "mdcx statistics", + .class_id = OSMO_STATS_CLASS_GLOBAL, + .num_ctr = ARRAY_SIZE(mgcp_mdcx_ctr_desc), + .ctr_desc = mgcp_mdcx_ctr_desc +}; + static struct msgb *handle_audit_endpoint(struct mgcp_parse_data *data); static struct msgb *handle_create_con(struct mgcp_parse_data *data); static struct msgb *handle_delete_con(struct mgcp_parse_data *data); @@ -999,7 +1024,9 @@ /* MDCX command handler, processes the received command */ static struct msgb *handle_modify_con(struct mgcp_parse_data *p) { + struct mgcp_trunk_config *tcfg = p->endp->tcfg; struct mgcp_endpoint *endp = p->endp; + struct rate_ctr_group *rate_ctrs = tcfg->mgcp_mdcx_ctr_group; int error_code = 500; int silent = 0; int have_sdp = 0; @@ -1017,6 +1044,7 @@ LOGP(DLMGCP, LOGL_ERROR, "MDCX: endpoint:0x%x wildcarded endpoint names not supported.\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_WILDCARD]); return create_err_response(endp, 507, "MDCX", p->trans); } @@ -1024,6 +1052,7 @@ LOGP(DLMGCP, LOGL_ERROR, "MDCX: endpoint:0x%x endpoint is not holding a connection.\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_NO_CONN]); return create_err_response(endp, 400, "MDCX", p->trans); } @@ -1034,14 +1063,17 @@ switch (line[0]) { case 'C': if (mgcp_verify_call_id(endp, line + 3) != 0) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_INVALID_CALLID]); error_code = 516; goto error3; } break; case 'I': conn_id = (const char *)line + 3; - if ((error_code = mgcp_verify_ci(endp, conn_id))) + if ((error_code = mgcp_verify_ci(endp, conn_id))) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_INVALID_CONNID]); goto error3; + } break; case 'L': local_options = (const char *)line + 3; @@ -1060,6 +1092,7 @@ LOGP(DLMGCP, LOGL_NOTICE, "MDCX: endpoint:0x%x Unhandled MGCP option: '%c'/%d\n", ENDPOINT_NUMBER(endp), line[0], line[0]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_UNHANDLED_PARAM]); return create_err_response(NULL, 539, "MDCX", p->trans); break; } @@ -1070,15 +1103,19 @@ LOGP(DLMGCP, LOGL_ERROR, "MDCX: endpoint:0x%x insufficient parameters, missing ci (connectionIdentifier)\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_NO_CONNID]); return create_err_response(endp, 515, "MDCX", p->trans); } conn = mgcp_conn_get_rtp(endp, conn_id); - if (!conn) + if (!conn) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_CONN_NOT_FOUND]); return create_err_response(endp, 400, "MDCX", p->trans); + } if (mode) { if (mgcp_parse_conn_mode(mode, endp, conn->conn) != 0) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_INVALID_MODE]); error_code = 517; goto error3; } @@ -1091,9 +1128,10 @@ &endp->local_options, local_options); if (rc != 0) { LOGP(DLMGCP, LOGL_ERROR, - "MDCX: endpoint:%x inavlid local connection options!\n", + "MDCX: endpoint:%x invalid local connection options!\n", ENDPOINT_NUMBER(endp)); error_code = rc; + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_INVALID_CONN_OPTIONS]); goto error3; } } @@ -1114,12 +1152,15 @@ "MDCX: endpoint:%x selected connection mode type requires an opposite end!\n", ENDPOINT_NUMBER(endp)); error_code = 527; + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_NO_REMOTE_CONN_DESC]); goto error3; } - if (setup_rtp_processing(endp, conn) != 0) + if (setup_rtp_processing(endp, conn) != 0) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_START_RTP]); goto error3; + } /* policy CB */ @@ -1132,6 +1173,7 @@ LOGP(DLMGCP, LOGL_NOTICE, "MDCX: endpoint:0x%x rejected by policy\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_REJECTED_BY_POLICY]); if (silent) goto out_silent; return create_err_response(endp, 400, "MDCX", p->trans); @@ -1139,8 +1181,9 @@ case MGCP_POLICY_DEFER: /* stop processing */ LOGP(DLMGCP, LOGL_DEBUG, - "MDCX: endpoint:0x%x defered by policy\n", + "MDCX: endpoint:0x%x deferred by policy\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_DEFERRED_BY_POLICY]); return NULL; break; case MGCP_POLICY_CONT: @@ -1165,6 +1208,7 @@ && endp->tcfg->keepalive_interval != MGCP_KEEPALIVE_NEVER) send_dummy(endp, conn); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_SUCCESS]); if (silent) goto out_silent; @@ -1443,20 +1487,26 @@ return 0; } -static void alloc_mgcp_crxc_rate_counters(struct mgcp_trunk_config *trunk, void *ctx) +static void alloc_mgcp_rate_counters(struct mgcp_trunk_config *trunk, void *ctx) { /* FIXME: Each new rate counter group requires a unique index. At the * moment we generate an index using a counter, but perhaps there is * a better way of assigning indices? */ - static unsigned int rate_ctr_index = 0; + static unsigned int crcx_rate_ctr_index = 0; + static unsigned int mdcx_rate_ctr_index = 0; - if (trunk->mgcp_crcx_ctr_group != NULL) - return; - - trunk->mgcp_crcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_crcx_ctr_group_desc, rate_ctr_index); - OSMO_ASSERT(trunk->mgcp_crcx_ctr_group); - talloc_set_destructor(trunk->mgcp_crcx_ctr_group, free_rate_counter_group); - rate_ctr_index++; + if (trunk->mgcp_crcx_ctr_group == NULL) { + trunk->mgcp_crcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_crcx_ctr_group_desc, crcx_rate_ctr_index); + OSMO_ASSERT(trunk->mgcp_crcx_ctr_group); + talloc_set_destructor(trunk->mgcp_crcx_ctr_group, free_rate_counter_group); + crcx_rate_ctr_index++; + } + if (trunk->mgcp_mdcx_ctr_group == NULL) { + trunk->mgcp_mdcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_mdcx_ctr_group_desc, mdcx_rate_ctr_index); + OSMO_ASSERT(trunk->mgcp_mdcx_ctr_group); + talloc_set_destructor(trunk->mgcp_mdcx_ctr_group, free_rate_counter_group); + mdcx_rate_ctr_index++; + } } /*! allocate configuration with default values. @@ -1496,7 +1546,7 @@ cfg->trunk.audio_send_name = 1; cfg->trunk.omit_rtcp = 0; mgcp_trunk_set_keepalive(&cfg->trunk, MGCP_KEEPALIVE_ONCE); - alloc_mgcp_crxc_rate_counters(&cfg->trunk, cfg); + alloc_mgcp_rate_counters(&cfg->trunk, cfg); INIT_LLIST_HEAD(&cfg->trunks); @@ -1528,7 +1578,7 @@ trunk->vty_number_endpoints = 33; trunk->omit_rtcp = 0; mgcp_trunk_set_keepalive(trunk, MGCP_KEEPALIVE_ONCE); - alloc_mgcp_crxc_rate_counters(trunk, trunk); + alloc_mgcp_rate_counters(trunk, trunk); llist_add_tail(&trunk->entry, &cfg->trunks); return trunk; @@ -1575,7 +1625,7 @@ } tcfg->number_endpoints = tcfg->vty_number_endpoints; - alloc_mgcp_crxc_rate_counters(tcfg, tcfg->cfg); + alloc_mgcp_rate_counters(tcfg, tcfg->cfg); return 0; } diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 5643180..ed8aca5 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -249,6 +249,10 @@ vty_out(vty, " %s:%s", cfg->mgcp_crcx_ctr_group->desc->group_description, VTY_NEWLINE); vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h %D/d) %d", cfg->mgcp_crcx_ctr_group); } + if (show_stats && cfg->mgcp_mdcx_ctr_group) { + vty_out(vty, " %s:%s", cfg->mgcp_mdcx_ctr_group->desc->group_description, VTY_NEWLINE); + vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h %D/d) %d", cfg->mgcp_mdcx_ctr_group); + } } #define SHOW_MGCP_STR "Display information about the MGCP Media Gateway\n" -- To view, visit https://gerrit.osmocom.org/11499 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I79c27425ba40c3a85edc6cd846cba325d847298c Gerrit-Change-Number: 11499 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:18:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:18:30 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf: ec20: Enable voice support In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11508 ) Change subject: resources.conf: ec20: Enable voice support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11508 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie14c00f9f80e00fdbb52ab82a53b4b5a187d41e7 Gerrit-Change-Number: 11508 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 23:18:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:18:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:18:38 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites.conf: Enable testing egprs In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11498 ) Change subject: default-suites.conf: Enable testing egprs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1885e2a749e62547f60b9c35e15f1277b2627bb4 Gerrit-Change-Number: 11498 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 23:18:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:18:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:18:53 +0000 Subject: Change in osmo-gsm-tester[master]: Add support to enable EGPRS In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11497 ) Change subject: Add support to enable EGPRS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11497 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I682f0c1b4cb97b704d646f18f54e748baaefd677 Gerrit-Change-Number: 11497 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 23:18:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:19:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:19:22 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: fix: use host byte order for TDMA fn In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11477 ) Change subject: layer23/l1ctl.c: fix: use host byte order for TDMA fn ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iad00eebf03b38b9c4fc2d7ed66697d23a953d8b2 Gerrit-Change-Number: 11477 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 29 Oct 2018 23:19:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:19:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:19:26 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: fix: use host byte order for TDMA fn In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11477 ) Change subject: layer23/l1ctl.c: fix: use host byte order for TDMA fn ...................................................................... layer23/l1ctl.c: fix: use host byte order for TDMA fn Change-Id: Iad00eebf03b38b9c4fc2d7ed66697d23a953d8b2 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index b3f73a8..96db52f 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -180,7 +180,7 @@ * - select correct paging block that is for us. * - initialize ds_fail according to BS_PA_MFRMS. */ - if ((dl->frame_nr % 51) != 6) + if ((meas->last_fn % 51) != 6) break; if (!meas->ds_fail) break; -- To view, visit https://gerrit.osmocom.org/11477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iad00eebf03b38b9c4fc2d7ed66697d23a953d8b2 Gerrit-Change-Number: 11477 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:21:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 29 Oct 2018 23:21:19 +0000 Subject: Change in osmocom-bb[master]: layer23/common: introduce L23SAP API for L1CTL In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11246 ) Change subject: layer23/common: introduce L23SAP API for L1CTL ...................................................................... Patch Set 2: I don't really understand what we gain from this. Sure, I can read your statement and agree that it removes the need to have lapdm.h included and used. But why is that a problem? Whar are you trying to fix here? -- To view, visit https://gerrit.osmocom.org/11246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I22d7932ddc03c692f2616726ced53b6e8eef822d Gerrit-Change-Number: 11246 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 29 Oct 2018 23:21:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Oct 29 23:30:59 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 29 Oct 2018 23:30:59 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3958?= Message-ID: <567197577.291.1540855859330.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 821.86 KB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update meas-feed destination ADDR <0-65535> meas-feed scenario NAME timer TNNNN (default|<1-65535>) neci (0|1) paging any use tch (0|1) bts <0-255> handover (0|1|default) handover algorithm (1|2|default) handover1 window rxlev averaging (<1-10>|default) handover1 window rxqual averaging (<1-10>|default) handover1 window rxlev neighbor averaging (<1-10>|default) handover1 power budget interval (<1-99>|default) handover1 power budget hysteresis (<0-999>|default) handover1 maximum distance (<0-9999>|default) handover2 window rxlev averaging (<1-10>|default) handover2 window rxqual averaging (<1-10>|default) handover2 window rxlev neighbor averaging (<1-10>|default) handover2 power budget interval (<1-99>|default) handover2 power budget hysteresis (<0-999>|default) handover2 maximum distance (<0-9999>|default) handover2 assignment (0|1|default) handover2 tdma-measurement (full|subset|default) handover2 min rxlev (<-110--50>|default) handover2 min rxqual (<0-7>|default) handover2 afs-bias rxlev (<0-20>|default) handover2 afs-bias rxqual (<0-7>|default) handover2 min-free-slots tch/f (<0-9999>|default) handover2 min-free-slots tch/h (<0-9999>|default) handover2 max-handovers (<1-9999>|default) handover2 penalty-time max-distance (<0-99999>|default) handover2 penalty-time failed-ho (<0-99999>|default) handover2 penalty-time failed-assignment (<0-99999>|default) handover2 retries (<0-9>|default) handover2 congestion-check (disabled|<1-999>|now) OsmoBSC(config-net)# meas-feed destination 127.0.0.23 4223 OsmoBSC(config-net)# meas-feed scenario foo23 OsmoBSC(config-net)# show running-config Current configuration: ! ! log stderr logging filter all 1 logging color 1 logging print category 0 logging timestamp 0 logging print file 1 logging level rll notice logging level mm notice logging level rr notice logging level rsl notice logging level nm info logging level pag notice logging level meas notice logging level msc notice logging level ho notice logging level hodec notice logging level ref notice logging level nat notice logging level ctrl notice logging level filter debug logging level pcu debug logging level lcls notice logging level chan notice logging level ts notice logging level as notice logging level lglobal notice logging level llapd notice logging level linp notice logging level lmux notice logging level lmi notice logging level lmib notice logging level lsms notice logging level lctrl notice logging level lgtp notice logging level lstats notice logging level lgsup notice logging level loap notice logging level lss7 notice logging level lsccp notice logging level lsua notice logging level lm3ua notice logging level lmgcp notice logging level ljibuf notice ! stats interval 5 ! line vty no login ! e1_input e1_line 0 driver ipa e1_line 0 port 0 no e1_line 0 keepalive cs7 instance 0 point-code 0.23.3 network network country code 901 mobile network code 70 encryption a5 1 3 neci 0 paging any use tch 0 meas-feed destination 127.0.0.23 4223 meas-feed scenario foo23 bts 0 type sysmobts band DCS1800 cell_identity 0 location_area_code 23 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 rxlev access min 0 radio-link-timeout 32 channel allocator ascending rach tx integer 9 rach max transmission 7 channel-descrption attach 1 channel-descrption bs-pa-mfrms 5 channel-descrption bs-ag-blks-res 1 no access-control-class-ramping access-control-class-ramping-step-interval dynamic access-control-class-ramping-step-size 1 early-classmark-sending forbidden early-classmark-sending-3g allowed ip.access unit_id 1800 0 oml ip.access stream_id 255 line 0 neighbor-list mode automatic codec-support fr hr efr amr amr tch-f modes 1 2 6 7 amr tch-f threshold ms 32 32 32 amr tch-f hysteresis ms 8 8 8 amr tch-f threshold bts 32 32 32 amr tch-f hysteresis bts 8 8 8 amr tch-f start-mode auto amr tch-h modes 1 2 4 5 amr tch-h threshold ms 32 32 32 amr tch-h hysteresis ms 8 8 8 amr tch-h threshold bts 32 32 32 amr tch-h hysteresis bts 8 8 8 amr tch-h start-mode auto gprs mode none no force-combined-si trx 0 rf_locked 0 arfcn 868 nominal power 23 max_power_red 0 rsl e1 tei 0 timeslot 0 phys_chan_config CCCH+SDCCH4 hopping enabled 0 timeslot 1 phys_chan_config SDCCH8 hopping enabled 0 timeslot 2 phys_chan_config TCH/F hopping enabled 0 timeslot 3 phys_chan_config TCH/F hopping enabled 0 timeslot 4 phys_chan_config TCH/F hopping enabled 0 timeslot 5 phys_chan_config TCH/F hopping enabled 0 timeslot 6 phys_chan_config TCH/F hopping enabled 0 timeslot 7 phys_chan_config TCH/F hopping enabled 0 msc 0 ip.access rtp-base 4000 no bsc-welcome-text no bsc-msc-lost-text no bsc-grace-text codec-list hr3 type normal allow-emergency deny amr-config 12_2k forbidden amr-config 10_2k forbidden amr-config 7_95k forbidden amr-config 7_40k forbidden amr-config 6_70k forbidden amr-config 5_90k allowed amr-config 5_15k forbidden amr-config 4_75k forbidden asp-protocol m3ua lcls-mode disabled lcls-codec-mismatch forbidden bsc mid-call-timeout 0 no missing-msc-text end <0004> bsc_init.c:49 shutting down OML for BTS 0 logging level cc (debug|info|notice|error|fatal) logging level mgcp (debug|info|notice|error|fatal) signal 15 received Terminating took 2.679s RESULTS: pass: ./handover_cfg.vty FAIL: ./neighbor_ident.vty pass: ./osmo-bsc.vty Makefile:696: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 1 make[5]: *** [python-tests] Error 2 Makefile:683: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:702: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:545: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:397: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:434: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 make: *** [check] Error 2 Makefile:725: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Oct 29 23:32:38 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 29 Oct 2018 23:32:38 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3959?= In-Reply-To: <567197577.291.1540855859330.JavaMail.jenkins@jenkins.osmocom.org> References: <567197577.291.1540855859330.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1481848932.292.1540855958497.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 821.84 KB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update meas-feed destination ADDR <0-65535> meas-feed scenario NAME timer TNNNN (default|<1-65535>) neci (0|1) paging any use tch (0|1) bts <0-255> handover (0|1|default) handover algorithm (1|2|default) handover1 window rxlev averaging (<1-10>|default) handover1 window rxqual averaging (<1-10>|default) handover1 window rxlev neighbor averaging (<1-10>|default) handover1 power budget interval (<1-99>|default) handover1 power budget hysteresis (<0-999>|default) handover1 maximum distance (<0-9999>|default) handover2 window rxlev averaging (<1-10>|default) handover2 window rxqual averaging (<1-10>|default) handover2 window rxlev neighbor averaging (<1-10>|default) handover2 power budget interval (<1-99>|default) handover2 power budget hysteresis (<0-999>|default) handover2 maximum distance (<0-9999>|default) handover2 assignment (0|1|default) handover2 tdma-measurement (full|subset|default) handover2 min rxlev (<-110--50>|default) handover2 min rxqual (<0-7>|default) handover2 afs-bias rxlev (<0-20>|default) handover2 afs-bias rxqual (<0-7>|default) handover2 min-free-slots tch/f (<0-9999>|default) handover2 min-free-slots tch/h (<0-9999>|default) handover2 max-handovers (<1-9999>|default) handover2 penalty-time max-distance (<0-99999>|default) handover2 penalty-time failed-ho (<0-99999>|default) handover2 penalty-time failed-assignment (<0-99999>|default) handover2 retries (<0-9>|default) handover2 congestion-check (disabled|<1-999>|now) OsmoBSC(config-net)# meas-feed destination 127.0.0.23 4223 OsmoBSC(config-net)# meas-feed scenario foo23 OsmoBSC(config-net)# show running-config Current configuration: ! ! log stderr logging filter all 1 logging color 1 logging print category 0 logging timestamp 0 logging print file 1 logging level rll notice logging level mm notice logging level rr notice logging level rsl notice logging level nm info logging level pag notice logging level meas notice logging level msc notice logging level ho notice logging level hodec notice logging level ref notice logging level nat notice logging level ctrl notice logging level filter debug logging level pcu debug logging level lcls notice logging level chan notice logging level ts notice logging level as notice logging level lglobal notice logging level llapd notice logging level linp notice logging level lmux notice logging level lmi notice logging level lmib notice logging level lsms notice logging level lctrl notice logging level lgtp notice logging level lstats notice logging level lgsup notice logging level loap notice logging level lss7 notice logging level lsccp notice logging level lsua notice logging level lm3ua notice logging level lmgcp notice logging level ljibuf notice ! stats interval 5 ! line vty no login ! e1_input e1_line 0 driver ipa e1_line 0 port 0 no e1_line 0 keepalive cs7 instance 0 point-code 0.23.3 network network country code 901 mobile network code 70 encryption a5 1 3 neci 0 paging any use tch 0 meas-feed destination 127.0.0.23 4223 meas-feed scenario foo23 bts 0 type sysmobts band DCS1800 cell_identity 0 location_area_code 23 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 rxlev access min 0 radio-link-timeout 32 channel allocator ascending rach tx integer 9 rach max transmission 7 channel-descrption attach 1 channel-descrption bs-pa-mfrms 5 channel-descrption bs-ag-blks-res 1 no access-control-class-ramping access-control-class-ramping-step-interval dynamic access-control-class-ramping-step-size 1 early-classmark-sending forbidden early-classmark-sending-3g allowed ip.access unit_id 1800 0 oml ip.access stream_id 255 line 0 neighbor-list mode automatic codec-support fr hr efr amr amr tch-f modes 1 2 6 7 amr tch-f threshold ms 32 32 32 amr tch-f hysteresis ms 8 8 8 amr tch-f threshold bts 32 32 32 amr tch-f hysteresis bts 8 8 8 amr tch-f start-mode auto amr tch-h modes 1 2 4 5 amr tch-h threshold ms 32 32 32 amr tch-h hysteresis ms 8 8 8 amr tch-h threshold bts 32 32 32 amr tch-h hysteresis bts 8 8 8 amr tch-h start-mode auto gprs mode none no force-combined-si trx 0 rf_locked 0 arfcn 868 nominal power 23 max_power_red 0 rsl e1 tei 0 timeslot 0 phys_chan_config CCCH+SDCCH4 hopping enabled 0 timeslot 1 phys_chan_config SDCCH8 hopping enabled 0 timeslot 2 phys_chan_config TCH/F hopping enabled 0 timeslot 3 phys_chan_config TCH/F hopping enabled 0 timeslot 4 phys_chan_config TCH/F hopping enabled 0 timeslot 5 phys_chan_config TCH/F hopping enabled 0 timeslot 6 phys_chan_config TCH/F hopping enabled 0 timeslot 7 phys_chan_config TCH/F hopping enabled 0 msc 0 ip.access rtp-base 4000 no bsc-welcome-text no bsc-msc-lost-text no bsc-grace-text codec-list hr3 type normal allow-emergency deny amr-config 12_2k forbidden amr-config 10_2k forbidden amr-config 7_95k forbidden amr-config 7_40k forbidden amr-config 6_70k forbidden amr-config 5_90k allowed amr-config 5_15k forbidden amr-config 4_75k forbidden asp-protocol m3ua lcls-mode disabled lcls-codec-mismatch forbidden bsc mid-call-timeout 0 no missing-msc-text end <0004> bsc_init.c:49 shutting down OML for BTS 0 logging level cc (debug|info|notice|error|fatal) logging level mgcp (debug|info|notice|error|fatal) signal 15 received Terminating took 2.679s RESULTS: pass: ./handover_cfg.vty FAIL: ./neighbor_ident.vty pass: ./osmo-bsc.vty Makefile:696: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 1 make[5]: *** [python-tests] Error 2 Makefile:683: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:702: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:545: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 make[2]: *** [check-recursive] Error 1 Makefile:397: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[1]: *** [check-recursive] Error 1 Makefile:434: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:725: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Oct 29 23:38:24 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 29 Oct 2018 23:38:24 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3960?= In-Reply-To: <1481848932.292.1540855958497.JavaMail.jenkins@jenkins.osmocom.org> References: <1481848932.292.1540855958497.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <829430308.293.1540856304622.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 823.46 KB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update meas-feed destination ADDR <0-65535> meas-feed scenario NAME timer TNNNN (default|<1-65535>) neci (0|1) paging any use tch (0|1) bts <0-255> handover (0|1|default) handover algorithm (1|2|default) handover1 window rxlev averaging (<1-10>|default) handover1 window rxqual averaging (<1-10>|default) handover1 window rxlev neighbor averaging (<1-10>|default) handover1 power budget interval (<1-99>|default) handover1 power budget hysteresis (<0-999>|default) handover1 maximum distance (<0-9999>|default) handover2 window rxlev averaging (<1-10>|default) handover2 window rxqual averaging (<1-10>|default) handover2 window rxlev neighbor averaging (<1-10>|default) handover2 power budget interval (<1-99>|default) handover2 power budget hysteresis (<0-999>|default) handover2 maximum distance (<0-9999>|default) handover2 assignment (0|1|default) handover2 tdma-measurement (full|subset|default) handover2 min rxlev (<-110--50>|default) handover2 min rxqual (<0-7>|default) handover2 afs-bias rxlev (<0-20>|default) handover2 afs-bias rxqual (<0-7>|default) handover2 min-free-slots tch/f (<0-9999>|default) handover2 min-free-slots tch/h (<0-9999>|default) handover2 max-handovers (<1-9999>|default) handover2 penalty-time max-distance (<0-99999>|default) handover2 penalty-time failed-ho (<0-99999>|default) handover2 penalty-time failed-assignment (<0-99999>|default) handover2 retries (<0-9>|default) handover2 congestion-check (disabled|<1-999>|now) OsmoBSC(config-net)# meas-feed destination 127.0.0.23 4223 OsmoBSC(config-net)# meas-feed scenario foo23 OsmoBSC(config-net)# show running-config Current configuration: ! ! log stderr logging filter all 1 logging color 1 logging print category 0 logging timestamp 0 logging print file 1 logging level rll notice logging level mm notice logging level rr notice logging level rsl notice logging level nm info logging level pag notice logging level meas notice logging level msc notice logging level ho notice logging level hodec notice logging level ref notice logging level nat notice logging level ctrl notice logging level filter debug logging level pcu debug logging level lcls notice logging level chan notice logging level ts notice logging level as notice logging level lglobal notice logging level llapd notice logging level linp notice logging level lmux notice logging level lmi notice logging level lmib notice logging level lsms notice logging level lctrl notice logging level lgtp notice logging level lstats notice logging level lgsup notice logging level loap notice logging level lss7 notice logging level lsccp notice logging level lsua notice logging level lm3ua notice logging level lmgcp notice logging level ljibuf notice ! stats interval 5 ! line vty no login ! e1_input e1_line 0 driver ipa e1_line 0 port 0 no e1_line 0 keepalive cs7 instance 0 point-code 0.23.3 network network country code 901 mobile network code 70 encryption a5 1 3 neci 0 paging any use tch 0 meas-feed destination 127.0.0.23 4223 meas-feed scenario foo23 bts 0 type sysmobts band DCS1800 cell_identity 0 location_area_code 23 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 rxlev access min 0 radio-link-timeout 32 channel allocator ascending rach tx integer 9 rach max transmission 7 channel-descrption attach 1 channel-descrption bs-pa-mfrms 5 channel-descrption bs-ag-blks-res 1 no access-control-class-ramping access-control-class-ramping-step-interval dynamic access-control-class-ramping-step-size 1 early-classmark-sending forbidden early-classmark-sending-3g allowed ip.access unit_id 1800 0 oml ip.access stream_id 255 line 0 neighbor-list mode automatic codec-support fr hr efr amr amr tch-f modes 1 2 6 7 amr tch-f threshold ms 32 32 32 amr tch-f hysteresis ms 8 8 8 amr tch-f threshold bts 32 32 32 amr tch-f hysteresis bts 8 8 8 amr tch-f start-mode auto amr tch-h modes 1 2 4 5 amr tch-h threshold ms 32 32 32 amr tch-h hysteresis ms 8 8 8 amr tch-h threshold bts 32 32 32 amr tch-h hysteresis bts 8 8 8 amr tch-h start-mode auto gprs mode none no force-combined-si trx 0 rf_locked 0 arfcn 868 nominal power 23 max_power_red 0 rsl e1 tei 0 timeslot 0 phys_chan_config CCCH+SDCCH4 hopping enabled 0 timeslot 1 phys_chan_config SDCCH8 hopping enabled 0 timeslot 2 phys_chan_config TCH/F hopping enabled 0 timeslot 3 phys_chan_config TCH/F hopping enabled 0 timeslot 4 phys_chan_config TCH/F hopping enabled 0 timeslot 5 phys_chan_config TCH/F hopping enabled 0 timeslot 6 phys_chan_config TCH/F hopping enabled 0 timeslot 7 phys_chan_config TCH/F hopping enabled 0 msc 0 ip.access rtp-base 4000 no bsc-welcome-text no bsc-msc-lost-text no bsc-grace-text codec-list hr3 type normal allow-emergency deny amr-config 12_2k forbidden amr-config 10_2k forbidden amr-config 7_95k forbidden amr-config 7_40k forbidden amr-config 6_70k forbidden amr-config 5_90k allowed amr-config 5_15k forbidden amr-config 4_75k forbidden asp-protocol m3ua lcls-mode disabled lcls-codec-mismatch forbidden bsc mid-call-timeout 0 no missing-msc-text end <0004> bsc_init.c:49 shutting down OML for BTS 0 logging level cc (debug|info|notice|error|fatal) logging level mgcp (debug|info|notice|error|fatal) signal 15 received Terminating took 2.679s RESULTS: pass: ./handover_cfg.vty FAIL: ./neighbor_ident.vty pass: ./osmo-bsc.vty make[6]: *** [vty-test] Error 1 Makefile:696: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' Makefile:683: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 Makefile:702: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:545: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:397: recipe for target 'check-recursive' failed make[2]: *** [check-recursive] Error 1 make[2]: Leaving directory '/build/tests' Makefile:434: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 make: *** [check] Error 2 Makefile:725: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Oct 29 23:41:08 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 29 Oct 2018 23:41:08 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3961?= In-Reply-To: <829430308.293.1540856304622.JavaMail.jenkins@jenkins.osmocom.org> References: <829430308.293.1540856304622.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1704726348.294.1540856468796.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 848.62 KB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update meas-feed destination ADDR <0-65535> meas-feed scenario NAME timer TNNNN (default|<1-65535>) neci (0|1) paging any use tch (0|1) bts <0-255> handover (0|1|default) handover algorithm (1|2|default) handover1 window rxlev averaging (<1-10>|default) handover1 window rxqual averaging (<1-10>|default) handover1 window rxlev neighbor averaging (<1-10>|default) handover1 power budget interval (<1-99>|default) handover1 power budget hysteresis (<0-999>|default) handover1 maximum distance (<0-9999>|default) handover2 window rxlev averaging (<1-10>|default) handover2 window rxqual averaging (<1-10>|default) handover2 window rxlev neighbor averaging (<1-10>|default) handover2 power budget interval (<1-99>|default) handover2 power budget hysteresis (<0-999>|default) handover2 maximum distance (<0-9999>|default) handover2 assignment (0|1|default) handover2 tdma-measurement (full|subset|default) handover2 min rxlev (<-110--50>|default) handover2 min rxqual (<0-7>|default) handover2 afs-bias rxlev (<0-20>|default) handover2 afs-bias rxqual (<0-7>|default) handover2 min-free-slots tch/f (<0-9999>|default) handover2 min-free-slots tch/h (<0-9999>|default) handover2 max-handovers (<1-9999>|default) handover2 penalty-time max-distance (<0-99999>|default) handover2 penalty-time failed-ho (<0-99999>|default) handover2 penalty-time failed-assignment (<0-99999>|default) handover2 retries (<0-9>|default) handover2 congestion-check (disabled|<1-999>|now) OsmoBSC(config-net)# meas-feed destination 127.0.0.23 4223 OsmoBSC(config-net)# meas-feed scenario foo23 OsmoBSC(config-net)# show running-config Current configuration: ! ! log stderr logging filter all 1 logging color 1 logging print category 0 logging timestamp 0 logging print file 1 logging level rll notice logging level mm notice logging level rr notice logging level rsl notice logging level nm info logging level pag notice logging level meas notice logging level msc notice logging level ho notice logging level hodec notice logging level ref notice logging level nat notice logging level ctrl notice logging level filter debug logging level pcu debug logging level lcls notice logging level chan notice logging level ts notice logging level as notice logging level lglobal notice logging level llapd notice logging level linp notice logging level lmux notice logging level lmi notice logging level lmib notice logging level lsms notice logging level lctrl notice logging level lgtp notice logging level lstats notice logging level lgsup notice logging level loap notice logging level lss7 notice logging level lsccp notice logging level lsua notice logging level lm3ua notice logging level lmgcp notice logging level ljibuf notice ! stats interval 5 ! line vty no login ! e1_input e1_line 0 driver ipa e1_line 0 port 0 no e1_line 0 keepalive cs7 instance 0 point-code 0.23.3 network network country code 901 mobile network code 70 encryption a5 1 3 neci 0 paging any use tch 0 meas-feed destination 127.0.0.23 4223 meas-feed scenario foo23 bts 0 type sysmobts band DCS1800 cell_identity 0 location_area_code 23 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 rxlev access min 0 radio-link-timeout 32 channel allocator ascending rach tx integer 9 rach max transmission 7 channel-descrption attach 1 channel-descrption bs-pa-mfrms 5 channel-descrption bs-ag-blks-res 1 no access-control-class-ramping access-control-class-ramping-step-interval dynamic access-control-class-ramping-step-size 1 early-classmark-sending forbidden early-classmark-sending-3g allowed ip.access unit_id 1800 0 oml ip.access stream_id 255 line 0 neighbor-list mode automatic codec-support fr hr efr amr amr tch-f modes 1 2 6 7 amr tch-f threshold ms 32 32 32 amr tch-f hysteresis ms 8 8 8 amr tch-f threshold bts 32 32 32 amr tch-f hysteresis bts 8 8 8 amr tch-f start-mode auto amr tch-h modes 1 2 4 5 amr tch-h threshold ms 32 32 32 amr tch-h hysteresis ms 8 8 8 amr tch-h threshold bts 32 32 32 amr tch-h hysteresis bts 8 8 8 amr tch-h start-mode auto gprs mode none no force-combined-si trx 0 rf_locked 0 arfcn 868 nominal power 23 max_power_red 0 rsl e1 tei 0 timeslot 0 phys_chan_config CCCH+SDCCH4 hopping enabled 0 timeslot 1 phys_chan_config SDCCH8 hopping enabled 0 timeslot 2 phys_chan_config TCH/F hopping enabled 0 timeslot 3 phys_chan_config TCH/F hopping enabled 0 timeslot 4 phys_chan_config TCH/F hopping enabled 0 timeslot 5 phys_chan_config TCH/F hopping enabled 0 timeslot 6 phys_chan_config TCH/F hopping enabled 0 timeslot 7 phys_chan_config TCH/F hopping enabled 0 msc 0 ip.access rtp-base 4000 no bsc-welcome-text no bsc-msc-lost-text no bsc-grace-text codec-list hr3 type normal allow-emergency deny amr-config 12_2k forbidden amr-config 10_2k forbidden amr-config 7_95k forbidden amr-config 7_40k forbidden amr-config 6_70k forbidden amr-config 5_90k allowed amr-config 5_15k forbidden amr-config 4_75k forbidden asp-protocol m3ua lcls-mode disabled lcls-codec-mismatch forbidden bsc mid-call-timeout 0 no missing-msc-text end <0004> bsc_init.c:49 shutting down OML for BTS 0 logging level cc (debug|info|notice|error|fatal) logging level mgcp (debug|info|notice|error|fatal) signal 15 received Terminating took 2.679s RESULTS: pass: ./handover_cfg.vty FAIL: ./neighbor_ident.vty pass: ./osmo-bsc.vty make[6]: *** [vty-test] Error 1 Makefile:696: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' Makefile:683: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 make[4]: *** [check-local] Error 2 Makefile:702: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:545: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:397: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' Makefile:434: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 make: *** [check] Error 2 Makefile:725: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Oct 29 23:44:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 29 Oct 2018 23:44:02 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-iuh_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2336?= Message-ID: <1473520606.295.1540856642239.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 644.85 KB...] CC RUA_InitiatingMessage.o CC RUA_SuccessfulOutcome.o CC RUA_UnsuccessfulOutcome.o CC RUA_Connect.o CC RUA_DirectTransfer.o CC RUA_Disconnect.o CC RUA_ConnectionlessTransfer.o CC RUA_PrivateMessage.o CC RUA_ErrorIndication.o CC RUA_IE.o AR libosmo-asn1-rua.a ar: `u' modifier ignored since `D' is the default (see `U') make[4]: Leaving directory ' Making all in ranap make[4]: Entering directory ' CC RANAP_PrivateIE-ID.lo CC RANAP_Presence.lo CC RANAP_Criticality.lo CC RANAP_ProtocolIE-ID.lo CC RANAP_ProtocolExtensionID.lo CC RANAP_ProcedureCode.lo CC RANAP_TriggeringMessage.lo CC RANAP_IE-Extensions.lo CC RANAP_AccuracyFulfilmentIndicator.lo CC RANAP_AllocationOrRetentionPriority.lo CC RANAP_Alt-RAB-Parameters.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.lo CC RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateInf.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateType.lo CC RANAP_Alt-RAB-Parameter-MaxBitrates.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateList.lo CC RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.lo CC RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.lo CC RANAP_AlternativeRABConfigurationRequest.lo CC RANAP_APN.lo CC RANAP_AreaIdentity.lo CC RANAP_Ass-RAB-Parameters.lo CC RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.lo CC RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.lo CC RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.lo CC RANAP_Ass-RAB-Parameter-MaxBitrateList.lo CC RANAP_AuthorisedPLMNs.lo CC RANAP_AuthorisedSNAs.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_IE-Extensions.h:15, from ../../include/osmocom/ranap/RANAP_SAI.h:17, from ../../include/osmocom/ranap/RANAP_AreaIdentity.h:14, from RANAP_AreaIdentity.c:7: ../../include/osmocom/ranap/RANAP_GA-Polygon.h:26:23: warning: ?struct Member? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct Member { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_GA-Polygon.h:26:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct Member { ^~~~~~~~~~~~~ CC RANAP_BindingID.lo CC RANAP_BroadcastAssistanceDataDecipheringKeys.lo CC RANAP_Cause.lo CC RANAP_CauseMisc.lo CC RANAP_CauseNAS.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:14, from RANAP_AuthorisedPLMNs.c:7: ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:27:23: warning: ?struct MemberC? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberC { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberC { ^~~~~~~~~~~~~ CC RANAP_CauseProtocol.lo CC RANAP_CauseRadioNetwork.lo CC RANAP_CauseRadioNetworkExtension.lo CC RANAP_CauseNon-Standard.lo CC RANAP_CauseTransmissionNetwork.lo CC RANAP_Cell-Access-Mode.lo CC RANAP_CellBased.lo CC RANAP_CellIdList.lo CC RANAP_Cell-Id.lo CC RANAP_Cell-Capacity-Class-Value.lo CC RANAP_CellLoadInformation.lo CC RANAP_CellLoadInformationGroup.lo CC RANAP_CellType.lo CC RANAP_ClientType.lo CC RANAP_CriticalityDiagnostics.lo CC RANAP_CriticalityDiagnostics-IE-List.lo CC RANAP_MessageStructure.lo CC RANAP_CGI.lo CC RANAP_ChosenEncryptionAlgorithm.lo CC RANAP_ChosenIntegrityProtectionAlgorithm.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:14, from RANAP_CriticalityDiagnostics-IE-List.c:7: ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:23: warning: ?struct MemberG? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberG { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberG { ^~~~~~~~~~~~~ In file included from :8:0, from ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:14, from ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics.h:17, from RANAP_CriticalityDiagnostics.c:7: ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:23: warning: ?struct MemberG? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberG { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberG { ^~~~~~~~~~~~~ CC RANAP_CI.lo CC RANAP_ClassmarkInformation2.lo CC RANAP_ClassmarkInformation3.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_MessageStructure.h:14, from RANAP_MessageStructure.c:7: ../../include/osmocom/ranap/RANAP_MessageStructure.h:27:23: warning: ?struct MemberL? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberL { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_MessageStructure.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberL { ^~~~~~~~~~~~~ CC RANAP_CN-DomainIndicator.lo CC RANAP_CN-ID.lo CC RANAP_Correlation-ID.lo CC RANAP_CSFB-Information.lo CC RANAP_CSG-Id.lo CC RANAP_CSG-Id-List.lo CC RANAP_CSG-Membership-Status.lo CC RANAP_DataPDUType.lo CC RANAP_DataVolumeReference.lo CC RANAP_DataVolumeReportingIndication.lo CC RANAP_DCH-ID.lo CC RANAP_DeliveryOfErroneousSDU.lo CC RANAP_DeliveryOrder.lo CC RANAP_DeltaRAListofIdleModeUEs.lo CC RANAP_NewRAListofIdleModeUEs.lo CC RANAP_RAListwithNoIdleModeUEsAnyMore.lo CC RANAP_ForwardingIndication.lo CC RANAP_DL-GTP-PDU-SequenceNumber.lo CC RANAP_DL-N-PDU-SequenceNumber.lo CC RANAP_D-RNTI.lo CC RANAP_DRX-CycleLengthCoefficient.lo CC RANAP_DSCH-ID.lo CC RANAP_EARFCN-Extended.lo CC RANAP_E-DCH-MAC-d-Flow-ID.lo CC RANAP_ENB-ID.lo CC RANAP_EncryptionAlgorithm.lo CC RANAP_EncryptionInformation.lo CC RANAP_EncryptionKey.lo CC RANAP_End-Of-CSFB.lo CC RANAP_EquipmentsToBeTraced.lo CC RANAP_E-UTRAN-Service-Handover.lo CC RANAP_Event.lo CC RANAP_Event1F-Parameters.lo CC RANAP_Event1I-Parameters.lo CC RANAP_ExtendedGuaranteedBitrate.lo CC RANAP_ExtendedMaxBitrate.lo CC RANAP_ExtendedRNC-ID.lo CC RANAP_FrameSequenceNumber.lo CC RANAP_FrequenceLayerConvergenceFlag.lo CC RANAP_GANSS-PositioningDataSet.lo CC RANAP_GANSS-PositioningMethodAndUsage.lo CC RANAP_GeographicalArea.lo CC RANAP_GeographicalCoordinates.lo CC RANAP_GA-AltitudeAndDirection.lo CC RANAP_GA-EllipsoidArc.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_IE-Extensions.h:15, from ../../include/osmocom/ranap/RANAP_GeographicalCoordinates.h:16, from ../../include/osmocom/ranap/RANAP_GA-Point.h:14, from ../../include/osmocom/ranap/RANAP_GeographicalArea.h:14, from RANAP_GeographicalArea.c:7: ../../include/osmocom/ranap/RANAP_GA-Polygon.h:26:23: warning: ?struct Member? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct Member { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_GA-Polygon.h:26:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct Member { ^~~~~~~~~~~~~ CC RANAP_GA-Point.lo CC RANAP_GA-PointWithAltitude.lo CC RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.lo CC RANAP_GA-PointWithUnCertainty.lo CC RANAP_GA-PointWithUnCertaintyEllipse.lo CC RANAP_GA-Polygon.lo CC RANAP_GA-UncertaintyEllipse.lo CC RANAP_GERAN-BSC-Container.lo CC RANAP_GERAN-Cell-ID.lo CC RANAP_GERAN-Classmark.lo CC RANAP_GlobalCN-ID.lo CC RANAP_GlobalRNC-ID.lo CC RANAP_GTP-TEI.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_GA-Polygon.h:14, from RANAP_GA-Polygon.c:7: ../../include/osmocom/ranap/RANAP_GA-Polygon.h:26:23: warning: ?struct Member? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct Member { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_GA-Polygon.h:26:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct Member { ^~~~~~~~~~~~~ CC RANAP_GuaranteedBitrate.lo /bin/bash: line 1: 14914 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DPACKAGE_NAME=\"osmo-iuh\" -DPACKAGE_TARNAME=\"osmo-iuh\" -DPACKAGE_VERSION=\"0.3.0.10-9aad\" -DPACKAGE_STRING=\"osmo-iuh\ 0.3.0.10-9aad\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-iuh\" -DVERSION=\"0.3.0.10-9aad\" -DSTDC_HEADERS=1 -I. -fsanitize=address -fsanitize=undefined -Wall -I../../include -I -I -I -g -O2 -fsanitize=address -fsanitize=undefined -Wall -MT RANAP_GTP-TEI.lo -MD -MP -MF .deps/RANAP_GTP-TEI.Tpo -c -o RANAP_GTP-TEI.lo RANAP_GTP-TEI.c Makefile:2506: recipe for target 'RANAP_GTP-TEI.lo' failed make[4]: *** [RANAP_GTP-TEI.lo] Error 139 make[4]: *** Waiting for unfinished jobs.... make[4]: Leaving directory ' Makefile:642: recipe for target 'all-recursive' failed make[3]: *** [all-recursive] Error 1 make[3]: Leaving directory ' Makefile:454: recipe for target 'all' failed make[2]: *** [all] Error 2 make[2]: Leaving directory ' Makefile:458: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:382: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Oct 29 23:53:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 29 Oct 2018 23:53:12 +0000 Subject: Change in osmocom-bb[master]: layer23/common: introduce L23SAP API for L1CTL In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11246 ) Change subject: layer23/common: introduce L23SAP API for L1CTL ...................................................................... Patch Set 2: > I don't really understand what we gain from this. Sure, I can read > your statement and agree that it removes the need to have lapdm.h > included and used. But why is that a problem? > Whar are you trying to fix here? Removing 'lapdm*.h' is not the main idea of this change. The main idea is to make the code a bit more modular and cleaner. Here is a little example: Let's say I am a new developer, and I need to understand how the patch loss criteria is implemented. Where should I look? It's quite odd that I would find it in the L1CTL handling implementation. How is it related to L1CTL?!? Moreover, changing / fixing the logic of the mentioned parts (unrelated to L1CTL itself) would look like changing the L1CTL logic in the git history, because everything is mixed in a single file. -- To view, visit https://gerrit.osmocom.org/11246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I22d7932ddc03c692f2616726ced53b6e8eef822d Gerrit-Change-Number: 11246 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 29 Oct 2018 23:53:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Oct 30 00:08:42 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 30 Oct 2018 00:08:42 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-iuh_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2337?= In-Reply-To: <1473520606.295.1540856642239.JavaMail.jenkins@jenkins.osmocom.org> References: <1473520606.295.1540856642239.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1211099412.296.1540858122734.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 237.85 KB...] See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in tests make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 libosmoabis.pc libosmotrau.pc ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' + STOW_DIR= stow --restow libosmo-abis + osmo-build-dep.sh libosmo-netif =============================== libosmo-netif =============================== + mkdir -p + cd + osmo-deps.sh libosmo-netif + project=libosmo-netif + branch=master + git branch -a + grep -c remotes/origin/master$ + [ x1 != x0 ] + branch=origin/master + test -d libosmo-netif + cd libosmo-netif + 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 7028d73... jibuf: fix indentation in line inside conditional clause + git rev-parse HEAD 7028d7387efc2e0fbac403de075c4c9c2d310f80 + cd libosmo-netif + 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' examples/Makefile.am: installing './depcomp' + ./configure --prefix= --with-systemdsystemunitdir= configure: WARNING: unrecognized options: --with-systemdsystemunitdir 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 checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking execinfo.h usability... yes checking execinfo.h presence... yes checking for execinfo.h... yes checking sys/select.h usability... yes checking sys/select.h presence... yes checking for sys/select.h... yes checking sys/socket.h usability... yes checking sys/socket.h presence... yes checking for sys/socket.h... yes checking syslog.h usability... yes checking syslog.h presence... yes checking for syslog.h... yes checking ctype.h usability... yes checking ctype.h presence... yes checking for ctype.h... yes checking if gcc supports -fvisibility=hidden... yes checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for library containing sctp_send... -lsctp checking dahdi/user.h usability... no checking dahdi/user.h presence... no checking for dahdi/user.h... no configure: WARNING: DAHDI input driver will not be built checking pcap.h usability... yes checking pcap.h presence... yes checking for pcap.h... yes checking for doxygen... /usr/bin/doxygen checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-netif.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/netif/Makefile config.status: creating src/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating Doxyfile config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j 8 install echo 0.3.0.5-7028 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory ' Making install in include make[2]: Entering directory ' Making install in osmocom make[3]: Entering directory ' Making install in netif make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 amr.h datagram.h jibuf.h osmux.h ipa.h ipa_unit.h rs232.h rtp.h stream.h ' make[5]: Leaving directory ' make[4]: Leaving directory ' make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' CC amr.lo CC jibuf.lo CC datagram.lo CC rtp.lo CC ipa.lo CC ipa_unit.lo CC osmux.lo CC rs232.lo malloc: .././dispose_cmd.c:249: assertion botched free: start and end chunk sizes differ Aborting.../bin/bash: line 2: 31077 Aborted /bin/bash ../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I.. -Wall -fPIC -Wall -I -I -I -g -O2 -Wall -MT osmux.lo -MD -MP -MF $depbase.Tpo -c -o osmux.lo osmux.c Makefile:465: recipe for target 'osmux.lo' failed make[2]: *** [osmux.lo] Error 134 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:494: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:793: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Oct 30 00:09:35 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 30 Oct 2018 00:09:35 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3962?= In-Reply-To: <1704726348.294.1540856468796.JavaMail.jenkins@jenkins.osmocom.org> References: <1704726348.294.1540856468796.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1505995386.297.1540858175514.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 848.39 KB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update meas-feed destination ADDR <0-65535> meas-feed scenario NAME timer TNNNN (default|<1-65535>) neci (0|1) paging any use tch (0|1) bts <0-255> handover (0|1|default) handover algorithm (1|2|default) handover1 window rxlev averaging (<1-10>|default) handover1 window rxqual averaging (<1-10>|default) handover1 window rxlev neighbor averaging (<1-10>|default) handover1 power budget interval (<1-99>|default) handover1 power budget hysteresis (<0-999>|default) handover1 maximum distance (<0-9999>|default) handover2 window rxlev averaging (<1-10>|default) handover2 window rxqual averaging (<1-10>|default) handover2 window rxlev neighbor averaging (<1-10>|default) handover2 power budget interval (<1-99>|default) handover2 power budget hysteresis (<0-999>|default) handover2 maximum distance (<0-9999>|default) handover2 assignment (0|1|default) handover2 tdma-measurement (full|subset|default) handover2 min rxlev (<-110--50>|default) handover2 min rxqual (<0-7>|default) handover2 afs-bias rxlev (<0-20>|default) handover2 afs-bias rxqual (<0-7>|default) handover2 min-free-slots tch/f (<0-9999>|default) handover2 min-free-slots tch/h (<0-9999>|default) handover2 max-handovers (<1-9999>|default) handover2 penalty-time max-distance (<0-99999>|default) handover2 penalty-time failed-ho (<0-99999>|default) handover2 penalty-time failed-assignment (<0-99999>|default) handover2 retries (<0-9>|default) handover2 congestion-check (disabled|<1-999>|now) OsmoBSC(config-net)# meas-feed destination 127.0.0.23 4223 OsmoBSC(config-net)# meas-feed scenario foo23 OsmoBSC(config-net)# show running-config Current configuration: ! ! log stderr logging filter all 1 logging color 1 logging print category 0 logging timestamp 0 logging print file 1 logging level rll notice logging level mm notice logging level rr notice logging level rsl notice logging level nm info logging level pag notice logging level meas notice logging level msc notice logging level ho notice logging level hodec notice logging level ref notice logging level nat notice logging level ctrl notice logging level filter debug logging level pcu debug logging level lcls notice logging level chan notice logging level ts notice logging level as notice logging level lglobal notice logging level llapd notice logging level linp notice logging level lmux notice logging level lmi notice logging level lmib notice logging level lsms notice logging level lctrl notice logging level lgtp notice logging level lstats notice logging level lgsup notice logging level loap notice logging level lss7 notice logging level lsccp notice logging level lsua notice logging level lm3ua notice logging level lmgcp notice logging level ljibuf notice ! stats interval 5 ! line vty no login ! e1_input e1_line 0 driver ipa e1_line 0 port 0 no e1_line 0 keepalive cs7 instance 0 point-code 0.23.3 network network country code 901 mobile network code 70 encryption a5 1 3 neci 0 paging any use tch 0 meas-feed destination 127.0.0.23 4223 meas-feed scenario foo23 bts 0 type sysmobts band DCS1800 cell_identity 0 location_area_code 23 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 rxlev access min 0 radio-link-timeout 32 channel allocator ascending rach tx integer 9 rach max transmission 7 channel-descrption attach 1 channel-descrption bs-pa-mfrms 5 channel-descrption bs-ag-blks-res 1 no access-control-class-ramping access-control-class-ramping-step-interval dynamic access-control-class-ramping-step-size 1 early-classmark-sending forbidden early-classmark-sending-3g allowed ip.access unit_id 1800 0 oml ip.access stream_id 255 line 0 neighbor-list mode automatic codec-support fr hr efr amr amr tch-f modes 1 2 6 7 amr tch-f threshold ms 32 32 32 amr tch-f hysteresis ms 8 8 8 amr tch-f threshold bts 32 32 32 amr tch-f hysteresis bts 8 8 8 amr tch-f start-mode auto amr tch-h modes 1 2 4 5 amr tch-h threshold ms 32 32 32 amr tch-h hysteresis ms 8 8 8 amr tch-h threshold bts 32 32 32 amr tch-h hysteresis bts 8 8 8 amr tch-h start-mode auto gprs mode none no force-combined-si trx 0 rf_locked 0 arfcn 868 nominal power 23 max_power_red 0 rsl e1 tei 0 timeslot 0 phys_chan_config CCCH+SDCCH4 hopping enabled 0 timeslot 1 phys_chan_config SDCCH8 hopping enabled 0 timeslot 2 phys_chan_config TCH/F hopping enabled 0 timeslot 3 phys_chan_config TCH/F hopping enabled 0 timeslot 4 phys_chan_config TCH/F hopping enabled 0 timeslot 5 phys_chan_config TCH/F hopping enabled 0 timeslot 6 phys_chan_config TCH/F hopping enabled 0 timeslot 7 phys_chan_config TCH/F hopping enabled 0 msc 0 ip.access rtp-base 4000 no bsc-welcome-text no bsc-msc-lost-text no bsc-grace-text codec-list hr3 type normal allow-emergency deny amr-config 12_2k forbidden amr-config 10_2k forbidden amr-config 7_95k forbidden amr-config 7_40k forbidden amr-config 6_70k forbidden amr-config 5_90k allowed amr-config 5_15k forbidden amr-config 4_75k forbidden asp-protocol m3ua lcls-mode disabled lcls-codec-mismatch forbidden bsc mid-call-timeout 0 no missing-msc-text end <0004> bsc_init.c:49 shutting down OML for BTS 0 logging level cc (debug|info|notice|error|fatal) logging level mgcp (debug|info|notice|error|fatal) signal 15 received Terminating took 2.679s RESULTS: pass: ./handover_cfg.vty FAIL: ./neighbor_ident.vty pass: ./osmo-bsc.vty Makefile:696: recipe for target 'vty-test' failed make[6]: *** [vty-test] Error 1 make[6]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 make[4]: *** [check-local] Error 2 Makefile:683: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:702: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:545: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 make[2]: *** [check-recursive] Error 1 Makefile:397: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' Makefile:434: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:725: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Oct 30 00:09:54 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 30 Oct 2018 00:09:54 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3963?= In-Reply-To: <1505995386.297.1540858175514.JavaMail.jenkins@jenkins.osmocom.org> References: <1505995386.297.1540858175514.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1178166487.298.1540858194757.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 848.62 KB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update meas-feed destination ADDR <0-65535> meas-feed scenario NAME timer TNNNN (default|<1-65535>) neci (0|1) paging any use tch (0|1) bts <0-255> handover (0|1|default) handover algorithm (1|2|default) handover1 window rxlev averaging (<1-10>|default) handover1 window rxqual averaging (<1-10>|default) handover1 window rxlev neighbor averaging (<1-10>|default) handover1 power budget interval (<1-99>|default) handover1 power budget hysteresis (<0-999>|default) handover1 maximum distance (<0-9999>|default) handover2 window rxlev averaging (<1-10>|default) handover2 window rxqual averaging (<1-10>|default) handover2 window rxlev neighbor averaging (<1-10>|default) handover2 power budget interval (<1-99>|default) handover2 power budget hysteresis (<0-999>|default) handover2 maximum distance (<0-9999>|default) handover2 assignment (0|1|default) handover2 tdma-measurement (full|subset|default) handover2 min rxlev (<-110--50>|default) handover2 min rxqual (<0-7>|default) handover2 afs-bias rxlev (<0-20>|default) handover2 afs-bias rxqual (<0-7>|default) handover2 min-free-slots tch/f (<0-9999>|default) handover2 min-free-slots tch/h (<0-9999>|default) handover2 max-handovers (<1-9999>|default) handover2 penalty-time max-distance (<0-99999>|default) handover2 penalty-time failed-ho (<0-99999>|default) handover2 penalty-time failed-assignment (<0-99999>|default) handover2 retries (<0-9>|default) handover2 congestion-check (disabled|<1-999>|now) OsmoBSC(config-net)# meas-feed destination 127.0.0.23 4223 OsmoBSC(config-net)# meas-feed scenario foo23 OsmoBSC(config-net)# show running-config Current configuration: ! ! log stderr logging filter all 1 logging color 1 logging print category 0 logging timestamp 0 logging print file 1 logging level rll notice logging level mm notice logging level rr notice logging level rsl notice logging level nm info logging level pag notice logging level meas notice logging level msc notice logging level ho notice logging level hodec notice logging level ref notice logging level nat notice logging level ctrl notice logging level filter debug logging level pcu debug logging level lcls notice logging level chan notice logging level ts notice logging level as notice logging level lglobal notice logging level llapd notice logging level linp notice logging level lmux notice logging level lmi notice logging level lmib notice logging level lsms notice logging level lctrl notice logging level lgtp notice logging level lstats notice logging level lgsup notice logging level loap notice logging level lss7 notice logging level lsccp notice logging level lsua notice logging level lm3ua notice logging level lmgcp notice logging level ljibuf notice ! stats interval 5 ! line vty no login ! e1_input e1_line 0 driver ipa e1_line 0 port 0 no e1_line 0 keepalive cs7 instance 0 point-code 0.23.3 network network country code 901 mobile network code 70 encryption a5 1 3 neci 0 paging any use tch 0 meas-feed destination 127.0.0.23 4223 meas-feed scenario foo23 bts 0 type sysmobts band DCS1800 cell_identity 0 location_area_code 23 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 rxlev access min 0 radio-link-timeout 32 channel allocator ascending rach tx integer 9 rach max transmission 7 channel-descrption attach 1 channel-descrption bs-pa-mfrms 5 channel-descrption bs-ag-blks-res 1 no access-control-class-ramping access-control-class-ramping-step-interval dynamic access-control-class-ramping-step-size 1 early-classmark-sending forbidden early-classmark-sending-3g allowed ip.access unit_id 1800 0 oml ip.access stream_id 255 line 0 neighbor-list mode automatic codec-support fr hr efr amr amr tch-f modes 1 2 6 7 amr tch-f threshold ms 32 32 32 amr tch-f hysteresis ms 8 8 8 amr tch-f threshold bts 32 32 32 amr tch-f hysteresis bts 8 8 8 amr tch-f start-mode auto amr tch-h modes 1 2 4 5 amr tch-h threshold ms 32 32 32 amr tch-h hysteresis ms 8 8 8 amr tch-h threshold bts 32 32 32 amr tch-h hysteresis bts 8 8 8 amr tch-h start-mode auto gprs mode none no force-combined-si trx 0 rf_locked 0 arfcn 868 nominal power 23 max_power_red 0 rsl e1 tei 0 timeslot 0 phys_chan_config CCCH+SDCCH4 hopping enabled 0 timeslot 1 phys_chan_config SDCCH8 hopping enabled 0 timeslot 2 phys_chan_config TCH/F hopping enabled 0 timeslot 3 phys_chan_config TCH/F hopping enabled 0 timeslot 4 phys_chan_config TCH/F hopping enabled 0 timeslot 5 phys_chan_config TCH/F hopping enabled 0 timeslot 6 phys_chan_config TCH/F hopping enabled 0 timeslot 7 phys_chan_config TCH/F hopping enabled 0 msc 0 ip.access rtp-base 4000 no bsc-welcome-text no bsc-msc-lost-text no bsc-grace-text codec-list hr3 type normal allow-emergency deny amr-config 12_2k forbidden amr-config 10_2k forbidden amr-config 7_95k forbidden amr-config 7_40k forbidden amr-config 6_70k forbidden amr-config 5_90k allowed amr-config 5_15k forbidden amr-config 4_75k forbidden asp-protocol m3ua lcls-mode disabled lcls-codec-mismatch forbidden bsc mid-call-timeout 0 no missing-msc-text end <0004> bsc_init.c:49 shutting down OML for BTS 0 logging level cc (debug|info|notice|error|fatal) logging level mgcp (debug|info|notice|error|fatal) signal 15 received Terminating took 2.679s RESULTS: pass: ./handover_cfg.vty FAIL: ./neighbor_ident.vty pass: ./osmo-bsc.vty Makefile:696: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 1 Makefile:683: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 Makefile:702: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:545: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:397: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:434: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:725: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Oct 30 00:52:55 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 30 Oct 2018 00:52:55 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3964?= In-Reply-To: <1178166487.298.1540858194757.JavaMail.jenkins@jenkins.osmocom.org> References: <1178166487.298.1540858194757.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1744930320.299.1540860775901.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 847.97 KB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update meas-feed destination ADDR <0-65535> meas-feed scenario NAME timer TNNNN (default|<1-65535>) neci (0|1) paging any use tch (0|1) bts <0-255> handover (0|1|default) handover algorithm (1|2|default) handover1 window rxlev averaging (<1-10>|default) handover1 window rxqual averaging (<1-10>|default) handover1 window rxlev neighbor averaging (<1-10>|default) handover1 power budget interval (<1-99>|default) handover1 power budget hysteresis (<0-999>|default) handover1 maximum distance (<0-9999>|default) handover2 window rxlev averaging (<1-10>|default) handover2 window rxqual averaging (<1-10>|default) handover2 window rxlev neighbor averaging (<1-10>|default) handover2 power budget interval (<1-99>|default) handover2 power budget hysteresis (<0-999>|default) handover2 maximum distance (<0-9999>|default) handover2 assignment (0|1|default) handover2 tdma-measurement (full|subset|default) handover2 min rxlev (<-110--50>|default) handover2 min rxqual (<0-7>|default) handover2 afs-bias rxlev (<0-20>|default) handover2 afs-bias rxqual (<0-7>|default) handover2 min-free-slots tch/f (<0-9999>|default) handover2 min-free-slots tch/h (<0-9999>|default) handover2 max-handovers (<1-9999>|default) handover2 penalty-time max-distance (<0-99999>|default) handover2 penalty-time failed-ho (<0-99999>|default) handover2 penalty-time failed-assignment (<0-99999>|default) handover2 retries (<0-9>|default) handover2 congestion-check (disabled|<1-999>|now) OsmoBSC(config-net)# meas-feed destination 127.0.0.23 4223 OsmoBSC(config-net)# meas-feed scenario foo23 OsmoBSC(config-net)# show running-config Current configuration: ! ! log stderr logging filter all 1 logging color 1 logging print category 0 logging timestamp 0 logging print file 1 logging level rll notice logging level mm notice logging level rr notice logging level rsl notice logging level nm info logging level pag notice logging level meas notice logging level msc notice logging level ho notice logging level hodec notice logging level ref notice logging level nat notice logging level ctrl notice logging level filter debug logging level pcu debug logging level lcls notice logging level chan notice logging level ts notice logging level as notice logging level lglobal notice logging level llapd notice logging level linp notice logging level lmux notice logging level lmi notice logging level lmib notice logging level lsms notice logging level lctrl notice logging level lgtp notice logging level lstats notice logging level lgsup notice logging level loap notice logging level lss7 notice logging level lsccp notice logging level lsua notice logging level lm3ua notice logging level lmgcp notice logging level ljibuf notice ! stats interval 5 ! line vty no login ! e1_input e1_line 0 driver ipa e1_line 0 port 0 no e1_line 0 keepalive cs7 instance 0 point-code 0.23.3 network network country code 901 mobile network code 70 encryption a5 1 3 neci 0 paging any use tch 0 meas-feed destination 127.0.0.23 4223 meas-feed scenario foo23 bts 0 type sysmobts band DCS1800 cell_identity 0 location_area_code 23 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 rxlev access min 0 radio-link-timeout 32 channel allocator ascending rach tx integer 9 rach max transmission 7 channel-descrption attach 1 channel-descrption bs-pa-mfrms 5 channel-descrption bs-ag-blks-res 1 no access-control-class-ramping access-control-class-ramping-step-interval dynamic access-control-class-ramping-step-size 1 early-classmark-sending forbidden early-classmark-sending-3g allowed ip.access unit_id 1800 0 oml ip.access stream_id 255 line 0 neighbor-list mode automatic codec-support fr hr efr amr amr tch-f modes 1 2 6 7 amr tch-f threshold ms 32 32 32 amr tch-f hysteresis ms 8 8 8 amr tch-f threshold bts 32 32 32 amr tch-f hysteresis bts 8 8 8 amr tch-f start-mode auto amr tch-h modes 1 2 4 5 amr tch-h threshold ms 32 32 32 amr tch-h hysteresis ms 8 8 8 amr tch-h threshold bts 32 32 32 amr tch-h hysteresis bts 8 8 8 amr tch-h start-mode auto gprs mode none no force-combined-si trx 0 rf_locked 0 arfcn 868 nominal power 23 max_power_red 0 rsl e1 tei 0 timeslot 0 phys_chan_config CCCH+SDCCH4 hopping enabled 0 timeslot 1 phys_chan_config SDCCH8 hopping enabled 0 timeslot 2 phys_chan_config TCH/F hopping enabled 0 timeslot 3 phys_chan_config TCH/F hopping enabled 0 timeslot 4 phys_chan_config TCH/F hopping enabled 0 timeslot 5 phys_chan_config TCH/F hopping enabled 0 timeslot 6 phys_chan_config TCH/F hopping enabled 0 timeslot 7 phys_chan_config TCH/F hopping enabled 0 msc 0 ip.access rtp-base 4000 no bsc-welcome-text no bsc-msc-lost-text no bsc-grace-text codec-list hr3 type normal allow-emergency deny amr-config 12_2k forbidden amr-config 10_2k forbidden amr-config 7_95k forbidden amr-config 7_40k forbidden amr-config 6_70k forbidden amr-config 5_90k allowed amr-config 5_15k forbidden amr-config 4_75k forbidden asp-protocol m3ua lcls-mode disabled lcls-codec-mismatch forbidden bsc mid-call-timeout 0 no missing-msc-text end <0004> bsc_init.c:49 shutting down OML for BTS 0 logging level cc (debug|info|notice|error|fatal) logging level mgcp (debug|info|notice|error|fatal) signal 15 received Terminating took 2.679s RESULTS: pass: ./handover_cfg.vty FAIL: ./neighbor_ident.vty pass: ./osmo-bsc.vty Makefile:696: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 1 Makefile:683: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 make[4]: *** [check-local] Error 2 Makefile:702: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:545: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:397: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:434: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:725: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Oct 30 00:55:15 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 30 Oct 2018 00:55:15 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3965?= In-Reply-To: <1744930320.299.1540860775901.JavaMail.jenkins@jenkins.osmocom.org> References: <1744930320.299.1540860775901.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <757818784.300.1540860915995.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 847.75 KB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update meas-feed destination ADDR <0-65535> meas-feed scenario NAME timer TNNNN (default|<1-65535>) neci (0|1) paging any use tch (0|1) bts <0-255> handover (0|1|default) handover algorithm (1|2|default) handover1 window rxlev averaging (<1-10>|default) handover1 window rxqual averaging (<1-10>|default) handover1 window rxlev neighbor averaging (<1-10>|default) handover1 power budget interval (<1-99>|default) handover1 power budget hysteresis (<0-999>|default) handover1 maximum distance (<0-9999>|default) handover2 window rxlev averaging (<1-10>|default) handover2 window rxqual averaging (<1-10>|default) handover2 window rxlev neighbor averaging (<1-10>|default) handover2 power budget interval (<1-99>|default) handover2 power budget hysteresis (<0-999>|default) handover2 maximum distance (<0-9999>|default) handover2 assignment (0|1|default) handover2 tdma-measurement (full|subset|default) handover2 min rxlev (<-110--50>|default) handover2 min rxqual (<0-7>|default) handover2 afs-bias rxlev (<0-20>|default) handover2 afs-bias rxqual (<0-7>|default) handover2 min-free-slots tch/f (<0-9999>|default) handover2 min-free-slots tch/h (<0-9999>|default) handover2 max-handovers (<1-9999>|default) handover2 penalty-time max-distance (<0-99999>|default) handover2 penalty-time failed-ho (<0-99999>|default) handover2 penalty-time failed-assignment (<0-99999>|default) handover2 retries (<0-9>|default) handover2 congestion-check (disabled|<1-999>|now) OsmoBSC(config-net)# meas-feed destination 127.0.0.23 4223 OsmoBSC(config-net)# meas-feed scenario foo23 OsmoBSC(config-net)# show running-config <0004> bsc_init.c:49 shutting down OML for BTS 0  Current configuration: ! ! log stderr logging filter all 1 logging color 1 logging print category 0 logging timestamp 0 logging print file 1 logging level rll notice logging level mm notice logging level rr notice logging level rsl notice logging level nm info logging level pag notice logging level meas notice logging level msc notice logging level ho notice logging level hodec notice logging level ref notice logging level nat notice logging level ctrl notice logging level filter debug logging level pcu debug logging level lcls notice logging level chan notice logging level ts notice logging level as notice logging level lglobal notice logging level llapd notice logging level linp notice logging level lmux notice logging level lmi notice logging level lmib notice logging level lsms notice logging level lctrl notice logging level lgtp notice logging level lstats notice logging level lgsup notice logging level loap notice logging level lss7 notice logging level lsccp notice logging level lsua notice logging level lm3ua notice logging level lmgcp notice logging level ljibuf notice ! stats interval 5 ! line vty no login ! e1_input e1_line 0 driver ipa e1_line 0 port 0 no e1_line 0 keepalive cs7 instance 0 point-code 0.23.3 network network country code 901 mobile network code 70 encryption a5 1 3 neci 0 paging any use tch 0 meas-feed destination 127.0.0.23 4223 meas-feed scenario foo23 bts 0 type sysmobts band DCS1800 cell_identity 0 location_area_code 23 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 rxlev access min 0 radio-link-timeout 32 channel allocator ascending rach tx integer 9 rach max transmission 7 channel-descrption attach 1 channel-descrption bs-pa-mfrms 5 channel-descrption bs-ag-blks-res 1 no access-control-class-ramping access-control-class-ramping-step-interval dynamic access-control-class-ramping-step-size 1 early-classmark-sending forbidden early-classmark-sending-3g allowed ip.access unit_id 1800 0 oml ip.access stream_id 255 line 0 neighbor-list mode automatic codec-support fr hr efr amr amr tch-f modes 1 2 6 7 amr tch-f threshold ms 32 32 32 amr tch-f hysteresis ms 8 8 8 amr tch-f threshold bts 32 32 32 amr tch-f hysteresis bts 8 8 8 amr tch-f start-mode auto amr tch-h modes 1 2 4 5 amr tch-h threshold ms 32 32 32 amr tch-h hysteresis ms 8 8 8 amr tch-h threshold bts 32 32 32 amr tch-h hysteresis bts 8 8 8 amr tch-h start-mode auto gprs mode none no force-combined-si trx 0 rf_locked 0 arfcn 868 nominal power 23 max_power_red 0 rsl e1 tei 0 timeslot 0 phys_chan_config CCCH+SDCCH4 hopping enabled 0 timeslot 1 phys_chan_config SDCCH8 hopping enabled 0 timeslot 2 phys_chan_config TCH/F hopping enabled 0 timeslot 3 phys_chan_config TCH/F hopping enabled 0 timeslot 4 phys_chan_config TCH/F hopping enabled 0 timeslot 5 phys_chan_config TCH/F hopping enabled 0 timeslot 6 phys_chan_config TCH/F hopping enabled 0 timeslot 7 phys_chan_config TCH/F hopping enabled 0 msc 0 ip.access rtp-base 4000 no bsc-welcome-text no bsc-msc-lost-text no bsc-grace-text codec-list hr3 type normal allow-emergency deny amr-config 12_2k forbidden amr-config 10_2k forbidden amr-config 7_95k forbidden amr-config 7_40k forbidden amr-config 6_70k forbidden amr-config 5_90k allowed amr-config 5_15k forbidden amr-config 4_75k forbidden asp-protocol m3ua lcls-mode disabled lcls-codec-mismatch forbidden bsc mid-call-timeout 0 no missing-msc-text end logging level cc (debug|info|notice|error|fatal) logging level mgcp (debug|info|notice|error|fatal) signal 15 received Terminating took 2.679s RESULTS: pass: ./handover_cfg.vty FAIL: ./neighbor_ident.vty pass: ./osmo-bsc.vty Makefile:696: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' Makefile:683: recipe for target 'python-tests' failed make[6]: *** [vty-test] Error 1 make[5]: *** [python-tests] Error 2 make[5]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:702: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:545: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:397: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[1]: *** [check-recursive] Error 1 Makefile:434: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:725: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Oct 30 01:01:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 30 Oct 2018 01:01:02 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-iuh_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2338?= In-Reply-To: <1211099412.296.1540858122734.JavaMail.jenkins@jenkins.osmocom.org> References: <1211099412.296.1540858122734.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <318112507.301.1540861262800.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Tue Oct 30 06:18:12 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 30 Oct 2018 06:18:12 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3966?= In-Reply-To: <757818784.300.1540860915995.JavaMail.jenkins@jenkins.osmocom.org> References: <757818784.300.1540860915995.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1402536685.313.1540880292420.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 846.89 KB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update meas-feed destination ADDR <0-65535> meas-feed scenario NAME timer TNNNN (default|<1-65535>) neci (0|1) paging any use tch (0|1) bts <0-255> handover (0|1|default) handover algorithm (1|2|default) handover1 window rxlev averaging (<1-10>|default) handover1 window rxqual averaging (<1-10>|default) handover1 window rxlev neighbor averaging (<1-10>|default) handover1 power budget interval (<1-99>|default) handover1 power budget hysteresis (<0-999>|default) handover1 maximum distance (<0-9999>|default) handover2 window rxlev averaging (<1-10>|default) handover2 window rxqual averaging (<1-10>|default) handover2 window rxlev neighbor averaging (<1-10>|default) handover2 power budget interval (<1-99>|default) handover2 power budget hysteresis (<0-999>|default) handover2 maximum distance (<0-9999>|default) handover2 assignment (0|1|default) handover2 tdma-measurement (full|subset|default) handover2 min rxlev (<-110--50>|default) handover2 min rxqual (<0-7>|default) handover2 afs-bias rxlev (<0-20>|default) handover2 afs-bias rxqual (<0-7>|default) handover2 min-free-slots tch/f (<0-9999>|default) handover2 min-free-slots tch/h (<0-9999>|default) handover2 max-handovers (<1-9999>|default) handover2 penalty-time max-distance (<0-99999>|default) handover2 penalty-time failed-ho (<0-99999>|default) handover2 penalty-time failed-assignment (<0-99999>|default) handover2 retries (<0-9>|default) handover2 congestion-check (disabled|<1-999>|now) OsmoBSC(config-net)# meas-feed destination 127.0.0.23 4223 OsmoBSC(config-net)# meas-feed scenario foo23 OsmoBSC(config-net)# show running-config Current configuration: ! ! log stderr logging filter all 1 logging color 1 logging print category 0 logging timestamp 0 logging print file 1 logging level rll notice logging level mm notice logging level rr notice logging level rsl notice logging level nm info logging level pag notice logging level meas notice logging level msc notice logging level ho notice logging level hodec notice logging level ref notice logging level nat notice logging level ctrl notice logging level filter debug logging level pcu debug logging level lcls notice logging level chan notice logging level ts notice logging level as notice logging level lglobal notice logging level llapd notice logging level linp notice logging level lmux notice logging level lmi notice logging level lmib notice logging level lsms notice logging level lctrl notice logging level lgtp notice logging level lstats notice logging level lgsup notice logging level loap notice logging level lss7 notice logging level lsccp notice logging level lsua notice logging level lm3ua notice logging level lmgcp notice logging level ljibuf notice ! stats interval 5 ! line vty no login ! e1_input e1_line 0 driver ipa e1_line 0 port 0 no e1_line 0 keepalive cs7 instance 0 point-code 0.23.3 network network country code 901 mobile network code 70 encryption a5 1 3 neci 0 paging any use tch 0 meas-feed destination 127.0.0.23 4223 meas-feed scenario foo23 bts 0 type sysmobts band DCS1800 cell_identity 0 location_area_code 23 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 rxlev access min 0 radio-link-timeout 32 channel allocator ascending rach tx integer 9 rach max transmission 7 channel-descrption attach 1 channel-descrption bs-pa-mfrms 5 channel-descrption bs-ag-blks-res 1 no access-control-class-ramping access-control-class-ramping-step-interval dynamic access-control-class-ramping-step-size 1 early-classmark-sending forbidden early-classmark-sending-3g allowed ip.access unit_id 1800 0 oml ip.access stream_id 255 line 0 neighbor-list mode automatic codec-support fr hr efr amr amr tch-f modes 1 2 6 7 amr tch-f threshold ms 32 32 32 amr tch-f hysteresis ms 8 8 8 amr tch-f threshold bts 32 32 32 amr tch-f hysteresis bts 8 8 8 amr tch-f start-mode auto amr tch-h modes 1 2 4 5 amr tch-h threshold ms 32 32 32 amr tch-h hysteresis ms 8 8 8 amr tch-h threshold bts 32 32 32 amr tch-h hysteresis bts 8 8 8 amr tch-h start-mode auto gprs mode none no force-combined-si trx 0 rf_locked 0 arfcn 868 nominal power 23 max_power_red 0 rsl e1 tei 0 timeslot 0 phys_chan_config CCCH+SDCCH4 hopping enabled 0 timeslot 1 phys_chan_config SDCCH8 hopping enabled 0 timeslot 2 phys_chan_config TCH/F hopping enabled 0 timeslot 3 phys_chan_config TCH/F hopping enabled 0 timeslot 4 phys_chan_config TCH/F hopping enabled 0 timeslot 5 phys_chan_config TCH/F hopping enabled 0 timeslot 6 phys_chan_config TCH/F hopping enabled 0 timeslot 7 phys_chan_config TCH/F hopping enabled 0 msc 0 ip.access rtp-base 4000 no bsc-welcome-text no bsc-msc-lost-text no bsc-grace-text codec-list hr3 type normal allow-emergency deny amr-config 12_2k forbidden amr-config 10_2k forbidden amr-config 7_95k forbidden amr-config 7_40k forbidden amr-config 6_70k forbidden amr-config 5_90k allowed amr-config 5_15k forbidden amr-config 4_75k forbidden asp-protocol m3ua lcls-mode disabled lcls-codec-mismatch forbidden bsc mid-call-timeout 0 no missing-msc-text end <0004> bsc_init.c:49 shutting down OML for BTS 0 logging level cc (debug|info|notice|error|fatal) logging level mgcp (debug|info|notice|error|fatal) signal 15 received Terminating took 2.679s RESULTS: pass: ./handover_cfg.vty FAIL: ./neighbor_ident.vty pass: ./osmo-bsc.vty make[6]: *** [vty-test] Error 1 Makefile:696: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' Makefile:683: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 Makefile:702: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:545: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 make[2]: *** [check-recursive] Error 1 Makefile:397: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' Makefile:434: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:725: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Oct 30 06:29:38 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 30 Oct 2018 06:29:38 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3967?= In-Reply-To: <1402536685.313.1540880292420.JavaMail.jenkins@jenkins.osmocom.org> References: <1402536685.313.1540880292420.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <145721705.315.1540880978379.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 845.76 KB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update meas-feed destination ADDR <0-65535> meas-feed scenario NAME timer TNNNN (default|<1-65535>) neci (0|1) paging any use tch (0|1) bts <0-255> handover (0|1|default) handover algorithm (1|2|default) handover1 window rxlev averaging (<1-10>|default) handover1 window rxqual averaging (<1-10>|default) handover1 window rxlev neighbor averaging (<1-10>|default) handover1 power budget interval (<1-99>|default) handover1 power budget hysteresis (<0-999>|default) handover1 maximum distance (<0-9999>|default) handover2 window rxlev averaging (<1-10>|default) handover2 window rxqual averaging (<1-10>|default) handover2 window rxlev neighbor averaging (<1-10>|default) handover2 power budget interval (<1-99>|default) handover2 power budget hysteresis (<0-999>|default) handover2 maximum distance (<0-9999>|default) handover2 assignment (0|1|default) handover2 tdma-measurement (full|subset|default) handover2 min rxlev (<-110--50>|default) handover2 min rxqual (<0-7>|default) handover2 afs-bias rxlev (<0-20>|default) handover2 afs-bias rxqual (<0-7>|default) handover2 min-free-slots tch/f (<0-9999>|default) handover2 min-free-slots tch/h (<0-9999>|default) handover2 max-handovers (<1-9999>|default) handover2 penalty-time max-distance (<0-99999>|default) handover2 penalty-time failed-ho (<0-99999>|default) handover2 penalty-time failed-assignment (<0-99999>|default) handover2 retries (<0-9>|default) handover2 congestion-check (disabled|<1-999>|now) OsmoBSC(config-net)# meas-feed destination 127.0.0.23 4223 OsmoBSC(config-net)# meas-feed scenario foo23 OsmoBSC(config-net)# show running-config Current configuration: ! ! log stderr logging filter all 1 logging color 1 logging print category 0 logging timestamp 0 logging print file 1 logging level rll notice logging level mm notice logging level rr notice logging level rsl notice logging level nm info logging level pag notice logging level meas notice logging level msc notice logging level ho notice logging level hodec notice logging level ref notice logging level nat notice logging level ctrl notice logging level filter debug logging level pcu debug logging level lcls notice logging level chan notice logging level ts notice logging level as notice logging level lglobal notice logging level llapd notice logging level linp notice logging level lmux notice logging level lmi notice logging level lmib notice logging level lsms notice logging level lctrl notice logging level lgtp notice logging level lstats notice logging level lgsup notice logging level loap notice logging level lss7 notice logging level lsccp notice logging level lsua notice logging level lm3ua notice logging level lmgcp notice logging level ljibuf notice ! stats interval 5 ! line vty no login ! e1_input e1_line 0 driver ipa e1_line 0 port 0 no e1_line 0 keepalive cs7 instance 0 point-code 0.23.3 network network country code 901 mobile network code 70 encryption a5 1 3 neci 0 paging any use tch 0 meas-feed destination 127.0.0.23 4223 meas-feed scenario foo23 bts 0 type sysmobts band DCS1800 cell_identity 0 location_area_code 23 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 rxlev access min 0 radio-link-timeout 32 channel allocator ascending rach tx integer 9 rach max transmission 7 channel-descrption attach 1 channel-descrption bs-pa-mfrms 5 channel-descrption bs-ag-blks-res 1 no access-control-class-ramping access-control-class-ramping-step-interval dynamic access-control-class-ramping-step-size 1 early-classmark-sending forbidden early-classmark-sending-3g allowed ip.access unit_id 1800 0 oml ip.access stream_id 255 line 0 neighbor-list mode automatic codec-support fr hr efr amr amr tch-f modes 1 2 6 7 amr tch-f threshold ms 32 32 32 amr tch-f hysteresis ms 8 8 8 amr tch-f threshold bts 32 32 32 amr tch-f hysteresis bts 8 8 8 amr tch-f start-mode auto amr tch-h modes 1 2 4 5 amr tch-h threshold ms 32 32 32 amr tch-h hysteresis ms 8 8 8 amr tch-h threshold bts 32 32 32 amr tch-h hysteresis bts 8 8 8 amr tch-h start-mode auto gprs mode none no force-combined-si trx 0 rf_locked 0 arfcn 868 nominal power 23 max_power_red 0 rsl e1 tei 0 timeslot 0 phys_chan_config CCCH+SDCCH4 hopping enabled 0 timeslot 1 phys_chan_config SDCCH8 hopping enabled 0 timeslot 2 phys_chan_config TCH/F hopping enabled 0 timeslot 3 phys_chan_config TCH/F hopping enabled 0 timeslot 4 phys_chan_config TCH/F hopping enabled 0 timeslot 5 phys_chan_config TCH/F hopping enabled 0 timeslot 6 phys_chan_config TCH/F hopping enabled 0 timeslot 7 phys_chan_config TCH/F hopping enabled 0 msc 0 ip.access rtp-base 4000 no bsc-welcome-text no bsc-msc-lost-text no bsc-grace-text codec-list hr3 type normal allow-emergency deny amr-config 12_2k forbidden amr-config 10_2k forbidden amr-config 7_95k forbidden amr-config 7_40k forbidden amr-config 6_70k forbidden amr-config 5_90k allowed amr-config 5_15k forbidden amr-config 4_75k forbidden asp-protocol m3ua lcls-mode disabled lcls-codec-mismatch forbidden bsc mid-call-timeout 0 no missing-msc-text end <0004> bsc_init.c:49 shutting down OML for BTS 0 logging level cc (debug|info|notice|error|fatal) logging level mgcp (debug|info|notice|error|fatal) signal 15 received Terminating took 2.679s RESULTS: pass: ./handover_cfg.vty FAIL: ./neighbor_ident.vty pass: ./osmo-bsc.vty Makefile:696: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 1 make[5]: *** [python-tests] Error 2 Makefile:683: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:702: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:545: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:397: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:434: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:725: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Oct 30 08:34:10 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 30 Oct 2018 08:34:10 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3968?= In-Reply-To: <145721705.315.1540880978379.JavaMail.jenkins@jenkins.osmocom.org> References: <145721705.315.1540880978379.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <412553132.318.1540888450772.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 847.10 KB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update meas-feed destination ADDR <0-65535> meas-feed scenario NAME timer TNNNN (default|<1-65535>) neci (0|1) paging any use tch (0|1) bts <0-255> handover (0|1|default) handover algorithm (1|2|default) handover1 window rxlev averaging (<1-10>|default) handover1 window rxqual averaging (<1-10>|default) handover1 window rxlev neighbor averaging (<1-10>|default) handover1 power budget interval (<1-99>|default) handover1 power budget hysteresis (<0-999>|default) handover1 maximum distance (<0-9999>|default) handover2 window rxlev averaging (<1-10>|default) handover2 window rxqual averaging (<1-10>|default) handover2 window rxlev neighbor averaging (<1-10>|default) handover2 power budget interval (<1-99>|default) handover2 power budget hysteresis (<0-999>|default) handover2 maximum distance (<0-9999>|default) handover2 assignment (0|1|default) handover2 tdma-measurement (full|subset|default) handover2 min rxlev (<-110--50>|default) handover2 min rxqual (<0-7>|default) handover2 afs-bias rxlev (<0-20>|default) handover2 afs-bias rxqual (<0-7>|default) handover2 min-free-slots tch/f (<0-9999>|default) handover2 min-free-slots tch/h (<0-9999>|default) handover2 max-handovers (<1-9999>|default) handover2 penalty-time max-distance (<0-99999>|default) handover2 penalty-time failed-ho (<0-99999>|default) handover2 penalty-time failed-assignment (<0-99999>|default) handover2 retries (<0-9>|default) handover2 congestion-check (disabled|<1-999>|now) OsmoBSC(config-net)# meas-feed destination 127.0.0.23 4223 OsmoBSC(config-net)# meas-feed scenario foo23 OsmoBSC(config-net)# show running-config Current configuration: ! ! log stderr logging filter all 1 logging color 1 logging print category 0 logging timestamp 0 logging print file 1 logging level rll notice logging level mm notice logging level rr notice logging level rsl notice logging level nm info logging level pag notice logging level meas notice logging level msc notice logging level ho notice logging level hodec notice logging level ref notice logging level nat notice logging level ctrl notice logging level filter debug logging level pcu debug logging level lcls notice logging level chan notice logging level ts notice logging level as notice logging level lglobal notice logging level llapd notice logging level linp notice logging level lmux notice logging level lmi notice logging level lmib notice logging level lsms notice logging level lctrl notice logging level lgtp notice logging level lstats notice logging level lgsup notice logging level loap notice logging level lss7 notice logging level lsccp notice logging level lsua notice logging level lm3ua notice logging level lmgcp notice logging level ljibuf notice ! stats interval 5 ! line vty no login ! e1_input e1_line 0 driver ipa e1_line 0 port 0 no e1_line 0 keepalive cs7 instance 0 point-code 0.23.3 network network country code 901 mobile network code 70 encryption a5 1 3 neci 0 paging any use tch 0 meas-feed destination 127.0.0.23 4223 meas-feed scenario foo23 bts 0 type sysmobts band DCS1800 cell_identity 0 location_area_code 23 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 rxlev access min 0 radio-link-timeout 32 channel allocator ascending rach tx integer 9 rach max transmission 7 channel-descrption attach 1 channel-descrption bs-pa-mfrms 5 channel-descrption bs-ag-blks-res 1 no access-control-class-ramping access-control-class-ramping-step-interval dynamic access-control-class-ramping-step-size 1 early-classmark-sending forbidden early-classmark-sending-3g allowed ip.access unit_id 1800 0 oml ip.access stream_id 255 line 0 neighbor-list mode automatic codec-support fr hr efr amr amr tch-f modes 1 2 6 7 amr tch-f threshold ms 32 32 32 amr tch-f hysteresis ms 8 8 8 amr tch-f threshold bts 32 32 32 amr tch-f hysteresis bts 8 8 8 amr tch-f start-mode auto amr tch-h modes 1 2 4 5 amr tch-h threshold ms 32 32 32 amr tch-h hysteresis ms 8 8 8 amr tch-h threshold bts 32 32 32 amr tch-h hysteresis bts 8 8 8 amr tch-h start-mode auto gprs mode none no force-combined-si trx 0 rf_locked 0 arfcn 868 nominal power 23 max_power_red 0 rsl e1 tei 0 timeslot 0 phys_chan_config CCCH+SDCCH4 hopping enabled 0 timeslot 1 phys_chan_config SDCCH8 hopping enabled 0 timeslot 2 phys_chan_config TCH/F hopping enabled 0 timeslot 3 phys_chan_config TCH/F hopping enabled 0 timeslot 4 phys_chan_config TCH/F hopping enabled 0 timeslot 5 phys_chan_config TCH/F hopping enabled 0 timeslot 6 phys_chan_config TCH/F hopping enabled 0 timeslot 7 phys_chan_config TCH/F hopping enabled 0 msc 0 ip.access rtp-base 4000 no bsc-welcome-text no bsc-msc-lost-text no bsc-grace-text codec-list hr3 type normal allow-emergency deny amr-config 12_2k forbidden amr-config 10_2k forbidden amr-config 7_95k forbidden amr-config 7_40k forbidden amr-config 6_70k forbidden amr-config 5_90k allowed amr-config 5_15k forbidden amr-config 4_75k forbidden asp-protocol m3ua lcls-mode disabled lcls-codec-mismatch forbidden bsc mid-call-timeout 0 no missing-msc-text end <0004> bsc_init.c:49 shutting down OML for BTS 0 logging level cc (debug|info|notice|error|fatal) logging level mgcp (debug|info|notice|error|fatal) signal 15 received Terminating took 2.679s RESULTS: pass: ./handover_cfg.vty FAIL: ./neighbor_ident.vty pass: ./osmo-bsc.vty Makefile:696: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 1 Makefile:683: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 make[4]: *** [check-local] Error 2 Makefile:702: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:545: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:397: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:434: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:725: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Oct 30 08:42:03 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 30 Oct 2018 08:42:03 +0000 Subject: Change in libosmocore[master]: gsm0808: fix doxygen apidoc Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11513 Change subject: gsm0808: fix doxygen apidoc ...................................................................... gsm0808: fix doxygen apidoc The api documentation names a parametery by a different name than it is listed in the parameter list of the function. Lets make the apidoc coherent. Change-Id: Id21ed1e920fb64522a734f206efbe2871ec05b06 --- M src/gsm/gsm0808.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/11513/1 diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 9a9f70e..ad90008 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -265,7 +265,7 @@ } /*! Create BSSMAP Cipher Mode Reject message - * \param[in] reason TS 08.08 cause value + * \param[in] cause TS 08.08 cause value * \returns callee-allocated msgb with BSSMAP Cipher Mode Reject message */ struct msgb *gsm0808_create_cipher_reject(uint8_t cause) { -- To view, visit https://gerrit.osmocom.org/11513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id21ed1e920fb64522a734f206efbe2871ec05b06 Gerrit-Change-Number: 11513 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 08:42:04 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 30 Oct 2018 08:42:04 +0000 Subject: Change in libosmocore[master]: gsm0808: cosmetic: rename parameter "reason" to "cause" Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11514 Change subject: gsm0808: cosmetic: rename parameter "reason" to "cause" ...................................................................... gsm0808: cosmetic: rename parameter "reason" to "cause" The function that generates the clear command takes a parameter "reason", which is the cause code. Lets give it the name "cause" to have a coherent naming scheme that matches the other functions and the 3gpp specs. Change-Id: I7b6c15e8fa8db13deef5041095944ca1c58fb99f --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/11514/1 diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index f4fc7c4..cdbb273 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -45,7 +45,7 @@ const struct gsm0808_speech_codec_list *scl); struct msgb *gsm0808_create_reset(void); struct msgb *gsm0808_create_reset_ack(void); -struct msgb *gsm0808_create_clear_command(uint8_t reason); +struct msgb *gsm0808_create_clear_command(uint8_t cause); struct msgb *gsm0808_create_clear_complete(void); struct msgb *gsm0808_create_cipher(const struct gsm0808_encrypt_info *ei, const uint8_t *cipher_response_mode); diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index ad90008..9ccca4d 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -182,9 +182,9 @@ } /*! Create BSSMAP Clear Command message - * \param[in] reason TS 08.08 cause value + * \param[in] cause TS 08.08 cause value * \returns callee-allocated msgb with BSSMAP Clear Command message */ -struct msgb *gsm0808_create_clear_command(uint8_t reason) +struct msgb *gsm0808_create_clear_command(uint8_t cause) { struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "bssmap: clear command"); @@ -193,7 +193,7 @@ msg->l3h = msgb_tv_put(msg, BSSAP_MSG_BSS_MANAGEMENT, 4); msgb_v_put(msg, BSS_MAP_MSG_CLEAR_CMD); - msgb_tlv_put(msg, GSM0808_IE_CAUSE, 1, &reason); + msgb_tlv_put(msg, GSM0808_IE_CAUSE, 1, &cause); return msg; } -- To view, visit https://gerrit.osmocom.org/11514 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7b6c15e8fa8db13deef5041095944ca1c58fb99f Gerrit-Change-Number: 11514 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 10:46:30 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 30 Oct 2018 10:46:30 +0000 Subject: Change in osmo-sip-connector[master]: Add rate counters for call handling In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/11199 ) Change subject: Add rate counters for call handling ...................................................................... Abandoned abandoning this patch, see the issue. -- To view, visit https://gerrit.osmocom.org/11199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I6d7963266a93be631a4e0e03a39916d07a88fe01 Gerrit-Change-Number: 11199 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 11:02:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 11:02:34 +0000 Subject: Change in osmo-gsm-tester[master]: Create a "ms_driver" stub for the testsuite In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10686 ) Change subject: Create a "ms_driver" stub for the testsuite ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I586b6d532c6e6395b4e6f2cf2128372237d05a7d Gerrit-Change-Number: 10686 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 30 Oct 2018 11:02:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 12:22:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 12:22:38 +0000 Subject: Change in osmo-gsm-tester[master]: suits: Rename netreg_mass to nitb_netreg_mass Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11515 Change subject: suits: Rename netreg_mass to nitb_netreg_mass ...................................................................... suits: Rename netreg_mass to nitb_netreg_mass Change-Id: I5a83f5fd984084e8050edbb4d8224c1ba1d756c8 --- R suites/nitb_netreg_mass/register_default_mass.py R suites/nitb_netreg_mass/suite.conf 2 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/15/11515/1 diff --git a/suites/netreg_mass/register_default_mass.py b/suites/nitb_netreg_mass/register_default_mass.py similarity index 100% rename from suites/netreg_mass/register_default_mass.py rename to suites/nitb_netreg_mass/register_default_mass.py diff --git a/suites/netreg_mass/suite.conf b/suites/nitb_netreg_mass/suite.conf similarity index 100% rename from suites/netreg_mass/suite.conf rename to suites/nitb_netreg_mass/suite.conf -- To view, visit https://gerrit.osmocom.org/11515 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5a83f5fd984084e8050edbb4d8224c1ba1d756c8 Gerrit-Change-Number: 11515 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 12:22:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 12:22:39 +0000 Subject: Change in osmo-gsm-tester[master]: Integrate mass LU test to run fine under osmo-gsm-tester Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11516 Change subject: Integrate mass LU test to run fine under osmo-gsm-tester ...................................................................... Integrate mass LU test to run fine under osmo-gsm-tester Change-Id: I6748fce6ca25c7d4daedafe87b6b77c471d17bf9 --- M src/osmo_gsm_tester/ms_driver.py M src/osmo_ms_driver/location_update_test.py M src/osmo_ms_driver/starter.py 3 files changed, 67 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/16/11516/1 diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py index 808989e..d23defc 100644 --- a/src/osmo_gsm_tester/ms_driver.py +++ b/src/osmo_gsm_tester/ms_driver.py @@ -62,8 +62,8 @@ self._test_duration = timedelta(seconds=120) self._cdf = cdfs["ease_in_out"](self._time_start, self._time_step) self._loop = SimpleLoop() - self._suite_run.remember_to_stop(self) self._test_case = None + self.event_server_sk_tmp_dir = None if len(self.event_server_path().encode()) > 107: raise log.Error('Path for event_server socket is longer than max allowed len for unix socket path (107):', self.event_server_path()) @@ -82,7 +82,7 @@ self._ev_server = EventServer("ev_server", event_server_path) self._ev_server.listen(self._loop) - self._test_case = MassUpdateLocationTest("mass", self._num_ms, self._cdf, self._ev_server, self.event_server_sk_tmp_dir) + self._test_case = MassUpdateLocationTest(self._suite_run, "mass", self._num_ms, self._cdf, self._ev_server, self.event_server_sk_tmp_dir) # TODO: We should pass subscribers down to the test and not get it from # there. diff --git a/src/osmo_ms_driver/location_update_test.py b/src/osmo_ms_driver/location_update_test.py index 010c278..07f90de 100644 --- a/src/osmo_ms_driver/location_update_test.py +++ b/src/osmo_ms_driver/location_update_test.py @@ -56,8 +56,9 @@ TEMPLATE_LUA = "osmo-mobile-lu.lua" TEMPLATE_CFG = "osmo-mobile.cfg" - def __init__(self, name, number_of_ms, cdf_function, event_server, tmp_dir): + def __init__(self, suite_run, name, number_of_ms, cdf_function, event_server, tmp_dir): super().__init__(log.C_RUN, name) + self._suite_run = suite_run self._number_of_ms = number_of_ms self._cdf = cdf_function self._cdf.set_target(number_of_ms) @@ -71,10 +72,10 @@ for i in range(0, number_of_ms): ms_name = "%.5d" % i - phy = OsmoVirtPhy(ms_name, tmp_dir) + phy = OsmoVirtPhy(self._suite_run, ms_name, tmp_dir) self._phys.append(phy) - launcher = OsmoMobile(ms_name, tmp_dir, self.TEMPLATE_LUA, + launcher = OsmoMobile(self._suite_run, ms_name, tmp_dir, self.TEMPLATE_LUA, self.TEMPLATE_CFG, imsi_gen, phy.phy_filename(), event_server.server_path()) diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py index 86ad446..5790df3 100644 --- a/src/osmo_ms_driver/starter.py +++ b/src/osmo_ms_driver/starter.py @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from osmo_gsm_tester import log, template +from osmo_gsm_tester import log, template, process, util import os import os.path @@ -27,18 +27,20 @@ #_devnull = open('/dev/stdout', 'w') class Launcher(log.Origin): - def __init__(self, base_name, name_number, tmp_dir): - super().__init__(log.C_RUN, "{}/{}".format(base_name, name_number)) + def __init__(self, suite_run, base_name, name_number, tmp_dir): + super().__init__(log.C_RUN, "{}_{}".format(base_name, name_number)) self._name_number = name_number self._tmp_dir = tmp_dir + self.suite_run = suite_run def name_number(self): return self._name_number class OsmoVirtPhy(Launcher): - def __init__(self, name_number, tmp_dir): - super().__init__("osmo-ms-virt-phy", name_number, tmp_dir) + def __init__(self, suite_run, name_number, tmp_dir): + super().__init__(suite_run, "osmo-ms-virt-phy", name_number, tmp_dir) self._phy_filename = os.path.join(self._tmp_dir, "osmocom_l2_" + self._name_number) + self._vphy_proc = None def phy_filename(self): return self._phy_filename @@ -47,10 +49,30 @@ if len(self._phy_filename.encode()) > 107: raise log.Error('Path for unix socket is longer than max allowed len for unix socket path (107):', self._phy_filename) - self.log("Starting virtphy process") - args = ["virtphy", "--l1ctl-sock=" + self._phy_filename] - self.log(' '.join(args)) - self._vphy_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull) + self.log('Starting virtphy') + self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) + + inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmocom-bb'))) + + binary = inst.child('bin', 'virtphy') + if not os.path.isfile(binary): + raise RuntimeError('Binary missing: %r' % binary) + lib = inst.child('lib') + if not os.path.isdir(lib): + raise RuntimeError('No lib/ in %r' % inst) + + #pcap_recorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), None, + # 'host %s and port not 22' % self.addr()) + + env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } + + self.dbg(run_dir=self.run_dir, binary=binary, env=env) + self._vphy_proc = process.Process(self.name(), self.run_dir, + (binary, "--l1ctl-sock=" + self._phy_filename), + env=env) + self.suite_run.remember_to_stop(self._vphy_proc) + # TODO: Add some way to set Process stderr and stdout to NULL + self._vphy_proc.launch() def verify_ready(self): while True: @@ -61,17 +83,18 @@ def kill(self): """Clean up things.""" if self._vphy_proc: - self._vphy_proc.kill() + self._vphy_proc.terminate() class OsmoMobile(Launcher): - def __init__(self, name_number, tmp_dir, lua_tmpl, cfg_tmpl, imsi_ki_generator, phy_filename, ev_server_path): - super().__init__("osmo-ms-mob", name_number, tmp_dir) + def __init__(self, suite_run, name_number, tmp_dir, lua_tmpl, cfg_tmpl, imsi_ki_generator, phy_filename, ev_server_path): + super().__init__(suite_run, "osmo-ms-mob", name_number, tmp_dir) self._lua_template = lua_tmpl self._cfg_template = cfg_tmpl self._imsi_ki_generator = imsi_ki_generator self._phy_filename = phy_filename self._ev_server_path = ev_server_path self._imsi, self._ki = next(self._imsi_ki_generator) + self._omob_proc = None def imsi(self): return self._imsi @@ -113,13 +136,33 @@ lua_filename = self.write_lua_cfg() mob_filename = self.write_mob_cfg(lua_filename, self._phy_filename) - self.log("Starting process") - # Let the kernel pick an unused port for the VTY. - args = ["mobile", "-c", mob_filename, "--vty-port=0"] - self.log(' '.join(args)) - self._omob_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull) + + self.log('Starting mobile') + self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) + + inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmocom-bb'))) + + binary = inst.child('bin', 'mobile') + if not os.path.isfile(binary): + raise RuntimeError('Binary missing: %r' % binary) + lib = inst.child('lib') + if not os.path.isdir(lib): + raise RuntimeError('No lib/ in %r' % inst) + + #pcap_recorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), None, + # 'host %s and port not 22' % self.addr()) + + env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } + + self.dbg(run_dir=self.run_dir, binary=binary, env=env) + self._omob_proc = process.Process(self.name(), self.run_dir, + (binary, "-c", mob_filename, "--vty-port=0"), + env=env) + self.suite_run.remember_to_stop(self._omob_proc) + # TODO: Add some way to set Process stderr and stdout to NULL + self._omob_proc.launch() def kill(self): """Clean up things.""" if self._omob_proc: - self._omob_proc.kill() + self._omob_proc.terminate() -- To view, visit https://gerrit.osmocom.org/11516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6748fce6ca25c7d4daedafe87b6b77c471d17bf9 Gerrit-Change-Number: 11516 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 12:22:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 12:22:39 +0000 Subject: Change in osmo-gsm-tester[master]: WIP: HACK to integrate suite_run in osmo_ms_driver Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11517 Change subject: WIP: HACK to integrate suite_run in osmo_ms_driver ...................................................................... WIP: HACK to integrate suite_run in osmo_ms_driver Template system still need to be ported to osmo-gsm-tester one, and Loop needs to be moved to EventLoop. Change-Id: Ic84a549f2fbe5fc0700f501a5e08dbaa9f5cbb78 --- M src/osmo_ms_driver/__main__.py 1 file changed, 30 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/17/11517/1 diff --git a/src/osmo_ms_driver/__main__.py b/src/osmo_ms_driver/__main__.py index 1573084..8fcd154 100644 --- a/src/osmo_ms_driver/__main__.py +++ b/src/osmo_ms_driver/__main__.py @@ -50,6 +50,8 @@ parser.add_argument('-m', '--number-ms', dest="num_ms", default=10, type=int, help="Number of MobileStations to simulate") + parser.add_argument('trial_package', + help='Directory containing binaries to test') return parser def main(): @@ -61,35 +63,42 @@ # We don't care what is happening to child processes we spawn! signal.signal(signal.SIGCHLD, signal.SIG_IGN) - loop = SimpleLoop() + with trial.Trial(args.trial_package) as current_trial: + current_trial.verify() + suite_scenario_str, suite_def, scenarios = suite.load_suite_scenario_str("nitb_netreg_mass") + current_trial.add_suite_run(suite_scenario_str, suite_def, scenarios) + #current_trial.run_suites(test_names) + suite_run = current_trial.suites[0] - tmp_dir = tempfile.mkdtemp(suffix="osmo-ms-driver") - log.log("Going to store files in ", tmp_dir=tmp_dir) + loop = SimpleLoop() - # How long should starting all apps take - time_start=datetime.timedelta(seconds=args.launch_duration) - # In which steps to start processes - time_step=datetime.timedelta(milliseconds=args.launch_interval) + tmp_dir = tempfile.mkdtemp(suffix="osmo-ms-driver") + log.log("Going to store files in ", tmp_dir=tmp_dir) - # Event server path - event_server_path = os.path.join(tmp_dir, "osmo_ms_driver.unix") + # How long should starting all apps take + time_start=datetime.timedelta(seconds=args.launch_duration) + # In which steps to start processes + time_step=datetime.timedelta(milliseconds=args.launch_interval) - # The function that decides when to start something - cdf = cdfs[args.cdf_name](time_start, time_step) + # Event server path + event_server_path = os.path.join(tmp_dir, "osmo_ms_driver.unix") - # Event server to handle MS->test events - ev_server = EventServer("ev_server", event_server_path) - ev_server.listen(loop) + # The function that decides when to start something + cdf = cdfs[args.cdf_name](time_start, time_step) - # Just a single test for now. - test = MassUpdateLocationTest("lu_test", args.num_ms, cdf, ev_server, tmp_dir) - atexit.register(test.stop_all) + # Event server to handle MS->test events + ev_server = EventServer("ev_server", event_server_path) + ev_server.listen(loop) - # Run until everything has been launched - test.run_test(loop, timedelta(seconds=args.test_duration)) + # Just a single test for now. + test = MassUpdateLocationTest(suite_run, "lu_test", args.num_ms, cdf, ev_server, tmp_dir) + atexit.register(test.stop_all) - # Print stats - test.print_stats() + # Run until everything has been launched + test.run_test(loop, timedelta(seconds=args.test_duration)) + + # Print stats + test.print_stats() if __name__ == '__main__': main() -- To view, visit https://gerrit.osmocom.org/11517 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic84a549f2fbe5fc0700f501a5e08dbaa9f5cbb78 Gerrit-Change-Number: 11517 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 12:24:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 30 Oct 2018 12:24:54 +0000 Subject: Change in libosmocore[master]: gsm0808: fix doxygen apidoc In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11513 ) Change subject: gsm0808: fix doxygen apidoc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id21ed1e920fb64522a734f206efbe2871ec05b06 Gerrit-Change-Number: 11513 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 30 Oct 2018 12:24:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 12:25:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 30 Oct 2018 12:25:13 +0000 Subject: Change in libosmocore[master]: gsm0808: cosmetic: rename parameter "reason" to "cause" In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11514 ) Change subject: gsm0808: cosmetic: rename parameter "reason" to "cause" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11514 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7b6c15e8fa8db13deef5041095944ca1c58fb99f Gerrit-Change-Number: 11514 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 30 Oct 2018 12:25:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 12:25:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 30 Oct 2018 12:25:16 +0000 Subject: Change in libosmocore[master]: gsm0808: fix doxygen apidoc In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11513 ) Change subject: gsm0808: fix doxygen apidoc ...................................................................... gsm0808: fix doxygen apidoc The api documentation names a parametery by a different name than it is listed in the parameter list of the function. Lets make the apidoc coherent. Change-Id: Id21ed1e920fb64522a734f206efbe2871ec05b06 --- M src/gsm/gsm0808.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 9a9f70e..ad90008 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -265,7 +265,7 @@ } /*! Create BSSMAP Cipher Mode Reject message - * \param[in] reason TS 08.08 cause value + * \param[in] cause TS 08.08 cause value * \returns callee-allocated msgb with BSSMAP Cipher Mode Reject message */ struct msgb *gsm0808_create_cipher_reject(uint8_t cause) { -- To view, visit https://gerrit.osmocom.org/11513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id21ed1e920fb64522a734f206efbe2871ec05b06 Gerrit-Change-Number: 11513 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 12:25:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 30 Oct 2018 12:25:16 +0000 Subject: Change in libosmocore[master]: gsm0808: cosmetic: rename parameter "reason" to "cause" In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11514 ) Change subject: gsm0808: cosmetic: rename parameter "reason" to "cause" ...................................................................... gsm0808: cosmetic: rename parameter "reason" to "cause" The function that generates the clear command takes a parameter "reason", which is the cause code. Lets give it the name "cause" to have a coherent naming scheme that matches the other functions and the 3gpp specs. Change-Id: I7b6c15e8fa8db13deef5041095944ca1c58fb99f --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index f4fc7c4..cdbb273 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -45,7 +45,7 @@ const struct gsm0808_speech_codec_list *scl); struct msgb *gsm0808_create_reset(void); struct msgb *gsm0808_create_reset_ack(void); -struct msgb *gsm0808_create_clear_command(uint8_t reason); +struct msgb *gsm0808_create_clear_command(uint8_t cause); struct msgb *gsm0808_create_clear_complete(void); struct msgb *gsm0808_create_cipher(const struct gsm0808_encrypt_info *ei, const uint8_t *cipher_response_mode); diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index ad90008..9ccca4d 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -182,9 +182,9 @@ } /*! Create BSSMAP Clear Command message - * \param[in] reason TS 08.08 cause value + * \param[in] cause TS 08.08 cause value * \returns callee-allocated msgb with BSSMAP Clear Command message */ -struct msgb *gsm0808_create_clear_command(uint8_t reason) +struct msgb *gsm0808_create_clear_command(uint8_t cause) { struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "bssmap: clear command"); @@ -193,7 +193,7 @@ msg->l3h = msgb_tv_put(msg, BSSAP_MSG_BSS_MANAGEMENT, 4); msgb_v_put(msg, BSS_MAP_MSG_CLEAR_CMD); - msgb_tlv_put(msg, GSM0808_IE_CAUSE, 1, &reason); + msgb_tlv_put(msg, GSM0808_IE_CAUSE, 1, &cause); return msg; } -- To view, visit https://gerrit.osmocom.org/11514 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7b6c15e8fa8db13deef5041095944ca1c58fb99f Gerrit-Change-Number: 11514 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 12:27:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 12:27:06 +0000 Subject: Change in osmo-gsm-tester[master]: Integrate mass LU test to run fine under osmo-gsm-tester In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11516 ) Change subject: Integrate mass LU test to run fine under osmo-gsm-tester ...................................................................... Patch Set 2: Hi Holger. First of all sorry for taking long time to take care of this patchset, I kind of lost it (doesn't show up in my "incoming review" section despite I am assigned to it). In this patch I did some changes required to run the test fine under normal osmo-gsm-tester setup. Next patch is some required changes I guess are needed to run them standalone, but I didn't try it. Best would be to slowly move everything under osmo-gsm-tester setup if possible. -- To view, visit https://gerrit.osmocom.org/11516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6748fce6ca25c7d4daedafe87b6b77c471d17bf9 Gerrit-Change-Number: 11516 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 30 Oct 2018 12:27:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 12:28:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 12:28:35 +0000 Subject: Change in osmo-gsm-tester[master]: utils: Introduce show_usb_device.py In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11460 ) Change subject: utils: Introduce show_usb_device.py ...................................................................... Patch Set 3: I changed the Author of this commit as requested, so I guess it can be +1 or +2 now. -- To view, visit https://gerrit.osmocom.org/11460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iec049e2d56d61ecd50b65b64d95d69641fa0f8be Gerrit-Change-Number: 11460 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 30 Oct 2018 12:28:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 12:34:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 12:34:00 +0000 Subject: Change in osmo-dev[master]: 3G+2G.deps: add osmo-trx In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11389 ) Change subject: 3G+2G.deps: add osmo-trx ...................................................................... Patch Set 2: Code-Review+1 I don't seem to have +2 in this repo. -- To view, visit https://gerrit.osmocom.org/11389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia4ebf2732694cee0600b602b82c660cf6278958d Gerrit-Change-Number: 11389 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 30 Oct 2018 12:34:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 12:34:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 12:34:40 +0000 Subject: Change in osmo-dev[master]: gen_makefile.py: detect changes in cpp files In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11434 ) Change subject: gen_makefile.py: detect changes in cpp files ...................................................................... Patch Set 1: Code-Review+1 I don't have +2 here. -- To view, visit https://gerrit.osmocom.org/11434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9382d984fa1988eefbb6be3e45d88b2f1f5b598a Gerrit-Change-Number: 11434 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 30 Oct 2018 12:34:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Oct 30 12:42:26 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 30 Oct 2018 12:42:26 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3969?= In-Reply-To: <412553132.318.1540888450772.JavaMail.jenkins@jenkins.osmocom.org> References: <412553132.318.1540888450772.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1139373457.321.1540903346456.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 848.59 KB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update meas-feed destination ADDR <0-65535> meas-feed scenario NAME timer TNNNN (default|<1-65535>) neci (0|1) paging any use tch (0|1) bts <0-255> handover (0|1|default) handover algorithm (1|2|default) handover1 window rxlev averaging (<1-10>|default) handover1 window rxqual averaging (<1-10>|default) handover1 window rxlev neighbor averaging (<1-10>|default) handover1 power budget interval (<1-99>|default) handover1 power budget hysteresis (<0-999>|default) handover1 maximum distance (<0-9999>|default) handover2 window rxlev averaging (<1-10>|default) handover2 window rxqual averaging (<1-10>|default) handover2 window rxlev neighbor averaging (<1-10>|default) handover2 power budget interval (<1-99>|default) handover2 power budget hysteresis (<0-999>|default) handover2 maximum distance (<0-9999>|default) handover2 assignment (0|1|default) handover2 tdma-measurement (full|subset|default) handover2 min rxlev (<-110--50>|default) handover2 min rxqual (<0-7>|default) handover2 afs-bias rxlev (<0-20>|default) handover2 afs-bias rxqual (<0-7>|default) handover2 min-free-slots tch/f (<0-9999>|default) handover2 min-free-slots tch/h (<0-9999>|default) handover2 max-handovers (<1-9999>|default) handover2 penalty-time max-distance (<0-99999>|default) handover2 penalty-time failed-ho (<0-99999>|default) handover2 penalty-time failed-assignment (<0-99999>|default) handover2 retries (<0-9>|default) handover2 congestion-check (disabled|<1-999>|now) OsmoBSC(config-net)# meas-feed destination 127.0.0.23 4223 OsmoBSC(config-net)# meas-feed scenario foo23 OsmoBSC(config-net)# show running-config Current configuration: ! ! log stderr logging filter all 1 logging color 1 logging print category 0 logging timestamp 0 logging print file 1 logging level rll notice logging level mm notice logging level rr notice logging level rsl notice logging level nm info logging level pag notice logging level meas notice logging level msc notice logging level ho notice logging level hodec notice logging level ref notice logging level nat notice logging level ctrl notice logging level filter debug logging level pcu debug logging level lcls notice logging level chan notice logging level ts notice logging level as notice logging level lglobal notice logging level llapd notice logging level linp notice logging level lmux notice logging level lmi notice logging level lmib notice logging level lsms notice logging level lctrl notice logging level lgtp notice logging level lstats notice logging level lgsup notice logging level loap notice logging level lss7 notice logging level lsccp notice logging level lsua notice logging level lm3ua notice logging level lmgcp notice logging level ljibuf notice ! stats interval 5 ! line vty no login ! e1_input e1_line 0 driver ipa e1_line 0 port 0 no e1_line 0 keepalive cs7 instance 0 point-code 0.23.3 network network country code 901 mobile network code 70 encryption a5 1 3 neci 0 paging any use tch 0 meas-feed destination 127.0.0.23 4223 meas-feed scenario foo23 bts 0 type sysmobts band DCS1800 cell_identity 0 location_area_code 23 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 rxlev access min 0 radio-link-timeout 32 channel allocator ascending rach tx integer 9 rach max transmission 7 channel-descrption attach 1 channel-descrption bs-pa-mfrms 5 channel-descrption bs-ag-blks-res 1 no access-control-class-ramping access-control-class-ramping-step-interval dynamic access-control-class-ramping-step-size 1 early-classmark-sending forbidden early-classmark-sending-3g allowed ip.access unit_id 1800 0 oml ip.access stream_id 255 line 0 neighbor-list mode automatic codec-support fr hr efr amr amr tch-f modes 1 2 6 7 amr tch-f threshold ms 32 32 32 amr tch-f hysteresis ms 8 8 8 amr tch-f threshold bts 32 32 32 amr tch-f hysteresis bts 8 8 8 amr tch-f start-mode auto amr tch-h modes 1 2 4 5 amr tch-h threshold ms 32 32 32 amr tch-h hysteresis ms 8 8 8 amr tch-h threshold bts 32 32 32 amr tch-h hysteresis bts 8 8 8 amr tch-h start-mode auto gprs mode none no force-combined-si trx 0 rf_locked 0 arfcn 868 nominal power 23 max_power_red 0 rsl e1 tei 0 timeslot 0 phys_chan_config CCCH+SDCCH4 hopping enabled 0 timeslot 1 phys_chan_config SDCCH8 hopping enabled 0 timeslot 2 phys_chan_config TCH/F hopping enabled 0 timeslot 3 phys_chan_config TCH/F hopping enabled 0 timeslot 4 phys_chan_config TCH/F hopping enabled 0 timeslot 5 phys_chan_config TCH/F hopping enabled 0 timeslot 6 phys_chan_config TCH/F hopping enabled 0 timeslot 7 phys_chan_config TCH/F hopping enabled 0 msc 0 ip.access rtp-base 4000 no bsc-welcome-text no bsc-msc-lost-text no bsc-grace-text codec-list hr3 type normal allow-emergency deny amr-config 12_2k forbidden amr-config 10_2k forbidden amr-config 7_95k forbidden amr-config 7_40k forbidden amr-config 6_70k forbidden amr-config 5_90k allowed amr-config 5_15k forbidden amr-config 4_75k forbidden asp-protocol m3ua lcls-mode disabled lcls-codec-mismatch forbidden bsc mid-call-timeout 0 no missing-msc-text end <0004> bsc_init.c:49 shutting down OML for BTS 0 logging level cc (debug|info|notice|error|fatal) logging level mgcp (debug|info|notice|error|fatal) signal 15 received Terminating took 2.679s RESULTS: pass: ./handover_cfg.vty FAIL: ./neighbor_ident.vty pass: ./osmo-bsc.vty Makefile:696: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' Makefile:683: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 1 make[5]: *** [python-tests] Error 2 make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:702: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:545: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:397: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' Makefile:434: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:725: recipe for target 'check' failed make[1]: *** [check-recursive] Error 1 make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Oct 30 12:44:14 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 30 Oct 2018 12:44:14 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3970?= In-Reply-To: <1139373457.321.1540903346456.JavaMail.jenkins@jenkins.osmocom.org> References: <1139373457.321.1540903346456.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1504997986.322.1540903454486.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 848.56 KB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update meas-feed destination ADDR <0-65535> meas-feed scenario NAME timer TNNNN (default|<1-65535>) neci (0|1) paging any use tch (0|1) bts <0-255> handover (0|1|default) handover algorithm (1|2|default) handover1 window rxlev averaging (<1-10>|default) handover1 window rxqual averaging (<1-10>|default) handover1 window rxlev neighbor averaging (<1-10>|default) handover1 power budget interval (<1-99>|default) handover1 power budget hysteresis (<0-999>|default) handover1 maximum distance (<0-9999>|default) handover2 window rxlev averaging (<1-10>|default) handover2 window rxqual averaging (<1-10>|default) handover2 window rxlev neighbor averaging (<1-10>|default) handover2 power budget interval (<1-99>|default) handover2 power budget hysteresis (<0-999>|default) handover2 maximum distance (<0-9999>|default) handover2 assignment (0|1|default) handover2 tdma-measurement (full|subset|default) handover2 min rxlev (<-110--50>|default) handover2 min rxqual (<0-7>|default) handover2 afs-bias rxlev (<0-20>|default) handover2 afs-bias rxqual (<0-7>|default) handover2 min-free-slots tch/f (<0-9999>|default) handover2 min-free-slots tch/h (<0-9999>|default) handover2 max-handovers (<1-9999>|default) handover2 penalty-time max-distance (<0-99999>|default) handover2 penalty-time failed-ho (<0-99999>|default) handover2 penalty-time failed-assignment (<0-99999>|default) handover2 retries (<0-9>|default) handover2 congestion-check (disabled|<1-999>|now) OsmoBSC(config-net)# meas-feed destination 127.0.0.23 4223 OsmoBSC(config-net)# meas-feed scenario foo23 OsmoBSC(config-net)# show running-config Current configuration: ! ! log stderr logging filter all 1 logging color 1 logging print category 0 logging timestamp 0 logging print file 1 logging level rll notice logging level mm notice logging level rr notice logging level rsl notice logging level nm info logging level pag notice logging level meas notice logging level msc notice logging level ho notice logging level hodec notice logging level ref notice logging level nat notice logging level ctrl notice logging level filter debug logging level pcu debug logging level lcls notice logging level chan notice logging level ts notice logging level as notice logging level lglobal notice logging level llapd notice logging level linp notice logging level lmux notice logging level lmi notice logging level lmib notice logging level lsms notice logging level lctrl notice logging level lgtp notice logging level lstats notice logging level lgsup notice logging level loap notice logging level lss7 notice logging level lsccp notice logging level lsua notice logging level lm3ua notice logging level lmgcp notice logging level ljibuf notice ! stats interval 5 ! line vty no login ! e1_input e1_line 0 driver ipa e1_line 0 port 0 no e1_line 0 keepalive cs7 instance 0 point-code 0.23.3 network network country code 901 mobile network code 70 encryption a5 1 3 neci 0 paging any use tch 0 meas-feed destination 127.0.0.23 4223 meas-feed scenario foo23 bts 0 type sysmobts band DCS1800 cell_identity 0 location_area_code 23 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 rxlev access min 0 radio-link-timeout 32 channel allocator ascending rach tx integer 9 rach max transmission 7 channel-descrption attach 1 channel-descrption bs-pa-mfrms 5 channel-descrption bs-ag-blks-res 1 no access-control-class-ramping access-control-class-ramping-step-interval dynamic access-control-class-ramping-step-size 1 early-classmark-sending forbidden early-classmark-sending-3g allowed ip.access unit_id 1800 0 oml ip.access stream_id 255 line 0 neighbor-list mode automatic codec-support fr hr efr amr amr tch-f modes 1 2 6 7 amr tch-f threshold ms 32 32 32 amr tch-f hysteresis ms 8 8 8 amr tch-f threshold bts 32 32 32 amr tch-f hysteresis bts 8 8 8 amr tch-f start-mode auto amr tch-h modes 1 2 4 5 amr tch-h threshold ms 32 32 32 amr tch-h hysteresis ms 8 8 8 amr tch-h threshold bts 32 32 32 amr tch-h hysteresis bts 8 8 8 amr tch-h start-mode auto gprs mode none no force-combined-si trx 0 rf_locked 0 arfcn 868 nominal power 23 max_power_red 0 rsl e1 tei 0 timeslot 0 phys_chan_config CCCH+SDCCH4 hopping enabled 0 timeslot 1 phys_chan_config SDCCH8 hopping enabled 0 timeslot 2 phys_chan_config TCH/F hopping enabled 0 timeslot 3 phys_chan_config TCH/F hopping enabled 0 timeslot 4 phys_chan_config TCH/F hopping enabled 0 timeslot 5 phys_chan_config TCH/F hopping enabled 0 timeslot 6 phys_chan_config TCH/F hopping enabled 0 timeslot 7 phys_chan_config TCH/F hopping enabled 0 msc 0 ip.access rtp-base 4000 no bsc-welcome-text no bsc-msc-lost-text no bsc-grace-text codec-list hr3 type normal allow-emergency deny amr-config 12_2k forbidden amr-config 10_2k forbidden amr-config 7_95k forbidden amr-config 7_40k forbidden amr-config 6_70k forbidden amr-config 5_90k allowed amr-config 5_15k forbidden amr-config 4_75k forbidden asp-protocol m3ua lcls-mode disabled lcls-codec-mismatch forbidden bsc mid-call-timeout 0 no missing-msc-text end <0004> bsc_init.c:49 shutting down OML for BTS 0 logging level cc (debug|info|notice|error|fatal) logging level mgcp (debug|info|notice|error|fatal) signal 15 received Terminating took 2.679s RESULTS: pass: ./handover_cfg.vty FAIL: ./neighbor_ident.vty pass: ./osmo-bsc.vty Makefile:696: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 1 Makefile:683: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 make[4]: *** [check-local] Error 2 Makefile:702: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:545: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:397: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[1]: *** [check-recursive] Error 1 Makefile:434: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make: *** [check] Error 2 Makefile:725: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Oct 30 12:44:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 12:44:29 +0000 Subject: Change in osmo-msc[master]: Fix VLR test macro In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/6296 ) Change subject: Fix VLR test macro ...................................................................... Patch Set 7: If there's a clear required purpose for this please explain, otherwise we can abandon the patch. -- To view, visit https://gerrit.osmocom.org/6296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I36ae1f9bb395921dc2c5a39e35fbb8040ba47213 Gerrit-Change-Number: 6296 Gerrit-PatchSet: 7 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: neels Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 30 Oct 2018 12:44:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 12:47:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 12:47:42 +0000 Subject: Change in osmo-mgw[master]: mgcp_protocol: increase buffer space for codec name in LCO In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11466 ) Change subject: mgcp_protocol: increase buffer space for codec name in LCO ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11466 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I17ce7acde1f23ab1394227d74214fe2a55cd2264 Gerrit-Change-Number: 11466 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 30 Oct 2018 12:47:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 12:54:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 12:54:12 +0000 Subject: Change in libosmo-sccp[master]: vty: SCCP timers: add optional units In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11130 ) Change subject: vty: SCCP timers: add optional units ...................................................................... Patch Set 2: (1 comment) I remember reading an argument against this patch regarding being different from how we handle timers in rest of osmocom code (like we always use seconds and that's all). Do we really need less-than-a-second resolution? https://gerrit.osmocom.org/#/c/11130/2/src/sccp_vty.c File src/sccp_vty.c: https://gerrit.osmocom.org/#/c/11130/2/src/sccp_vty.c at 170 PS2, Line 170: whitespace -- To view, visit https://gerrit.osmocom.org/11130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I020d5dab19bc67e8444ed548db15b2a4d8871a9c Gerrit-Change-Number: 11130 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 30 Oct 2018 12:54:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 13:02:20 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 30 Oct 2018 13:02:20 +0000 Subject: Change in osmo-bsc[master]: vty: add 'show rejected-bts' Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11518 Change subject: vty: add 'show rejected-bts' ...................................................................... vty: add 'show rejected-bts' Print IDs and IPs of recently rejected BTS devices. Example output: OsmoBSC> show rejected-bts Date Site ID BTS ID IP ------------------- ------- ------ --------------- 2018-10-25 09:36:28 1234 0 192.168.1.37 Change-Id: I180e8850959e206069712a44c75eefa81094c7f1 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c 4 files changed, 92 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/18/11518/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 7c91e59..d521708 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1129,6 +1129,16 @@ uint8_t chan_load_avg; /* current channel load average in percent (0 - 100). */ }; +/* One rejected BTS */ +struct gsm_bts_rejected { + /* list header in net->bts_rejected */ + struct llist_head list; + + uint16_t site_id; + uint16_t bts_id; + char ip[64]; + time_t time; +}; struct gsm_network *gsm_network_init(void *ctx); @@ -1404,6 +1414,7 @@ unsigned int num_bts; struct llist_head bts_list; + struct llist_head bts_rejected; /* shall reference gsm_network_T[] */ struct T_def *T_defs; diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c index b1388b8..2f44b20 100644 --- a/src/osmo-bsc/bsc_init.c +++ b/src/osmo-bsc/bsc_init.c @@ -257,6 +257,7 @@ return NULL; } + INIT_LLIST_HEAD(&net->bts_rejected); gsm_net_update_ctype(net); /* diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index dd540c1..410cdac 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -541,6 +541,33 @@ return CMD_SUCCESS; } +DEFUN(show_rejected_bts, show_rejected_bts_cmd, "show rejected-bts", + SHOW_STR "Display recently rejected BTS devices\n") +{ + struct gsm_bts_rejected *pos; + + /* empty list */ + struct llist_head *rejected = &gsmnet_from_vty(vty)->bts_rejected; + if (llist_empty(rejected)) { + vty_out(vty, "No BTS has been rejected.%s", VTY_NEWLINE); + return CMD_SUCCESS; + } + + /* table head */ + vty_out(vty, "Date Site ID BTS ID IP%s", VTY_NEWLINE); + vty_out(vty, "------------------- ------- ------ ---------------%s", VTY_NEWLINE); + + /* table body */ + llist_for_each_entry(pos, rejected, list) { + /* timestamp formatted like: "2018-10-24 15:04:52" */ + char buf[20]; + strftime(buf, sizeof(buf), "%F %T", localtime(&pos->time)); + + vty_out(vty, "%s %7u %6u %15s%s", buf, pos->site_id, pos->bts_id, pos->ip, VTY_NEWLINE); + } + return CMD_SUCCESS; +} + /* utility functions */ static void parse_e1_link(struct gsm_e1_subslot *e1_link, const char *line, const char *ts, const char *ss) @@ -4867,6 +4894,7 @@ install_element_ve(&bsc_show_net_cmd); install_element_ve(&show_bts_cmd); + install_element_ve(&show_rejected_bts_cmd); install_element_ve(&show_trx_cmd); install_element_ve(&show_ts_cmd); install_element_ve(&show_lchan_cmd); diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index fec4147..40cabb8 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -458,6 +459,56 @@ } } +/* Reject BTS because of an unknown unit ID */ +static void ipaccess_sign_link_reject(const struct ipaccess_unit *dev, const struct e1inp_ts* ts) +{ + uint16_t site_id = dev->site_id; + uint16_t bts_id = dev->bts_id; + uint16_t trx_id = dev->trx_id; + char ip[INET6_ADDRSTRLEN]; + struct gsm_bts_rejected *entry = NULL; + struct gsm_bts_rejected *pos; + + /* Write to log and increase counter */ + LOGP(DLINP, LOGL_ERROR, "Unable to find BTS configuration for %u/%u/%u, disconnecting\n", site_id, bts_id, + trx_id); + rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_UNKNOWN_UNIT_ID]); + + /* Get remote IP */ + if (osmo_sock_get_remote_ip(ts->driver.ipaccess.fd.fd, ip, sizeof(ip))) + return; + + /* Rejected list: unlink existing entry */ + llist_for_each_entry(pos, &bsc_gsmnet->bts_rejected, list) { + if (pos->site_id == site_id && pos->bts_id == bts_id && !strcmp(pos->ip, ip)) { + entry = pos; + llist_del(&entry->list); + break; + } + } + + /* Allocate new entry */ + if (!entry) { + entry = talloc_zero(tall_bsc_ctx, struct gsm_bts_rejected); + if (!entry) + return; + entry->site_id = site_id; + entry->bts_id = bts_id; + strncpy(entry->ip, ip, sizeof(entry->ip)); + } + + /* Add to beginning with current timestamp */ + llist_add(&entry->list, &bsc_gsmnet->bts_rejected); + entry->time = time(NULL); + + /* Cut off last (oldest) element if we have too many */ + if (llist_count(&bsc_gsmnet->bts_rejected) > 25) { + pos = llist_last_entry(&bsc_gsmnet->bts_rejected, struct gsm_bts_rejected, list); + llist_del(&pos->list); + talloc_free(pos); + } +} + /* This function is called once the OML/RSL link becomes up. */ static struct e1inp_sign_link * ipaccess_sign_link_up(void *unit_data, struct e1inp_line *line, @@ -471,10 +522,7 @@ bts = find_bts_by_unitid(bsc_gsmnet, dev->site_id, dev->bts_id); if (!bts) { - LOGP(DLINP, LOGL_ERROR, "Unable to find BTS configuration for " - " %u/%u/%u, disconnecting\n", dev->site_id, - dev->bts_id, dev->trx_id); - rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_UNKNOWN_UNIT_ID]); + ipaccess_sign_link_reject(dev, &line->ts[E1INP_SIGN_OML - 1]); return NULL; } DEBUGP(DLINP, "Identified BTS %u/%u/%u\n", -- To view, visit https://gerrit.osmocom.org/11518 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I180e8850959e206069712a44c75eefa81094c7f1 Gerrit-Change-Number: 11518 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 13:04:24 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 30 Oct 2018 13:04:24 +0000 Subject: Change in osmo-bsc[master]: vty: add 'show rejected' In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11493 ) Change subject: vty: add 'show rejected' ...................................................................... Patch Set 1: (5 comments) https://gerrit.osmocom.org/#/c/11493/1/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11493/1/src/osmo-bsc/bsc_vty.c at 544 PS1, Line 544: show rejected > I think in terms of naming this needs to be further qualified. [?] Done https://gerrit.osmocom.org/#/c/11493/1/src/osmo-bsc/bsc_vty.c at 562 PS1, Line 562: char buf[20]; is this okay since this is in a different scope, or should buf also be declared on top of the function? https://gerrit.osmocom.org/#/c/11493/1/src/osmo-bsc/bts_ipaccess_nanobts.c File src/osmo-bsc/bts_ipaccess_nanobts.c: https://gerrit.osmocom.org/#/c/11493/1/src/osmo-bsc/bts_ipaccess_nanobts.c at 475 PS1, Line 475: 64 > I've seen this magic number appearing two times now. [?] I have copy pasted the 64 from osmo_sock_get_name() without thinking too much about it. Turns out, the right constant to use would be INET6_ADDRSTRLEN (46). If you want, I can make a patch for libosmocore that uses INET6_ADDRSTRLEN there instead of the 64. Also the right number for the port string length would be 6 (as 65535 is the highest allowed port number). Right now, the code has portbuf[16] - should we introduce a #define for that (there isn't one in POSIX like INET6_ADDRSTRLEN for ports)? You've introduced both magic numbers here: https://git.osmocom.org/libosmocore/commit/?id=48f55833476439fc45fa4eaa4327beccdc92d44b https://gerrit.osmocom.org/#/c/11493/1/src/osmo-bsc/bts_ipaccess_nanobts.c at 480 PS1, Line 480: struct gsm_bts_rejected *entry = NULL; : struct gsm_bts_rejected *pos; > same for those variables, they should be at the top of the block. [?] Done https://gerrit.osmocom.org/#/c/11493/1/src/osmo-bsc/bts_ipaccess_nanobts.c at 506 PS1, Line 506: llist_for_each_entry(pos, &bsc_gsmnet->bts_rejected, list) { : if (i >= 25) > we do have llist_count() to count the number of entries. [?] Done -- To view, visit https://gerrit.osmocom.org/11493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iba3bfe8fc9432b7ae8f819df8bd71b35b3ec507e Gerrit-Change-Number: 11493 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 30 Oct 2018 13:04:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 13:06:06 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 30 Oct 2018 13:06:06 +0000 Subject: Change in osmo-bsc[master]: vty: add 'show rejected-bts' In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/11518 ) Change subject: vty: add 'show rejected-bts' ...................................................................... Abandoned duplicate of https://gerrit.osmocom.org/#/c/osmo-bsc/+/11493/ - I deleted the change ID by accident while squashing the commits. -- To view, visit https://gerrit.osmocom.org/11518 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I180e8850959e206069712a44c75eefa81094c7f1 Gerrit-Change-Number: 11518 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 13:12:35 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 30 Oct 2018 13:12:35 +0000 Subject: Change in osmo-bsc[master]: vty: add 'show rejected-bts' In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11493 to look at the new patch set (#2). Change subject: vty: add 'show rejected-bts' ...................................................................... vty: add 'show rejected-bts' Print IDs and IPs of recently rejected BTS devices. Example output: OsmoBSC> show rejected-bts Date Site ID BTS ID IP ------------------- ------- ------ --------------- 2018-10-25 09:36:28 1234 0 192.168.1.37 Related: OS#2841 Change-Id: Iba3bfe8fc9432b7ae8f819df8bd71b35b3ec507e --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c 4 files changed, 92 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/93/11493/2 -- To view, visit https://gerrit.osmocom.org/11493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iba3bfe8fc9432b7ae8f819df8bd71b35b3ec507e Gerrit-Change-Number: 11493 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 13:17:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 13:17:10 +0000 Subject: Change in osmo-sgsn[master]: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10284 ) Change subject: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr ...................................................................... Patch Set 2: VTY tests fail due to osmo-sgsn segfaulting when it is started: osmo-sgsn $ ./src/gprs/osmo-sgsn -c /home/pespin/dev/sysmocom/git/osmo-sgsn/doc/examples/osmo-sgsn/osmo-sgsn.cfg from /home/pespin/dev/sysmocom/git/osmo-sgsn <001b> telnet_interface.c:104 Available via telnet 127.0.0.1 4245 <0022> control_if.c:911 CTRL at 127.0.0.1 4251 <0023> gtp.c:798 GTP: gtp_newgsn() started at 127.0.0.1 <000e> sgsn_libgtp.c:856 Created GTP on 127.0.0.1 <000e> sgsn_main.c:479 libGTP v1.2.2.15-fb75 initialized signal 6 received talloc report on 'vty' (total 114380 bytes in 6262 blocks) save_cwd contains 40 bytes in 1 blocks (ref 0) 0x60d000001c40 vty_command contains 70872 bytes in 3725 blocks (ref 0) 0x608000000280 vty_vector contains 43468 bytes in 2535 blocks (ref 0) 0x608000000200 full talloc report on 'osmo_sgsn' (total 8058 bytes in 19 blocks) telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b0000f3d80 struct sgsn_ggsn_ctx contains 144 bytes in 1 blocks (ref 0) 0x6110000056e0 rate_ctr.c:234 contains 1872 bytes in 1 blocks (ref 0) 0x61d0000000e0 struct gprs_ns_inst contains 1544 bytes in 5 blocks (ref 0) 0x612000001720 struct gprs_nsvc contains 1368 bytes in 4 blocks (ref 0) 0x6120000018a0 stat_item.c:96 contains 184 bytes in 2 blocks (ref 0) 0x60d0000166f0 stat_item.c:118 contains 144 bytes in 1 blocks (ref 0) 0x6110000051e0 rate_ctr.c:234 contains 992 bytes in 1 blocks (ref 0) 0x6190000046e0 logging contains 4497 bytes in 9 blocks (ref 0) 0x60b0000000a0 Configure logging Set the log level for a specified category Layer3 Mobility Management (MM) Paging Subsystem Radio Measurement Processing Reference Counting GPRS Packet Service GPRS Network Service (NS) GPRS BSS Gateway Protocol (BSSGP) GPRS Logical Link Control Protocol (LLC) GPRS Sub-Network Dependent Control Protocol (SNDCP) RFC1144 TCP/IP Header compression (SLHC) RAN Application Part (RANAP) SCCP User Adaptation (SUA) V.42bis data compression (SNDCP) Library-internal global log family LAPD in libosmogsm A-bis Intput Subsystem A-bis B-Subchannel TRAU Frame Multiplex A-bis Input Driver for Signalling A-bis Input Driver for B-Channels (voice) Layer3 Short Message Service (SMS) Control Interface GPRS GTP library Statistics messages and logging Generic Subscriber Update Protocol Osmocom Authentication Protocol libosmo-sigtran Signalling System 7 libosmo-sigtran SCCP Implementation libosmo-sigtran SCCP User Adaptation libosmo-sigtran MTP3 User Adaptation libosmo-mgcp Media Gateway Control Protocol libosmo-netif Jitter Buffer Deprecated alias for 'no logging level force-all' contains 1092 bytes in 1 blocks (ref 0) 0x61a0000006e0 logging level (|mm|pag|meas|ref|gprs|ns|bssgp|llc|sndcp|slhc|ranap|sua|v42bis|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) everything contains 192 bytes in 1 blocks (ref 0) 0x6120000015a0 Configure logging Set the log level for a specified category Layer3 Mobility Management (MM) Paging Subsystem Radio Measurement Processing Reference Counting GPRS Packet Service GPRS Network Service (NS) GPRS BSS Gateway Protocol (BSSGP) GPRS Logical Link Control Protocol (LLC) GPRS Sub-Network Dependent Control Protocol (SNDCP) RFC1144 TCP/IP Header compression (SLHC) RAN Application Part (RANAP) SCCP User Adaptation (SUA) V.42bis data compression (SNDCP) Library-internal global log family LAPD in libosmogsm A-bis Intput Subsystem A-bis B-Subchannel TRAU Frame Multiplex A-bis Input Driver for Signalling A-bis Input Driver for B-Channels (voice) Layer3 Short Message Service (SMS) Control Interface GPRS GTP library Statistics messages and logging Generic Subscriber Update Protocol Osmocom Authentication Protocol libosmo-sigtran Signalling System 7 libosmo-sigtran SCCP Implementation libosmo-sigtran SCCP User Adaptation libosmo-sigtran MTP3 User Adaptation libosmo-mgcp Media Gateway Control Protocol libosmo-netif Jitter Buffer Log debug messages and higher levels Log informational messages and higher levels Log noticeable messages and higher levels Log error messages and higher levels Log only fatal messages contains 1227 bytes in 1 blocks (ref 0) 0x61a0000000e0 logging level (|mm|pag|meas|ref|gprs|ns|bssgp|llc|sndcp|slhc|ranap|sua|v42bis|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) (debug|info|notice|error|fatal) contains 213 bytes in 1 blocks (ref 0) 0x612000000b20 struct log_target contains 260 bytes in 2 blocks (ref 0) 0x6120000000a0 struct log_category contains 92 bytes in 1 blocks (ref 0) 0x6100000000a0 struct log_info contains 1512 bytes in 2 blocks (ref 0) 0x60d0000000a0 struct log_info_cat contains 1472 bytes in 1 blocks (ref 0) 0x61b0000000e0 msgb contains 0 bytes in 1 blocks (ref 0) 0x608000000100 Aborted (core dumped) -- To view, visit https://gerrit.osmocom.org/10284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f542945403cf2e3ddac419186b09ec0e2d43b69 Gerrit-Change-Number: 10284 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 30 Oct 2018 13:17:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 13:17:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 13:17:26 +0000 Subject: Change in osmo-sgsn[master]: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10284 ) Change subject: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr ...................................................................... Patch Set 2: Running under GDB: <001b> telnet_interface.c:104 Available via telnet 127.0.0.1 4245 <0022> control_if.c:911 CTRL at 127.0.0.1 4251 <0023> gtp.c:798 GTP: gtp_newgsn() started at 127.0.0.1 <000e> sgsn_libgtp.c:856 Created GTP on 127.0.0.1 <000e> sgsn_main.c:479 libGTP v1.2.2.15-fb75 initialized Program received signal SIGABRT, Aborted. 0x00007ffff5af7d7f in raise () from /usr/lib/libc.so.6 (gdb) bt #0 0x00007ffff5af7d7f in raise () from /usr/lib/libc.so.6 #1 0x00007ffff5ae2672 in abort () from /usr/lib/libc.so.6 #2 0x00007ffff693e6d2 in ?? () from /usr/lib/libtalloc.so.2 #3 0x00007ffff693eb01 in ?? () from /usr/lib/libtalloc.so.2 #4 0x00007ffff71cd91e in osmo_gsup_client_create (talloc_ctx=talloc_ctx at entry=0x555555818ac0 , unit_name=unit_name at entry=0x555555760200 "SGSN", ip_addr=0x7ffff44eb908 "127.0.0.1", tcp_port=4222, read_cb=read_cb at entry=0x555555719230 , oapc_config=0x555555818b64 ) at gsup_client.c:275 #5 0x0000555555712d80 in gprs_subscr_init (sgi=sgi at entry=0x555555818ac0 ) at gprs_subscriber.c:72 #6 0x00005555556818d3 in main (argc=5, argv=0x7fffffffe468) at sgsn_main.c:481 -- To view, visit https://gerrit.osmocom.org/10284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f542945403cf2e3ddac419186b09ec0e2d43b69 Gerrit-Change-Number: 10284 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 30 Oct 2018 13:17:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 13:17:36 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 30 Oct 2018 13:17:36 +0000 Subject: Change in osmo-bsc[master]: vty: add 'show rejected-bts' In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11493 ) Change subject: vty: add 'show rejected-bts' ...................................................................... Patch Set 2: I've verified that all new code paths are working with the latest patch. The jenkins build failure is unrelated: https://jenkins.osmocom.org/jenkins/job/gerrit-osmo-bsc/a1=default,a2=default,a3=default,a4=default,label=osmocom-gerrit-debian9/1688/console > FAIL: ./neighbor_ident.vty -- To view, visit https://gerrit.osmocom.org/11493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iba3bfe8fc9432b7ae8f819df8bd71b35b3ec507e Gerrit-Change-Number: 11493 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 30 Oct 2018 13:17:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 13:17:53 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 30 Oct 2018 13:17:53 +0000 Subject: Change in osmo-bsc[master]: vty: add 'show rejected-bts' In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11493 ) Change subject: vty: add 'show rejected-bts' ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/11493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iba3bfe8fc9432b7ae8f819df8bd71b35b3ec507e Gerrit-Change-Number: 11493 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 30 Oct 2018 13:17:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 13:21:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 13:21:03 +0000 Subject: Change in osmo-bsc[master]: vty: add 'show rejected-bts' In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11493 ) Change subject: vty: add 'show rejected-bts' ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11493/1/src/osmo-bsc/bts_ipaccess_nanobts.c File src/osmo-bsc/bts_ipaccess_nanobts.c: https://gerrit.osmocom.org/#/c/11493/1/src/osmo-bsc/bts_ipaccess_nanobts.c at 475 PS1, Line 475: 64 > I have copy pasted the 64 from osmo_sock_get_name() without thinking too much about it. [?] Please, do send patches for stuff which you think require fixes, then we can discuss them separately on each of them. -- To view, visit https://gerrit.osmocom.org/11493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iba3bfe8fc9432b7ae8f819df8bd71b35b3ec507e Gerrit-Change-Number: 11493 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 30 Oct 2018 13:21:03 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 13:34:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 13:34:11 +0000 Subject: Change in osmo-bsc[master]: vty: add 'show rejected-bts' In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11493 ) Change subject: vty: add 'show rejected-bts' ...................................................................... Patch Set 3: (3 comments) https://gerrit.osmocom.org/#/c/11493/3/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/#/c/11493/3/include/osmocom/bsc/gsm_data.h at 1139 PS3, Line 1139: char ip[64]; You can use the ADDRLEN6LEN or however it's called here. https://gerrit.osmocom.org/#/c/11493/3/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11493/3/src/osmo-bsc/bsc_vty.c at 566 PS3, Line 566: vty_out(vty, "%s %7u %6u %15s%s", buf, pos->site_id, pos->bts_id, pos->ip, VTY_NEWLINE); why do we need this %15s for pos->ip? isn't %s enough? https://gerrit.osmocom.org/#/c/11493/3/src/osmo-bsc/bts_ipaccess_nanobts.c File src/osmo-bsc/bts_ipaccess_nanobts.c: https://gerrit.osmocom.org/#/c/11493/3/src/osmo-bsc/bts_ipaccess_nanobts.c at 525 PS3, Line 525: ipaccess_sign_link_reject(dev, &line->ts[E1INP_SIGN_OML - 1]); So as a result afaiu we'll only print OML IP addreses here, even if we failed during an RSL conn attempt, but it's fine enough I guess. -- To view, visit https://gerrit.osmocom.org/11493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iba3bfe8fc9432b7ae8f819df8bd71b35b3ec507e Gerrit-Change-Number: 11493 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 30 Oct 2018 13:34:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 13:37:07 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 30 Oct 2018 13:37:07 +0000 Subject: Change in osmo-mgw[master]: add aggregated rtp connection stats to osmo-mgw Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11519 Change subject: add aggregated rtp connection stats to osmo-mgw ...................................................................... add aggregated rtp connection stats to osmo-mgw Add a counter group for aggregated RTP connection statistics. This group contains RTP counters which aggregate values of the ephemeral RTP counters maintained per connection (mgcp_conn). This provides a global overview of RTP processing for each trunk throughout the lifetime of the osmo-mgw process. The counters are displayed by 'show mgcp stats' and 'show rate-counters'. Change-Id: I80d36181600901ae2e0f321dc02b5d54ddc94139 Related: OS#2660 --- M include/osmocom/mgcp/mgcp.h M include/osmocom/mgcp/mgcp_conn.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c 5 files changed, 65 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/19/11519/1 diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index c8c2cfd..4a307cd 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -194,9 +194,12 @@ int vty_number_endpoints; struct mgcp_endpoint *endpoints; - /* rate counters */ + /* Rate counter group which contains stats for processed CDCX commands. */ struct rate_ctr_group *mgcp_crcx_ctr_group; + /* Rate counter group which contains stats for processed MDCX commands. */ struct rate_ctr_group *mgcp_mdcx_ctr_group; + /* Rate counter group which aggregates stats of individual RTP connections. */ + struct rate_ctr_group *all_rtp_conn_stats; }; enum mgcp_role { diff --git a/include/osmocom/mgcp/mgcp_conn.h b/include/osmocom/mgcp/mgcp_conn.h index 3da7334..c5c8827 100644 --- a/include/osmocom/mgcp/mgcp_conn.h +++ b/include/osmocom/mgcp/mgcp_conn.h @@ -35,7 +35,8 @@ RTP_OCTETS_RX_CTR, RTP_PACKETS_TX_CTR, RTP_OCTETS_TX_CTR, - RTP_DROPPED_PACKETS_CTR + RTP_DROPPED_PACKETS_CTR, + RTP_NUM_CONNECTIONS, }; struct mgcp_conn *mgcp_conn_alloc(void *ctx, struct mgcp_endpoint *endp, diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 820c63a..e040bc5 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -31,13 +31,14 @@ #include #include +/* Must be kept in sync with all_rtp_conn_rate_ctr_desc in mgcp_protocol.c */ static const struct rate_ctr_desc rate_ctr_desc[] = { [IN_STREAM_ERR_TSTMP_CTR] = {"stream_err_tstmp:in", "Inbound rtp-stream timestamp errors."}, [OUT_STREAM_ERR_TSTMP_CTR] = {"stream_err_tstmp:out", "Outbound rtp-stream timestamp errors."}, [RTP_PACKETS_RX_CTR] = {"rtp:packets_rx", "Inbound rtp packets."}, [RTP_OCTETS_RX_CTR] = {"rtp:octets_rx", "Inbound rtp octets."}, [RTP_PACKETS_TX_CTR] = {"rtp:packets_tx", "Outbound rtp packets."}, - [RTP_OCTETS_TX_CTR] = {"rtp:octets_rx", "Outbound rtp octets."}, + [RTP_OCTETS_TX_CTR] = {"rtp:octets_tx", "Outbound rtp octets."}, [RTP_DROPPED_PACKETS_CTR] = {"rtp:dropped", "dropped rtp packets."} }; @@ -234,6 +235,23 @@ return NULL; } +static void +aggregate_rtp_conn_stats(struct mgcp_trunk_config *trunk, struct mgcp_conn_rtp *conn_rtp) +{ + struct rate_ctr_group *all_stats = trunk->all_rtp_conn_stats; + struct rate_ctr_group *conn_stats = conn_rtp->rate_ctr_group; + int i; + + if (all_stats == NULL || conn_stats == NULL) + return; + + OSMO_ASSERT(conn_stats->desc->num_ctr + 1 == all_stats->desc->num_ctr); + for (i = 0; i < conn_stats->desc->num_ctr; i++) + rate_ctr_add(&all_stats->ctr[i], conn_stats->ctr[i].current); + + rate_ctr_inc(&all_stats->ctr[RTP_NUM_CONNECTIONS]); +} + /*! free a connection by its ID. * \param[in] endp associated endpoint * \param[in] id identification number of the connection */ @@ -253,6 +271,7 @@ switch (conn->type) { case MGCP_CONN_TYPE_RTP: + aggregate_rtp_conn_stats(endp->tcfg, &conn->u.rtp); mgcp_rtp_conn_cleanup(&conn->u.rtp); break; default: diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 3a0e4ea..767faa9 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -42,6 +42,7 @@ #include #include #include +#include struct mgcp_request { char *name; @@ -103,6 +104,28 @@ .ctr_desc = mgcp_mdcx_ctr_desc }; +/* Must be kept in sync with rate_ctr_desc in mgcp_conn.c */ +static const struct rate_ctr_desc all_rtp_conn_rate_ctr_desc[] = { + [IN_STREAM_ERR_TSTMP_CTR] = {"all_rtp:err_tstmp_in", "Total inbound rtp-stream timestamp errors."}, + [OUT_STREAM_ERR_TSTMP_CTR] = {"all_rtp:err_tstmp_out", "Total outbound rtp-stream timestamp errors."}, + [RTP_PACKETS_RX_CTR] = {"all_rtp:packets_rx", "Total inbound rtp packets."}, + [RTP_OCTETS_RX_CTR] = {"all_rtp:octets_rx", "Total inbound rtp octets."}, + [RTP_PACKETS_TX_CTR] = {"all_rtp:packets_tx", "Total outbound rtp packets."}, + [RTP_OCTETS_TX_CTR] = {"all_rtp:octets_tx", "Total outbound rtp octets."}, + [RTP_DROPPED_PACKETS_CTR] = {"all_rtp:dropped", "Total dropped rtp packets."}, + + /* This last counter does not exist in mgcp_conn's per-connection stats, only here. */ + [RTP_NUM_CONNECTIONS] = {"all_rtp:num_closed_conns", "Total number of rtp connections closed."} +}; + +const static struct rate_ctr_group_desc all_rtp_conn_rate_ctr_group_desc = { + .group_name_prefix = "all_rtp_conn", + .group_description = "aggregated statistics for all rtp connections", + .class_id = 1, + .num_ctr = ARRAY_SIZE(all_rtp_conn_rate_ctr_desc), + .ctr_desc = all_rtp_conn_rate_ctr_desc +}; + static struct msgb *handle_audit_endpoint(struct mgcp_parse_data *data); static struct msgb *handle_create_con(struct mgcp_parse_data *data); static struct msgb *handle_delete_con(struct mgcp_parse_data *data); @@ -1487,13 +1510,14 @@ return 0; } -static void alloc_mgcp_rate_counters(struct mgcp_trunk_config *trunk, void *ctx) +static void alloc_rate_counters(struct mgcp_trunk_config *trunk, void *ctx) { /* FIXME: Each new rate counter group requires a unique index. At the * moment we generate an index using a counter, but perhaps there is * a better way of assigning indices? */ static unsigned int crcx_rate_ctr_index = 0; static unsigned int mdcx_rate_ctr_index = 0; + static unsigned int all_rtp_conn_rate_ctr_index = 0; if (trunk->mgcp_crcx_ctr_group == NULL) { trunk->mgcp_crcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_crcx_ctr_group_desc, crcx_rate_ctr_index); @@ -1507,6 +1531,13 @@ talloc_set_destructor(trunk->mgcp_mdcx_ctr_group, free_rate_counter_group); mdcx_rate_ctr_index++; } + if (trunk->all_rtp_conn_stats == NULL) { + trunk->all_rtp_conn_stats = rate_ctr_group_alloc(ctx, &all_rtp_conn_rate_ctr_group_desc, + all_rtp_conn_rate_ctr_index); + OSMO_ASSERT(trunk->all_rtp_conn_stats); + talloc_set_destructor(trunk->all_rtp_conn_stats, free_rate_counter_group); + all_rtp_conn_rate_ctr_index++; + } } /*! allocate configuration with default values. @@ -1546,7 +1577,7 @@ cfg->trunk.audio_send_name = 1; cfg->trunk.omit_rtcp = 0; mgcp_trunk_set_keepalive(&cfg->trunk, MGCP_KEEPALIVE_ONCE); - alloc_mgcp_rate_counters(&cfg->trunk, cfg); + alloc_rate_counters(&cfg->trunk, cfg); INIT_LLIST_HEAD(&cfg->trunks); @@ -1578,7 +1609,7 @@ trunk->vty_number_endpoints = 33; trunk->omit_rtcp = 0; mgcp_trunk_set_keepalive(trunk, MGCP_KEEPALIVE_ONCE); - alloc_mgcp_rate_counters(trunk, trunk); + alloc_rate_counters(trunk, trunk); llist_add_tail(&trunk->entry, &cfg->trunks); return trunk; @@ -1625,7 +1656,7 @@ } tcfg->number_endpoints = tcfg->vty_number_endpoints; - alloc_mgcp_rate_counters(tcfg, tcfg->cfg); + alloc_rate_counters(tcfg, tcfg->cfg); return 0; } diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index ed8aca5..e40d412 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -253,6 +253,10 @@ vty_out(vty, " %s:%s", cfg->mgcp_mdcx_ctr_group->desc->group_description, VTY_NEWLINE); vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h %D/d) %d", cfg->mgcp_mdcx_ctr_group); } + if (show_stats && cfg->all_rtp_conn_stats) { + vty_out(vty, " %s:%s", cfg->all_rtp_conn_stats->desc->group_description, VTY_NEWLINE); + vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h %D/d) %d", cfg->all_rtp_conn_stats); + } } #define SHOW_MGCP_STR "Display information about the MGCP Media Gateway\n" -- To view, visit https://gerrit.osmocom.org/11519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I80d36181600901ae2e0f321dc02b5d54ddc94139 Gerrit-Change-Number: 11519 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 13:45:44 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 30 Oct 2018 13:45:44 +0000 Subject: Change in osmo-bsc[master]: vty: add 'show rejected-bts' In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11493 to look at the new patch set (#4). Change subject: vty: add 'show rejected-bts' ...................................................................... vty: add 'show rejected-bts' Print IDs and IPs of recently rejected BTS devices. Example output: OsmoBSC> show rejected-bts Date Site ID BTS ID IP ------------------- ------- ------ --------------- 2018-10-25 09:36:28 1234 0 192.168.1.37 Related: OS#2841 Change-Id: Iba3bfe8fc9432b7ae8f819df8bd71b35b3ec507e --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c 4 files changed, 92 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/93/11493/4 -- To view, visit https://gerrit.osmocom.org/11493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iba3bfe8fc9432b7ae8f819df8bd71b35b3ec507e Gerrit-Change-Number: 11493 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 13:45:58 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 30 Oct 2018 13:45:58 +0000 Subject: Change in osmo-bsc[master]: vty: add 'show rejected-bts' In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11493 ) Change subject: vty: add 'show rejected-bts' ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11493/3/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11493/3/src/osmo-bsc/bsc_vty.c at 566 PS3, Line 566: vty_out(vty, "%s %7u %6u %15s%s", buf, pos->site_id, pos->bts_id, pos->ip, VTY_NEWLINE); > why do we need this %15s for pos->ip? isn't %s enough? If we keep it, it aligns all values to the right, and that looks better imho (more space between the IP and the BTS ID): Date Site ID BTS ID IP ------------------- ------- ------ --------------- 2018-10-25 09:36:28 1234 0 192.168.1.37 without it: Date Site ID BTS ID IP ------------------- ------- ------ --------------- 2018-10-25 09:36:28 1234 0 192.168.1.37 -- To view, visit https://gerrit.osmocom.org/11493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iba3bfe8fc9432b7ae8f819df8bd71b35b3ec507e Gerrit-Change-Number: 11493 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 30 Oct 2018 13:45:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 13:50:53 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 30 Oct 2018 13:50:53 +0000 Subject: Change in osmo-bsc[master]: vty: add 'show rejected-bts' In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11493 ) Change subject: vty: add 'show rejected-bts' ...................................................................... Patch Set 4: Verified+1 -- To view, visit https://gerrit.osmocom.org/11493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iba3bfe8fc9432b7ae8f819df8bd71b35b3ec507e Gerrit-Change-Number: 11493 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 30 Oct 2018 13:50:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 13:55:54 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 30 Oct 2018 13:55:54 +0000 Subject: Change in libosmocore[master]: socket.c: fix IP and port buffer sizes Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11520 Change subject: socket.c: fix IP and port buffer sizes ...................................................................... socket.c: fix IP and port buffer sizes Use INET6_ADDRSTRLEN (46) instead of 64 for IP address buffers, and 6 instead of 16 for port buffers (the highest possible port number is 65535). Change-Id: Ia25e2f3277ad2f60df31c08d12f42c1e6d2a14a6 --- M src/socket.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/20/11520/1 diff --git a/src/socket.c b/src/socket.c index c7e1c9d..0e17a28 100644 --- a/src/socket.c +++ b/src/socket.c @@ -57,7 +57,7 @@ const char *host, uint16_t port, bool passive) { struct addrinfo hints, *result; - char portbuf[16]; + char portbuf[6]; int rc; snprintf(portbuf, sizeof(portbuf), "%u", port); @@ -698,7 +698,7 @@ { struct sockaddr sa; socklen_t len = sizeof(sa); - char ipbuf[64], portbuf[16]; + char ipbuf[INET6_ADDRSTRLEN], portbuf[6]; int rc; rc = local ? getsockname(fd, &sa, &len) : getpeername(fd, &sa, &len); @@ -769,8 +769,8 @@ */ char *osmo_sock_get_name(void *ctx, int fd) { - char hostbuf_l[64], hostbuf_r[64]; - char portbuf_l[16], portbuf_r[16]; + char hostbuf_l[INET6_ADDRSTRLEN], hostbuf_r[INET6_ADDRSTRLEN]; + char portbuf_l[6], portbuf_r[6]; /* get local */ if (osmo_sock_get_name2(fd, hostbuf_l, sizeof(hostbuf_l), portbuf_l, sizeof(portbuf_l), true)) -- To view, visit https://gerrit.osmocom.org/11520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia25e2f3277ad2f60df31c08d12f42c1e6d2a14a6 Gerrit-Change-Number: 11520 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 13:57:00 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 30 Oct 2018 13:57:00 +0000 Subject: Change in libosmocore[master]: socket.c: fix IP and port buffer sizes In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11520 ) Change subject: socket.c: fix IP and port buffer sizes ...................................................................... Patch Set 1: This patch is the result of this discussion: https://gerrit.osmocom.org/#/c/osmo-bsc/+/11493/1/src/osmo-bsc/bts_ipaccess_nanobts.c -- To view, visit https://gerrit.osmocom.org/11520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia25e2f3277ad2f60df31c08d12f42c1e6d2a14a6 Gerrit-Change-Number: 11520 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 30 Oct 2018 13:57:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 13:57:43 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 30 Oct 2018 13:57:43 +0000 Subject: Change in osmo-bsc[master]: vty: add 'show rejected-bts' In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11493 ) Change subject: vty: add 'show rejected-bts' ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/#/c/11493/3/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/#/c/11493/3/include/osmocom/bsc/gsm_data.h at 1139 PS3, Line 1139: char ip[64]; > You can use the ADDRLEN6LEN or however it's called here. Done https://gerrit.osmocom.org/#/c/11493/1/src/osmo-bsc/bts_ipaccess_nanobts.c File src/osmo-bsc/bts_ipaccess_nanobts.c: https://gerrit.osmocom.org/#/c/11493/1/src/osmo-bsc/bts_ipaccess_nanobts.c at 475 PS1, Line 475: _i > Please, do send patches for stuff which you think require fixes, then we can discuss them separately [?] Done: https://gerrit.osmocom.org/#/c/libosmocore/+/11520/ -- To view, visit https://gerrit.osmocom.org/11493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iba3bfe8fc9432b7ae8f819df8bd71b35b3ec507e Gerrit-Change-Number: 11493 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 30 Oct 2018 13:57:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 14:00:08 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 30 Oct 2018 14:00:08 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11521 Change subject: add DLCX command statistics to osmo-mgw ...................................................................... add DLCX command statistics to osmo-mgw Add a counter group for DLCX commands. The group contains counters for successful connection processing as well as various error conditions. This provides a quick overview of DLCX failures on each trunk throughout the lifetime of the osmo-mgw process. The counters are displayed by 'show mgcp stats' and 'show rate-counters' Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Depends: I80d36181600901ae2e0f321dc02b5d54ddc94139I Related: OS#2660 --- M include/osmocom/mgcp/mgcp.h M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c 3 files changed, 67 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/21/11521/1 diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index 4a307cd..d08c3ef 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -155,6 +155,18 @@ MGCP_MDCX_FAIL_DEFERRED_BY_POLICY }; +/* Global MCGP DLCX related rate counters */ +enum { + MGCP_DLCX_SUCCESS, + MGCP_DLCX_FAIL_WILDCARD, + MGCP_DLCX_FAIL_NO_CONN, + MGCP_DLCX_FAIL_INVALID_CALLID, + MGCP_DLCX_FAIL_INVALID_CONNID, + MGCP_DLCX_FAIL_UNHANDLED_PARAM, + MGCP_DLCX_FAIL_REJECTED_BY_POLICY, + MGCP_DLCX_FAIL_DEFERRED_BY_POLICY, + MGCP_DLCX_FAIL_NO_RTP +}; struct mgcp_trunk_config { struct llist_head entry; @@ -198,6 +210,8 @@ struct rate_ctr_group *mgcp_crcx_ctr_group; /* Rate counter group which contains stats for processed MDCX commands. */ struct rate_ctr_group *mgcp_mdcx_ctr_group; + /* Rate counter group which contains stats for processed DLCX commands. */ + struct rate_ctr_group *mgcp_dlcx_ctr_group; /* Rate counter group which aggregates stats of individual RTP connections. */ struct rate_ctr_group *all_rtp_conn_stats; }; diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 767faa9..b9469ec 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -73,7 +73,7 @@ const static struct rate_ctr_group_desc mgcp_crcx_ctr_group_desc = { .group_name_prefix = "crcx", - .group_description = "crxc statistics", + .group_description = "crcx statistics", .class_id = OSMO_STATS_CLASS_GLOBAL, .num_ctr = ARRAY_SIZE(mgcp_crcx_ctr_desc), .ctr_desc = mgcp_crcx_ctr_desc @@ -104,6 +104,26 @@ .ctr_desc = mgcp_mdcx_ctr_desc }; +static const struct rate_ctr_desc mgcp_dlcx_ctr_desc[] = { + [MGCP_DLCX_SUCCESS] = {"dlcx:success", "DLCX command processed successfully."}, + [MGCP_DLCX_FAIL_WILDCARD] = {"dlcx:wildcard", "wildcard names in DLCX commands are unsupported."}, + [MGCP_DLCX_FAIL_NO_CONN] = {"dlcx:no_conn", "endpoint specified in DLCX command has no active connections."}, + [MGCP_DLCX_FAIL_INVALID_CALLID] = {"dlcx:callid", "invalid CallId specified in DLCX command."}, + [MGCP_DLCX_FAIL_INVALID_CONNID] = {"dlcx:connid", "invalid connection ID specified in DLCX command."}, + [MGCP_DLCX_FAIL_UNHANDLED_PARAM] = {"dlcx:unhandled_param", "unhandled parameter in DLCX command."}, + [MGCP_DLCX_FAIL_REJECTED_BY_POLICY] = {"dlcx:rejected", "connection deletion rejected by policy."}, + [MGCP_DLCX_FAIL_DEFERRED_BY_POLICY] = {"dlcx:deferred", "connection deletion deferred by policy."}, + [MGCP_DLCX_FAIL_NO_RTP] = {"dlcx:no_rtp", "no rtp stream associated with connection."}, +}; + +const static struct rate_ctr_group_desc mgcp_dlcx_ctr_group_desc = { + .group_name_prefix = "dlcx", + .group_description = "dlcx statistics", + .class_id = OSMO_STATS_CLASS_GLOBAL, + .num_ctr = ARRAY_SIZE(mgcp_dlcx_ctr_desc), + .ctr_desc = mgcp_dlcx_ctr_desc +}; + /* Must be kept in sync with rate_ctr_desc in mgcp_conn.c */ static const struct rate_ctr_desc all_rtp_conn_rate_ctr_desc[] = { [IN_STREAM_ERR_TSTMP_CTR] = {"all_rtp:err_tstmp_in", "Total inbound rtp-stream timestamp errors."}, @@ -1251,7 +1271,9 @@ /* DLCX command handler, processes the received command */ static struct msgb *handle_delete_con(struct mgcp_parse_data *p) { + struct mgcp_trunk_config *tcfg = p->endp->tcfg; struct mgcp_endpoint *endp = p->endp; + struct rate_ctr_group *rate_ctrs = tcfg->mgcp_dlcx_ctr_group; int error_code = 400; int silent = 0; char *line; @@ -1268,6 +1290,7 @@ LOGP(DLMGCP, LOGL_ERROR, "DLCX: endpoint:0x%x wildcarded endpoint names not supported.\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_WILDCARD]); return create_err_response(endp, 507, "DLCX", p->trans); } @@ -1275,6 +1298,7 @@ LOGP(DLMGCP, LOGL_ERROR, "DLCX: endpoint:0x%x endpoint is not holding a connection.\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_NO_CONN]); return create_err_response(endp, 515, "DLCX", p->trans); } @@ -1286,13 +1310,16 @@ case 'C': if (mgcp_verify_call_id(endp, line + 3) != 0) { error_code = 516; + rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_INVALID_CALLID]); goto error3; } break; case 'I': conn_id = (const char *)line + 3; - if ((error_code = mgcp_verify_ci(endp, conn_id))) + if ((error_code = mgcp_verify_ci(endp, conn_id))) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_INVALID_CONNID]); goto error3; + } break; case 'Z': silent = strcmp("noanswer", line + 3) == 0; @@ -1301,6 +1328,7 @@ LOGP(DLMGCP, LOGL_NOTICE, "DLCX: endpoint:0x%x Unhandled MGCP option: '%c'/%d\n", ENDPOINT_NUMBER(endp), line[0], line[0]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_UNHANDLED_PARAM]); return create_err_response(NULL, 539, "DLCX", p->trans); break; } @@ -1316,12 +1344,14 @@ LOGP(DLMGCP, LOGL_NOTICE, "DLCX: endpoint:0x%x rejected by policy\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_REJECTED_BY_POLICY]); if (silent) goto out_silent; return create_err_response(endp, 400, "DLCX", p->trans); break; case MGCP_POLICY_DEFER: /* stop processing */ + rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_DEFERRED_BY_POLICY]); return NULL; break; case MGCP_POLICY_CONT: @@ -1334,9 +1364,13 @@ * wildcarded DLCX and drop all connections at once. (See also * RFC3435 Section F.7) */ if (!conn_id) { + int num_conns = llist_count(&endp->conns); LOGP(DLMGCP, LOGL_NOTICE, - "DLCX: endpoint:0x%x missing ci (connectionIdentifier), will remove all connections at once\n", - ENDPOINT_NUMBER(endp)); + "DLCX: endpoint:0x%x missing ci (connectionIdentifier), will remove all connections (%d total) at once\n", + num_conns, ENDPOINT_NUMBER(endp)); + + if (num_conns > 0) + rate_ctr_add(&rate_ctrs->ctr[MGCP_DLCX_SUCCESS], num_conns); mgcp_endp_release(endp); @@ -1348,9 +1382,10 @@ /* Find the connection */ conn = mgcp_conn_get_rtp(endp, conn_id); - if (!conn) + if (!conn) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_NO_RTP]); goto error3; - + } /* save the statistics of the current connection */ mgcp_format_stats(stats, sizeof(stats), conn->conn); @@ -1375,6 +1410,7 @@ p->cfg->change_cb(endp->tcfg, ENDPOINT_NUMBER(endp), MGCP_ENDP_DLCX); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_SUCCESS]); if (silent) goto out_silent; return create_ok_resp_with_param(endp, 250, "DLCX", p->trans, stats); @@ -1517,6 +1553,7 @@ * a better way of assigning indices? */ static unsigned int crcx_rate_ctr_index = 0; static unsigned int mdcx_rate_ctr_index = 0; + static unsigned int dlcx_rate_ctr_index = 0; static unsigned int all_rtp_conn_rate_ctr_index = 0; if (trunk->mgcp_crcx_ctr_group == NULL) { @@ -1531,6 +1568,12 @@ talloc_set_destructor(trunk->mgcp_mdcx_ctr_group, free_rate_counter_group); mdcx_rate_ctr_index++; } + if (trunk->mgcp_dlcx_ctr_group == NULL) { + trunk->mgcp_dlcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_dlcx_ctr_group_desc, dlcx_rate_ctr_index); + OSMO_ASSERT(trunk->mgcp_dlcx_ctr_group); + talloc_set_destructor(trunk->mgcp_dlcx_ctr_group, free_rate_counter_group); + dlcx_rate_ctr_index++; + } if (trunk->all_rtp_conn_stats == NULL) { trunk->all_rtp_conn_stats = rate_ctr_group_alloc(ctx, &all_rtp_conn_rate_ctr_group_desc, all_rtp_conn_rate_ctr_index); diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index e40d412..83f845a 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -249,6 +249,10 @@ vty_out(vty, " %s:%s", cfg->mgcp_crcx_ctr_group->desc->group_description, VTY_NEWLINE); vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h %D/d) %d", cfg->mgcp_crcx_ctr_group); } + if (show_stats && cfg->mgcp_dlcx_ctr_group) { + vty_out(vty, " %s:%s", cfg->mgcp_dlcx_ctr_group->desc->group_description, VTY_NEWLINE); + vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h %D/d) %d", cfg->mgcp_dlcx_ctr_group); + } if (show_stats && cfg->mgcp_mdcx_ctr_group) { vty_out(vty, " %s:%s", cfg->mgcp_mdcx_ctr_group->desc->group_description, VTY_NEWLINE); vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h %D/d) %d", cfg->mgcp_mdcx_ctr_group); -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 14:38:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 14:38:14 +0000 Subject: Change in osmo-mgw[master]: add aggregated rtp connection stats to osmo-mgw In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11519 ) Change subject: add aggregated rtp connection stats to osmo-mgw ...................................................................... Patch Set 1: Code-Review-1 (5 comments) https://gerrit.osmocom.org/#/c/11519/1/include/osmocom/mgcp/mgcp.h File include/osmocom/mgcp/mgcp.h: https://gerrit.osmocom.org/#/c/11519/1/include/osmocom/mgcp/mgcp.h at 197 PS1, Line 197: /* Rate counter group which contains stats for processed CDCX commands. */ CRCX https://gerrit.osmocom.org/#/c/11519/1/src/libosmo-mgcp/mgcp_conn.c File src/libosmo-mgcp/mgcp_conn.c: https://gerrit.osmocom.org/#/c/11519/1/src/libosmo-mgcp/mgcp_conn.c at 41 PS1, Line 41: [RTP_OCTETS_TX_CTR] = {"rtp:octets_tx", "Outbound rtp octets."}, This looks unrelated. Different patch? https://gerrit.osmocom.org/#/c/11519/1/src/libosmo-mgcp/mgcp_conn.c at 248 PS1, Line 248: OSMO_ASSERT(conn_stats->desc->num_ctr + 1 == all_stats->desc->num_ctr); Can you explain this verification? https://gerrit.osmocom.org/#/c/11519/1/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/#/c/11519/1/src/libosmo-mgcp/mgcp_protocol.c at 108 PS1, Line 108: static const struct rate_ctr_desc all_rtp_conn_rate_ctr_desc[] = { Let's better use a macro instead of manually keeping them in sync. That's going to break eventually. Another possibility: Make an init function which creates this dynamically based on the other one and then appends RTP_NUM_CONNECTIONS. https://gerrit.osmocom.org/#/c/11519/1/src/libosmo-mgcp/mgcp_protocol.c at 1659 PS1, Line 1659: alloc_rate_counters(tcfg, tcfg->cfg); why removing mgcp here and other places? -- To view, visit https://gerrit.osmocom.org/11519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I80d36181600901ae2e0f321dc02b5d54ddc94139 Gerrit-Change-Number: 11519 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 30 Oct 2018 14:38:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 14:39:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 14:39:28 +0000 Subject: Change in libosmocore[master]: socket.c: fix IP and port buffer sizes In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11520 ) Change subject: socket.c: fix IP and port buffer sizes ...................................................................... Patch Set 1: Code-Review+1 Leaving +2 for Harald since afaik he wrote original code and we may be missing something. -- To view, visit https://gerrit.osmocom.org/11520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia25e2f3277ad2f60df31c08d12f42c1e6d2a14a6 Gerrit-Change-Number: 11520 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 30 Oct 2018 14:39:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 14:41:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 14:41:22 +0000 Subject: Change in osmo-bsc[master]: vty: add 'show rejected-bts' In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11493 ) Change subject: vty: add 'show rejected-bts' ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11493/3/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11493/3/src/osmo-bsc/bsc_vty.c at 566 PS3, Line 566: vty_out(vty, "%s %7u %6u %15s%s", buf, pos->site_id, pos->bts_id, pos->ip, VTY_NEWLINE); > If we keep it, it aligns all values to the right, and that looks better imho (more space between the [?] Ok thanks for the explanation :) -- To view, visit https://gerrit.osmocom.org/11493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iba3bfe8fc9432b7ae8f819df8bd71b35b3ec507e Gerrit-Change-Number: 11493 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 30 Oct 2018 14:41:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 14:42:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 14:42:04 +0000 Subject: Change in osmo-bsc[master]: vty: add 'show rejected-bts' In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11493 ) Change subject: vty: add 'show rejected-bts' ...................................................................... Patch Set 4: Code-Review+2 Once osmo-bsc master is fixed (tests are currently failing there) Go to the jenkins link and press "Retrigger" to run the verification again. -- To view, visit https://gerrit.osmocom.org/11493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iba3bfe8fc9432b7ae8f819df8bd71b35b3ec507e Gerrit-Change-Number: 11493 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 30 Oct 2018 14:42:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 14:47:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 14:47:23 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11521 ) Change subject: add DLCX command statistics to osmo-mgw ...................................................................... Patch Set 1: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c at 1347 PS1, Line 1347: rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_REJECTED_BY_POLICY]); I'd say that's not a failure, but an app decision to handle it its own way, so better remove FAIL from it. https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c at 1354 PS1, Line 1354: rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_DEFERRED_BY_POLICY]); Same here. https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c at 1573 PS1, Line 1573: OSMO_ASSERT(trunk->mgcp_dlcx_ctr_group); I think we can drop this kind of check, unless rate_ctr_group_alloc does a lot more than just claling talloc/malloc. -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 30 Oct 2018 14:47:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 14:54:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 14:54:59 +0000 Subject: Change in osmo-gsm-tester[master]: defaults.conf: Set valid default codec_list matching avail TS types In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11502 ) Change subject: defaults.conf: Set valid default codec_list matching avail TS types ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie6b37839fe363b5d1ba64c267d751221434cdedb Gerrit-Change-Number: 11502 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 30 Oct 2018 14:54:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 14:55:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 14:55:01 +0000 Subject: Change in osmo-gsm-tester[master]: defaults.conf: Set valid default codec_list matching avail TS types In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11502 ) Change subject: defaults.conf: Set valid default codec_list matching avail TS types ...................................................................... defaults.conf: Set valid default codec_list matching avail TS types By default, all channels are TCH/F, and as a result we cannot run half rate codecs on it. Since recent versions of osmo-bsc, it checks this kind of misconfigurations and answers with an Assignment Failure: .... 20181029162133430 DMSC <0007> codec_pref.c:445 codec-support/trx config of BTS 0 does not intersect with codec-list of MSC 0 20181029162133430 DMSC <0007> osmo_bsc_main.c:887 Configuration contains mutually exclusive codec settings -- check configuration! .... 20181029162255253 DMSC <0007> osmo_bsc_bssap.c:859 Rx MSC DT1 BSSMAP ASSIGNMENT REQ 20181029162255254 DMSC <0007> osmo_bsc_bssap.c:718 No supported audio type found for channel_type = { ch_indctr=0x1, ch_rate_type=0xa, perm_spch=[ 42 21 11 01 25 05 ] Change-Id: Ie6b37839fe363b5d1ba64c267d751221434cdedb --- M example/defaults.conf 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: dexter: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/defaults.conf b/example/defaults.conf index dc38030..1855883 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -15,7 +15,7 @@ long_name: osmo-gsm-tester-msc encryption: a5_0 codec_list: - - hr3 + - fr1 msc: net: -- To view, visit https://gerrit.osmocom.org/11502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie6b37839fe363b5d1ba64c267d751221434cdedb Gerrit-Change-Number: 11502 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 15:04:54 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 30 Oct 2018 15:04:54 +0000 Subject: Change in osmo-bsc[master]: fix build: revert bad neighbor_ident.vty change Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11522 Change subject: fix build: revert bad neighbor_ident.vty change ...................................................................... fix build: revert bad neighbor_ident.vty change The commit acd29192deed0e1a243b35278b030bde7b1662b5 Change-Id Ifb9212fede2333ad68db94188b5cda4fcabe02f8 introduced a bad change to neighbor_ident.vty. Revert that bit. Change-Id: I8b80be6daef73f5864ba9f294bf2134c8a76ddb5 --- M tests/neighbor_ident.vty 1 file changed, 1 insertion(+), 93 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/22/11522/1 diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index 2ce2231..4aeb6cc 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -267,99 +267,7 @@ % Removed remote BSS neighbor BTS 0 to ARFCN 23 BSIC 42 OsmoBSC(config-net-bts)# show running-config - -Current configuration: -! -! -log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging print file 1 - logging level rll notice - logging level mm notice - logging level rr notice - logging level rsl notice - logging level nm info - logging level pag notice - logging level meas notice - logging level msc notice - logging level ho notice - logging level hodec notice - logging level ref notice - logging level nat notice - logging level ctrl notice - logging level filter debug - logging level pcu debug - logging level lcls notice - logging level chan notice - logging level ts notice - logging level as notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice - logging level ljibuf notice -! -stats interval 5 -! -line vty - no login -! -e1_input - e1_line 0 driver ipa - e1_line 0 port 0 - no e1_line 0 keepalive -cs7 instance 0 - point-code 0.23.3 - asp asp-clnt-msc-0 2905 0 m3ua - as as-clnt-msc-0 m3ua - asp asp-clnt-msc-0 - routing-key 0 0.23.3 -network - network country code 901 - mobile network code 70 - encryption a5 1 3 - neci 0 - paging any use tch 0 - bts 0 - type sysmobts - band DCS1800 - cell_identity 30 - location_area_code 20 - base_station_id_code 10 - ms max power 15 - cell reselection hysteresis 4 - rxlev access min 0 - radio-link-timeout 32 - channel allocator ascending - rach tx integer 9 - rach max transmission 7 - channel-descrption attach 1 - channel-descrption bs-pa-mfrms 5 - channel-descrption bs-ag-blks-res 1 - no access-control-class-ramping - access-control-class-ramping-step-interval dynamic - access-control-class-ramping-step-size 1 - early-classmark-sending forbidden - early-classmark-sending-3g allowed - ip.access unit_id 1800 0 - oml ip.access stream_id 255 line 0 - neighbor-list mode automatic +... !neighbor neighbor bts 1 neighbor bts 2 neighbor lac 456 arfcn 123 bsic 45 -- To view, visit https://gerrit.osmocom.org/11522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8b80be6daef73f5864ba9f294bf2134c8a76ddb5 Gerrit-Change-Number: 11522 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 15:08:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 15:08:10 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-teser: Run only once nightly Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11523 Change subject: jobs: osmo-gsm-teser: Run only once nightly ...................................................................... jobs: osmo-gsm-teser: Run only once nightly Current entire default testsuite takes almost 7 hours to run, so let's run it once nightly and be done with it. This way, during office time if we want to test something on the prod setup (due to hw only avaialble there) we can do it without having to wait, disable the job hours in advance or having to kill all processes and clean osmo-gsm-tester state. Change-Id: I138bf50d6d066d2da4cd97f25880628b93ddc237 --- M jobs/osmo-gsm-tester-runner.yml 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/23/11523/1 diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index 8f7cd03..cfb32e2 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -105,9 +105,7 @@ defaults: runner node: 'osmo-gsm-tester-{stage}' triggers: - - timed: "H H/2 * * *" - - pollscm: - cron: "H/5 * * * *" + - timed: "H 0 * * *" - reverse: jobs: - osmo-gsm-tester_build-osmo-bsc -- To view, visit https://gerrit.osmocom.org/11523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I138bf50d6d066d2da4cd97f25880628b93ddc237 Gerrit-Change-Number: 11523 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 15:08:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 30 Oct 2018 15:08:20 +0000 Subject: Change in python/osmo-python-tests[master]: make osmpy IPA code aware of RSPRO Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11524 Change subject: make osmpy IPA code aware of RSPRO ...................................................................... make osmpy IPA code aware of RSPRO RSPRO (Remote Sim PROtocol) is used by osmo-remsim and basd on the IPA multiplex. Let's add knowledge about this stream identifier to osmopy. Change-Id: I5c0e674390c5672ee1083b1226c206557f6a980b --- M osmopy/osmo_ipa.py M osmopy/twisted_ipa.py 2 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/24/11524/1 diff --git a/osmopy/osmo_ipa.py b/osmopy/osmo_ipa.py index a1fcaf6..246101d 100755 --- a/osmopy/osmo_ipa.py +++ b/osmopy/osmo_ipa.py @@ -34,7 +34,7 @@ # OpenBSC extensions: OSMO, MGCP_OLD PROTO = dict(RSL=0x00, CCM=0xFE, SCCP=0xFD, OML=0xFF, OSMO=0xEE, MGCP_OLD=0xFC) # ...OML Router Control, GSUP GPRS extension, Osmocom Authn Protocol - EXT = dict(CTRL=0, MGCP=1, LAC=2, SMSC=3, ORC=4, GSUP=5, OAP=6) + EXT = dict(CTRL=0, MGCP=1, LAC=2, SMSC=3, ORC=4, GSUP=5, OAP=6, RSPRO=7) # OpenBSC extension: SCCP_OLD MSGT = dict(PING=0x00, PONG=0x01, ID_GET=0x04, ID_RESP=0x05, ID_ACK=0x06, SCCP_OLD=0xFF) _IDTAG = dict(SERNR=0, UNITNAME=1, LOCATION=2, TYPE=3, EQUIPVERS=4, SWVERSION=5, IPADDR=6, MACADDR=7, UNIT=8) diff --git a/osmopy/twisted_ipa.py b/osmopy/twisted_ipa.py index 533bfae..70c1ef0 100755 --- a/osmopy/twisted_ipa.py +++ b/osmopy/twisted_ipa.py @@ -84,6 +84,12 @@ """ self.dbg('OSMO OAP received %s' % data) + def osmo_RSPRO(self, data): + """ + OSMO RSPRO (Remote Sim Protocol) extension + """ + self.dbg('OSMO RSPRO received %s' % data) + def osmo_UNKNOWN(self, data): """ OSMO defaul extension handler -- To view, visit https://gerrit.osmocom.org/11524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5c0e674390c5672ee1083b1226c206557f6a980b Gerrit-Change-Number: 11524 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 15:08:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 30 Oct 2018 15:08:49 +0000 Subject: Change in python/osmo-python-tests[master]: make osmpy IPA code aware of RSPRO In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11524 ) Change subject: make osmpy IPA code aware of RSPRO ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5c0e674390c5672ee1083b1226c206557f6a980b Gerrit-Change-Number: 11524 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 30 Oct 2018 15:08:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 15:08:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 30 Oct 2018 15:08:56 +0000 Subject: Change in python/osmo-python-tests[master]: make osmpy IPA code aware of RSPRO In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11524 ) Change subject: make osmpy IPA code aware of RSPRO ...................................................................... make osmpy IPA code aware of RSPRO RSPRO (Remote Sim PROtocol) is used by osmo-remsim and basd on the IPA multiplex. Let's add knowledge about this stream identifier to osmopy. Change-Id: I5c0e674390c5672ee1083b1226c206557f6a980b --- M osmopy/osmo_ipa.py M osmopy/twisted_ipa.py 2 files changed, 7 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/osmopy/osmo_ipa.py b/osmopy/osmo_ipa.py index a1fcaf6..246101d 100755 --- a/osmopy/osmo_ipa.py +++ b/osmopy/osmo_ipa.py @@ -34,7 +34,7 @@ # OpenBSC extensions: OSMO, MGCP_OLD PROTO = dict(RSL=0x00, CCM=0xFE, SCCP=0xFD, OML=0xFF, OSMO=0xEE, MGCP_OLD=0xFC) # ...OML Router Control, GSUP GPRS extension, Osmocom Authn Protocol - EXT = dict(CTRL=0, MGCP=1, LAC=2, SMSC=3, ORC=4, GSUP=5, OAP=6) + EXT = dict(CTRL=0, MGCP=1, LAC=2, SMSC=3, ORC=4, GSUP=5, OAP=6, RSPRO=7) # OpenBSC extension: SCCP_OLD MSGT = dict(PING=0x00, PONG=0x01, ID_GET=0x04, ID_RESP=0x05, ID_ACK=0x06, SCCP_OLD=0xFF) _IDTAG = dict(SERNR=0, UNITNAME=1, LOCATION=2, TYPE=3, EQUIPVERS=4, SWVERSION=5, IPADDR=6, MACADDR=7, UNIT=8) diff --git a/osmopy/twisted_ipa.py b/osmopy/twisted_ipa.py index 533bfae..70c1ef0 100755 --- a/osmopy/twisted_ipa.py +++ b/osmopy/twisted_ipa.py @@ -84,6 +84,12 @@ """ self.dbg('OSMO OAP received %s' % data) + def osmo_RSPRO(self, data): + """ + OSMO RSPRO (Remote Sim Protocol) extension + """ + self.dbg('OSMO RSPRO received %s' % data) + def osmo_UNKNOWN(self, data): """ OSMO defaul extension handler -- To view, visit https://gerrit.osmocom.org/11524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5c0e674390c5672ee1083b1226c206557f6a980b Gerrit-Change-Number: 11524 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 15:09:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 30 Oct 2018 15:09:31 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-teser: Run only once nightly In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11523 ) Change subject: jobs: osmo-gsm-teser: Run only once nightly ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I138bf50d6d066d2da4cd97f25880628b93ddc237 Gerrit-Change-Number: 11523 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Tue, 30 Oct 2018 15:09:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 15:09:36 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 30 Oct 2018 15:09:36 +0000 Subject: Change in osmo-bsc[master]: fix build: revert bad neighbor_ident.vty change In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11522 ) Change subject: fix build: revert bad neighbor_ident.vty change ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8b80be6daef73f5864ba9f294bf2134c8a76ddb5 Gerrit-Change-Number: 11522 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 30 Oct 2018 15:09:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 15:09:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 30 Oct 2018 15:09:38 +0000 Subject: Change in osmo-bsc[master]: fix build: revert bad neighbor_ident.vty change In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11522 ) Change subject: fix build: revert bad neighbor_ident.vty change ...................................................................... fix build: revert bad neighbor_ident.vty change The commit acd29192deed0e1a243b35278b030bde7b1662b5 Change-Id Ifb9212fede2333ad68db94188b5cda4fcabe02f8 introduced a bad change to neighbor_ident.vty. Revert that bit. Change-Id: I8b80be6daef73f5864ba9f294bf2134c8a76ddb5 --- M tests/neighbor_ident.vty 1 file changed, 1 insertion(+), 93 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index 2ce2231..4aeb6cc 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -267,99 +267,7 @@ % Removed remote BSS neighbor BTS 0 to ARFCN 23 BSIC 42 OsmoBSC(config-net-bts)# show running-config - -Current configuration: -! -! -log stderr - logging filter all 1 - logging color 1 - logging print category 0 - logging timestamp 0 - logging print file 1 - logging level rll notice - logging level mm notice - logging level rr notice - logging level rsl notice - logging level nm info - logging level pag notice - logging level meas notice - logging level msc notice - logging level ho notice - logging level hodec notice - logging level ref notice - logging level nat notice - logging level ctrl notice - logging level filter debug - logging level pcu debug - logging level lcls notice - logging level chan notice - logging level ts notice - logging level as notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice - logging level ljibuf notice -! -stats interval 5 -! -line vty - no login -! -e1_input - e1_line 0 driver ipa - e1_line 0 port 0 - no e1_line 0 keepalive -cs7 instance 0 - point-code 0.23.3 - asp asp-clnt-msc-0 2905 0 m3ua - as as-clnt-msc-0 m3ua - asp asp-clnt-msc-0 - routing-key 0 0.23.3 -network - network country code 901 - mobile network code 70 - encryption a5 1 3 - neci 0 - paging any use tch 0 - bts 0 - type sysmobts - band DCS1800 - cell_identity 30 - location_area_code 20 - base_station_id_code 10 - ms max power 15 - cell reselection hysteresis 4 - rxlev access min 0 - radio-link-timeout 32 - channel allocator ascending - rach tx integer 9 - rach max transmission 7 - channel-descrption attach 1 - channel-descrption bs-pa-mfrms 5 - channel-descrption bs-ag-blks-res 1 - no access-control-class-ramping - access-control-class-ramping-step-interval dynamic - access-control-class-ramping-step-size 1 - early-classmark-sending forbidden - early-classmark-sending-3g allowed - ip.access unit_id 1800 0 - oml ip.access stream_id 255 line 0 - neighbor-list mode automatic +... !neighbor neighbor bts 1 neighbor bts 2 neighbor lac 456 arfcn 123 bsic 45 -- To view, visit https://gerrit.osmocom.org/11522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8b80be6daef73f5864ba9f294bf2134c8a76ddb5 Gerrit-Change-Number: 11522 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Oct 30 15:13:30 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 30 Oct 2018 15:13:30 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-asn1c_=C2=BB_a1=3Dde?= =?UTF-8?Q?fault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#292?= In-Reply-To: <495396751.290.1540825807446.JavaMail.jenkins@jenkins.osmocom.org> References: <495396751.290.1540825807446.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <49418107.323.1540912410561.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Tue Oct 30 15:17:24 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 30 Oct 2018 15:17:24 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bsc_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3971?= In-Reply-To: <1504997986.322.1540903454486.JavaMail.jenkins@jenkins.osmocom.org> References: <1504997986.322.1540903454486.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <124575572.324.1540912644517.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Oct 30 15:30:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 15:30:27 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-teser: Run only once nightly In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11523 ) Change subject: jobs: osmo-gsm-teser: Run only once nightly ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I138bf50d6d066d2da4cd97f25880628b93ddc237 Gerrit-Change-Number: 11523 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 30 Oct 2018 15:30:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 15:30:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 15:30:28 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-teser: Run only once nightly In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11523 ) Change subject: jobs: osmo-gsm-teser: Run only once nightly ...................................................................... jobs: osmo-gsm-teser: Run only once nightly Current entire default testsuite takes almost 7 hours to run, so let's run it once nightly and be done with it. This way, during office time if we want to test something on the prod setup (due to hw only avaialble there) we can do it without having to wait, disable the job hours in advance or having to kill all processes and clean osmo-gsm-tester state. Change-Id: I138bf50d6d066d2da4cd97f25880628b93ddc237 --- M jobs/osmo-gsm-tester-runner.yml 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index 8f7cd03..cfb32e2 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -105,9 +105,7 @@ defaults: runner node: 'osmo-gsm-tester-{stage}' triggers: - - timed: "H H/2 * * *" - - pollscm: - cron: "H/5 * * * *" + - timed: "H 0 * * *" - reverse: jobs: - osmo-gsm-tester_build-osmo-bsc -- To view, visit https://gerrit.osmocom.org/11523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I138bf50d6d066d2da4cd97f25880628b93ddc237 Gerrit-Change-Number: 11523 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 15:31:04 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 30 Oct 2018 15:31:04 +0000 Subject: Change in osmo-bsc[master]: vty: add 'show rejected-bts' In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11493 ) Change subject: vty: add 'show rejected-bts' ...................................................................... vty: add 'show rejected-bts' Print IDs and IPs of recently rejected BTS devices. Example output: OsmoBSC> show rejected-bts Date Site ID BTS ID IP ------------------- ------- ------ --------------- 2018-10-25 09:36:28 1234 0 192.168.1.37 Related: OS#2841 Change-Id: Iba3bfe8fc9432b7ae8f819df8bd71b35b3ec507e --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c 4 files changed, 92 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 7c91e59..7897fea 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1129,6 +1129,16 @@ uint8_t chan_load_avg; /* current channel load average in percent (0 - 100). */ }; +/* One rejected BTS */ +struct gsm_bts_rejected { + /* list header in net->bts_rejected */ + struct llist_head list; + + uint16_t site_id; + uint16_t bts_id; + char ip[INET6_ADDRSTRLEN]; + time_t time; +}; struct gsm_network *gsm_network_init(void *ctx); @@ -1404,6 +1414,7 @@ unsigned int num_bts; struct llist_head bts_list; + struct llist_head bts_rejected; /* shall reference gsm_network_T[] */ struct T_def *T_defs; diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c index b1388b8..2f44b20 100644 --- a/src/osmo-bsc/bsc_init.c +++ b/src/osmo-bsc/bsc_init.c @@ -257,6 +257,7 @@ return NULL; } + INIT_LLIST_HEAD(&net->bts_rejected); gsm_net_update_ctype(net); /* diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index dd540c1..410cdac 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -541,6 +541,33 @@ return CMD_SUCCESS; } +DEFUN(show_rejected_bts, show_rejected_bts_cmd, "show rejected-bts", + SHOW_STR "Display recently rejected BTS devices\n") +{ + struct gsm_bts_rejected *pos; + + /* empty list */ + struct llist_head *rejected = &gsmnet_from_vty(vty)->bts_rejected; + if (llist_empty(rejected)) { + vty_out(vty, "No BTS has been rejected.%s", VTY_NEWLINE); + return CMD_SUCCESS; + } + + /* table head */ + vty_out(vty, "Date Site ID BTS ID IP%s", VTY_NEWLINE); + vty_out(vty, "------------------- ------- ------ ---------------%s", VTY_NEWLINE); + + /* table body */ + llist_for_each_entry(pos, rejected, list) { + /* timestamp formatted like: "2018-10-24 15:04:52" */ + char buf[20]; + strftime(buf, sizeof(buf), "%F %T", localtime(&pos->time)); + + vty_out(vty, "%s %7u %6u %15s%s", buf, pos->site_id, pos->bts_id, pos->ip, VTY_NEWLINE); + } + return CMD_SUCCESS; +} + /* utility functions */ static void parse_e1_link(struct gsm_e1_subslot *e1_link, const char *line, const char *ts, const char *ss) @@ -4867,6 +4894,7 @@ install_element_ve(&bsc_show_net_cmd); install_element_ve(&show_bts_cmd); + install_element_ve(&show_rejected_bts_cmd); install_element_ve(&show_trx_cmd); install_element_ve(&show_ts_cmd); install_element_ve(&show_lchan_cmd); diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index fec4147..40cabb8 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -458,6 +459,56 @@ } } +/* Reject BTS because of an unknown unit ID */ +static void ipaccess_sign_link_reject(const struct ipaccess_unit *dev, const struct e1inp_ts* ts) +{ + uint16_t site_id = dev->site_id; + uint16_t bts_id = dev->bts_id; + uint16_t trx_id = dev->trx_id; + char ip[INET6_ADDRSTRLEN]; + struct gsm_bts_rejected *entry = NULL; + struct gsm_bts_rejected *pos; + + /* Write to log and increase counter */ + LOGP(DLINP, LOGL_ERROR, "Unable to find BTS configuration for %u/%u/%u, disconnecting\n", site_id, bts_id, + trx_id); + rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_UNKNOWN_UNIT_ID]); + + /* Get remote IP */ + if (osmo_sock_get_remote_ip(ts->driver.ipaccess.fd.fd, ip, sizeof(ip))) + return; + + /* Rejected list: unlink existing entry */ + llist_for_each_entry(pos, &bsc_gsmnet->bts_rejected, list) { + if (pos->site_id == site_id && pos->bts_id == bts_id && !strcmp(pos->ip, ip)) { + entry = pos; + llist_del(&entry->list); + break; + } + } + + /* Allocate new entry */ + if (!entry) { + entry = talloc_zero(tall_bsc_ctx, struct gsm_bts_rejected); + if (!entry) + return; + entry->site_id = site_id; + entry->bts_id = bts_id; + strncpy(entry->ip, ip, sizeof(entry->ip)); + } + + /* Add to beginning with current timestamp */ + llist_add(&entry->list, &bsc_gsmnet->bts_rejected); + entry->time = time(NULL); + + /* Cut off last (oldest) element if we have too many */ + if (llist_count(&bsc_gsmnet->bts_rejected) > 25) { + pos = llist_last_entry(&bsc_gsmnet->bts_rejected, struct gsm_bts_rejected, list); + llist_del(&pos->list); + talloc_free(pos); + } +} + /* This function is called once the OML/RSL link becomes up. */ static struct e1inp_sign_link * ipaccess_sign_link_up(void *unit_data, struct e1inp_line *line, @@ -471,10 +522,7 @@ bts = find_bts_by_unitid(bsc_gsmnet, dev->site_id, dev->bts_id); if (!bts) { - LOGP(DLINP, LOGL_ERROR, "Unable to find BTS configuration for " - " %u/%u/%u, disconnecting\n", dev->site_id, - dev->bts_id, dev->trx_id); - rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_UNKNOWN_UNIT_ID]); + ipaccess_sign_link_reject(dev, &line->ts[E1INP_SIGN_OML - 1]); return NULL; } DEBUGP(DLINP, "Identified BTS %u/%u/%u\n", -- To view, visit https://gerrit.osmocom.org/11493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iba3bfe8fc9432b7ae8f819df8bd71b35b3ec507e Gerrit-Change-Number: 11493 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 15:39:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 15:39:47 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites.conf: Make sure we use fr codec with IPA dyn TS Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11526 Change subject: default-suites.conf: Make sure we use fr codec with IPA dyn TS ...................................................................... default-suites.conf: Make sure we use fr codec with IPA dyn TS IPA style dynamic timeslots (TCH/F_PDCH) support only TCH/F and thus only full rate codecs are to be used. On the other hand, OSMO style dynamic timeslots (TCH/F_TCH/H_PDCH) can use both full rate and half rate, so no need to be restrictive there. Change-Id: I0039ef60b323ed72cfe00d8fd9e9287e9c82d49f --- M example/default-suites.conf A example/scenarios/cfg-codec-fr-any.conf 2 files changed, 20 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/26/11526/1 diff --git a/example/default-suites.conf b/example/default-suites.conf index c95bda8..c7f2377 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -7,13 +7,13 @@ - voice:sysmo+mod-bts0-ts-tchf+cfg-codec-fr3 - voice:sysmo+mod-bts0-ts-tchh+cfg-codec-hr1 - voice:sysmo+mod-bts0-ts-tchh+cfg-codec-hr3 -- voice:sysmo+mod-bts0-dynts-ipa +- voice:sysmo+mod-bts0-dynts-ipa+cfg-codec-fr-any - voice:sysmo+mod-bts0-dynts-osmo - gprs:sysmo - gprs:sysmo+mod-bts0-dynts-ipa - gprs:sysmo+mod-bts0-dynts-osmo -- dynts:sysmo+mod-bts0-dynts67-ipa+cfg-codec-fr1 -- dynts:sysmo+mod-bts0-dynts67-osmo+cfg-codec-fr1 +- dynts:sysmo+mod-bts0-dynts67-ipa+cfg-codec-fr-any +- dynts:sysmo+mod-bts0-dynts67-osmo - nitb_sms:trx-b200 - sms:trx-b200 @@ -24,15 +24,15 @@ - voice:trx-b200+mod-bts0-ts-tchf+cfg-codec-fr3 - voice:trx-b200+mod-bts0-ts-tchh+cfg-codec-hr1 - voice:trx-b200+mod-bts0-ts-tchh+cfg-codec-hr3 -- voice:trx-b200+mod-bts0-dynts-ipa +- voice:trx-b200+mod-bts0-dynts-ipa+cfg-codec-fr-any - voice:trx-b200+mod-bts0-dynts-osmo - voice:trx-b200+mod-bts0-numtrx2+mod-bts0-chanallocdescend - gprs:trx-b200 - gprs:trx-b200+mod-bts0-dynts-ipa - gprs:trx-b200+mod-bts0-dynts-osmo - gprs:trx-b200+mod-bts0-numtrx2+mod-bts0-chanallocdescend -- dynts:trx-b200+mod-bts0-dynts67-ipa+cfg-codec-fr1 -- dynts:trx-b200+mod-bts0-dynts67-osmo+cfg-codec-fr1 +- dynts:trx-b200+mod-bts0-dynts67-ipa+cfg-codec-fr-any +- dynts:trx-b200+mod-bts0-dynts67-osmo - nitb_sms:trx-sysmocell5000 - sms:trx-sysmocell5000 @@ -43,13 +43,13 @@ - voice:trx-sysmocell5000+mod-bts0-ts-tchf+cfg-codec-fr3 - voice:trx-sysmocell5000+mod-bts0-ts-tchh+cfg-codec-hr1 - voice:trx-sysmocell5000+mod-bts0-ts-tchh+cfg-codec-hr3 -- voice:trx-sysmocell5000+mod-bts0-dynts-ipa +- voice:trx-sysmocell5000+mod-bts0-dynts-ipa+cfg-codec-fr-any - voice:trx-sysmocell5000+mod-bts0-dynts-osmo - gprs:trx-sysmocell5000 - gprs:trx-sysmocell5000+mod-bts0-dynts-ipa - gprs:trx-sysmocell5000+mod-bts0-dynts-osmo -- dynts:trx-sysmocell5000+mod-bts0-dynts67-ipa+cfg-codec-fr1 -- dynts:trx-sysmocell5000+mod-bts0-dynts67-osmo+cfg-codec-fr1 +- dynts:trx-sysmocell5000+mod-bts0-dynts67-ipa+cfg-codec-fr-any +- dynts:trx-sysmocell5000+mod-bts0-dynts67-osmo - nitb_sms:nanobts - sms:nanobts+band-1900 @@ -59,10 +59,10 @@ - voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr2 - voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr3 - voice:nanobts+band-1900+mod-bts0-ts-tchh+cfg-codec-hr3 -- voice:nanobts+band-1900+mod-bts0-dynts-ipa +- voice:nanobts+band-1900+mod-bts0-dynts-ipa+cfg-codec-fr-any - gprs:nanobts+band-1900 - gprs:nanobts+band-1900+mod-bts0-dynts-ipa -- dynts:nanobts+band-1900+mod-bts0-dynts67-ipa+cfg-codec-fr1 +- dynts:nanobts+band-1900+mod-bts0-dynts67-ipa+cfg-codec-fr-any - sms:nanobts+band-900 - nitb_ussd:nanobts+band-900 @@ -71,12 +71,12 @@ - voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr2 - voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr3 - voice:nanobts+band-900+mod-bts0-ts-tchh+cfg-codec-hr3 -- voice:nanobts+band-900+mod-bts0-dynts-ipa +- voice:nanobts+band-900+mod-bts0-dynts-ipa+cfg-codec-fr-any - voice:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend - gprs:nanobts+band-900 - gprs:nanobts+band-900+mod-bts0-dynts-ipa - gprs:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend -- dynts:nanobts+band-900+mod-bts0-dynts67-ipa+cfg-codec-fr1 +- dynts:nanobts+band-900+mod-bts0-dynts67-ipa+cfg-codec-fr-any - nitb_smpp - smpp diff --git a/example/scenarios/cfg-codec-fr-any.conf b/example/scenarios/cfg-codec-fr-any.conf new file mode 100644 index 0000000..9cab6cc --- /dev/null +++ b/example/scenarios/cfg-codec-fr-any.conf @@ -0,0 +1,7 @@ +config: + bsc: + net: + codec_list: + - fr1 + - fr2 + - fr3 -- To view, visit https://gerrit.osmocom.org/11526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0039ef60b323ed72cfe00d8fd9e9287e9c82d49f Gerrit-Change-Number: 11526 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 15:39:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 15:39:46 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Remove .conf suffic from scenarios Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11525 Change subject: default-suites: Remove .conf suffic from scenarios ...................................................................... default-suites: Remove .conf suffic from scenarios Change-Id: I090a3ba8c5eb8fc256f09c798bfb5a17cdca274e --- M example/default-suites.conf 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/25/11525/1 diff --git a/example/default-suites.conf b/example/default-suites.conf index 597dc0d..c95bda8 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -12,8 +12,8 @@ - gprs:sysmo - gprs:sysmo+mod-bts0-dynts-ipa - gprs:sysmo+mod-bts0-dynts-osmo -- dynts:sysmo+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 -- dynts:sysmo+mod-bts0-dynts67-osmo.conf+cfg-codec-fr1 +- dynts:sysmo+mod-bts0-dynts67-ipa+cfg-codec-fr1 +- dynts:sysmo+mod-bts0-dynts67-osmo+cfg-codec-fr1 - nitb_sms:trx-b200 - sms:trx-b200 @@ -31,8 +31,8 @@ - gprs:trx-b200+mod-bts0-dynts-ipa - gprs:trx-b200+mod-bts0-dynts-osmo - gprs:trx-b200+mod-bts0-numtrx2+mod-bts0-chanallocdescend -- dynts:trx-b200+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 -- dynts:trx-b200+mod-bts0-dynts67-osmo.conf+cfg-codec-fr1 +- dynts:trx-b200+mod-bts0-dynts67-ipa+cfg-codec-fr1 +- dynts:trx-b200+mod-bts0-dynts67-osmo+cfg-codec-fr1 - nitb_sms:trx-sysmocell5000 - sms:trx-sysmocell5000 @@ -48,8 +48,8 @@ - gprs:trx-sysmocell5000 - gprs:trx-sysmocell5000+mod-bts0-dynts-ipa - gprs:trx-sysmocell5000+mod-bts0-dynts-osmo -- dynts:trx-sysmocell5000+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 -- dynts:trx-sysmocell5000+mod-bts0-dynts67-osmo.conf+cfg-codec-fr1 +- dynts:trx-sysmocell5000+mod-bts0-dynts67-ipa+cfg-codec-fr1 +- dynts:trx-sysmocell5000+mod-bts0-dynts67-osmo+cfg-codec-fr1 - nitb_sms:nanobts - sms:nanobts+band-1900 @@ -62,7 +62,7 @@ - voice:nanobts+band-1900+mod-bts0-dynts-ipa - gprs:nanobts+band-1900 - gprs:nanobts+band-1900+mod-bts0-dynts-ipa -- dynts:nanobts+band-1900+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 +- dynts:nanobts+band-1900+mod-bts0-dynts67-ipa+cfg-codec-fr1 - sms:nanobts+band-900 - nitb_ussd:nanobts+band-900 @@ -76,7 +76,7 @@ - gprs:nanobts+band-900 - gprs:nanobts+band-900+mod-bts0-dynts-ipa - gprs:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend -- dynts:nanobts+band-900+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 +- dynts:nanobts+band-900+mod-bts0-dynts67-ipa+cfg-codec-fr1 - nitb_smpp - smpp -- To view, visit https://gerrit.osmocom.org/11525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I090a3ba8c5eb8fc256f09c798bfb5a17cdca274e Gerrit-Change-Number: 11525 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 15:50:25 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 30 Oct 2018 15:50:25 +0000 Subject: Change in osmo-gsm-tester[master]: suits: Rename netreg_mass to nitb_netreg_mass In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11515 ) Change subject: suits: Rename netreg_mass to nitb_netreg_mass ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11515/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11515/2//COMMIT_MSG at 7 PS2, Line 7: suits it seems like this should be "suites" -- To view, visit https://gerrit.osmocom.org/11515 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5a83f5fd984084e8050edbb4d8224c1ba1d756c8 Gerrit-Change-Number: 11515 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: osmith Gerrit-Comment-Date: Tue, 30 Oct 2018 15:50:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 15:52:36 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 30 Oct 2018 15:52:36 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites.conf: Make sure we use fr codec with IPA dyn TS In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11526 ) Change subject: default-suites.conf: Make sure we use fr codec with IPA dyn TS ...................................................................... Patch Set 1: Code-Review+1 > Build Successful > > https://jenkins.osmocom.org/jenkins/job/osmo-gsm-tester_gerrit/661/ > : SUCCESS' --verified 1 --code-review 0 -- To view, visit https://gerrit.osmocom.org/11526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0039ef60b323ed72cfe00d8fd9e9287e9c82d49f Gerrit-Change-Number: 11526 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 30 Oct 2018 15:52:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 16:21:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 16:21:07 +0000 Subject: Change in osmo-sgsn[master]: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10284 ) Change subject: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/10284/3/src/gprs/gprs_subscriber.c File src/gprs/gprs_subscriber.c: https://gerrit.osmocom.org/#/c/10284/3/src/gprs/gprs_subscriber.c at 73 PS3, Line 73: sgi, talloc_zero doesn't seem to like this sgi pointer, it aborts when allocating from it. -- To view, visit https://gerrit.osmocom.org/10284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f542945403cf2e3ddac419186b09ec0e2d43b69 Gerrit-Change-Number: 10284 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 30 Oct 2018 16:21:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 16:34:06 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 30 Oct 2018 16:34:06 +0000 Subject: Change in osmo-bsc[master]: gsm_data: make cgi_for_msc available for other modules Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11527 Change subject: gsm_data: make cgi_for_msc available for other modules ...................................................................... gsm_data: make cgi_for_msc available for other modules The function cgi_for_msc() provides an easy way to get a cell global id for an msc/bts combination. This function is currently statically defined in gsm_08_08.c. Lets move it to gsm_data.c and make it publicly available. Change-Id: I301fac6e83a429ae59b5c586aa283ad7ba54053d Related: OS#3645 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/gsm_08_08.c M src/osmo-bsc/gsm_data.c 3 files changed, 26 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/27/11527/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 7c91e59..3779aaf 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1603,4 +1603,6 @@ int bts_count_free_ts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan); +struct osmo_cell_global_id *cgi_for_msc(struct bsc_msc_data *msc, struct gsm_bts *bts); + #endif /* _GSM_DATA_H */ diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 19c2598..062c878 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -58,22 +58,6 @@ static bool complete_layer3(struct gsm_subscriber_connection *conn, struct msgb *msg, struct bsc_msc_data *msc); -static struct osmo_cell_global_id *cgi_for_msc(struct bsc_msc_data *msc, struct gsm_bts *bts) -{ - static struct osmo_cell_global_id cgi; - cgi.lai.plmn = msc->network->plmn; - if (msc->core_plmn.mcc != GSM_MCC_MNC_INVALID) - cgi.lai.plmn.mcc = msc->core_plmn.mcc; - if (msc->core_plmn.mnc != GSM_MCC_MNC_INVALID) { - cgi.lai.plmn.mnc = msc->core_plmn.mnc; - cgi.lai.plmn.mnc_3_digits = msc->core_plmn.mnc_3_digits; - } - cgi.lai.lac = (msc->core_lac != -1) ? msc->core_lac : bts->location_area_code; - cgi.cell_identity = (msc->core_ci != -1) ? msc->core_ci : bts->cell_identity; - - return &cgi; -} - static void bsc_maybe_lu_reject(struct gsm_subscriber_connection *conn, int con_type, int cause) { struct msgb *msg; diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 08d5bcb..1ac3ce0 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -1682,3 +1682,27 @@ OSMO_VALUE_STRING(FOR_VTY), {} }; + +struct osmo_cell_global_id *cgi_for_msc(struct bsc_msc_data *msc, struct gsm_bts *bts) +{ + static struct osmo_cell_global_id cgi; + + if (!msc) + return NULL; + if (!bts) + return NULL; + if (!msc->network) + return NULL; + + cgi.lai.plmn = msc->network->plmn; + if (msc->core_plmn.mcc != GSM_MCC_MNC_INVALID) + cgi.lai.plmn.mcc = msc->core_plmn.mcc; + if (msc->core_plmn.mnc != GSM_MCC_MNC_INVALID) { + cgi.lai.plmn.mnc = msc->core_plmn.mnc; + cgi.lai.plmn.mnc_3_digits = msc->core_plmn.mnc_3_digits; + } + cgi.lai.lac = (msc->core_lac != -1) ? msc->core_lac : bts->location_area_code; + cgi.cell_identity = (msc->core_ci != -1) ? msc->core_ci : bts->cell_identity; + + return &cgi; +} -- To view, visit https://gerrit.osmocom.org/11527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I301fac6e83a429ae59b5c586aa283ad7ba54053d Gerrit-Change-Number: 11527 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 16:36:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 16:36:48 +0000 Subject: Change in osmo-sgsn[master]: Update wrong references to bsc in sgsn code Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11528 Change subject: Update wrong references to bsc in sgsn code ...................................................................... Update wrong references to bsc in sgsn code Change-Id: I93f0dc721c2eff8a87fb9248882f24768f708713 --- M src/gprs/gb_proxy.c M src/gprs/gb_proxy_main.c M src/gprs/gb_proxy_patch.c M src/gprs/gb_proxy_peer.c M src/gprs/gprs_gmm.c M src/gprs/gprs_sgsn.c M src/gprs/gprs_subscriber.c M src/gprs/gsup_client.c M src/gprs/gtphub_main.c M src/gprs/gtphub_vty.c M src/gprs/sgsn_ares.c M src/gprs/sgsn_main.c M src/gprs/sgsn_vty.c M tests/gbproxy/gbproxy_test.c M tests/sgsn/sgsn_test.c M tests/vty_test_runner.py 16 files changed, 80 insertions(+), 80 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/28/11528/1 diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c index 8bb6789..fe6a6c6 100644 --- a/src/gprs/gb_proxy.c +++ b/src/gprs/gb_proxy.c @@ -50,7 +50,7 @@ #include #include -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; static const struct rate_ctr_desc global_ctr_description[] = { { "inv-bvci", "Invalid BVC Identifier " }, @@ -1447,7 +1447,7 @@ struct timespec tp; INIT_LLIST_HEAD(&cfg->bts_peers); - cfg->ctrg = rate_ctr_group_alloc(tall_bsc_ctx, &global_ctrg_desc, 0); + cfg->ctrg = rate_ctr_group_alloc(tall_sgsn_ctx, &global_ctrg_desc, 0); if (!cfg->ctrg) { LOGP(DGPRS, LOGL_ERROR, "Cannot allocate global counter group!\n"); return -1; diff --git a/src/gprs/gb_proxy_main.c b/src/gprs/gb_proxy_main.c index 97e6342..19fbbba 100644 --- a/src/gprs/gb_proxy_main.c +++ b/src/gprs/gb_proxy_main.c @@ -62,7 +62,7 @@ #define _GNU_SOURCE #include -void *tall_bsc_ctx; +void *tall_sgsn_ctx; const char *openbsc_copyright = "Copyright (C) 2010 Harald Welte and On-Waves\r\n" @@ -116,7 +116,7 @@ * and then return to the caller, who will abort the process */ case SIGUSR1: talloc_report(tall_vty_ctx, stderr); - talloc_report_full(tall_bsc_ctx, stderr); + talloc_report_full(tall_sgsn_ctx, stderr); break; case SIGUSR2: talloc_report_full(tall_vty_ctx, stderr); @@ -269,9 +269,9 @@ int rc; struct ctrl_handle *ctrl; - tall_bsc_ctx = talloc_named_const(NULL, 0, "nsip_proxy"); - msgb_talloc_ctx_init(tall_bsc_ctx, 0); - vty_info.tall_ctx = tall_bsc_ctx; + tall_sgsn_ctx = talloc_named_const(NULL, 0, "nsip_proxy"); + msgb_talloc_ctx_init(tall_sgsn_ctx, 0); + vty_info.tall_ctx = tall_sgsn_ctx; signal(SIGINT, &signal_handler); signal(SIGTERM, &signal_handler); @@ -280,7 +280,7 @@ signal(SIGUSR2, &signal_handler); osmo_init_ignore_signals(); - osmo_init_logging2(tall_bsc_ctx, &gprs_log_info); + osmo_init_logging2(tall_sgsn_ctx, &gprs_log_info); vty_info.copyright = openbsc_copyright; vty_init(&vty_info); @@ -306,16 +306,16 @@ config_file = CONFIG_FILE_DEFAULT; } - rate_ctr_init(tall_bsc_ctx); - osmo_stats_init(tall_bsc_ctx); + rate_ctr_init(tall_sgsn_ctx); + osmo_stats_init(tall_sgsn_ctx); - bssgp_nsi = gprs_ns_instantiate(&proxy_ns_cb, tall_bsc_ctx); + bssgp_nsi = gprs_ns_instantiate(&proxy_ns_cb, tall_sgsn_ctx); if (!bssgp_nsi) { LOGP(DGPRS, LOGL_ERROR, "Unable to instantiate NS\n"); exit(1); } - gbcfg = talloc_zero(tall_bsc_ctx, struct gbproxy_config); + gbcfg = talloc_zero(tall_sgsn_ctx, struct gbproxy_config); if (!gbcfg) { LOGP(DGPRS, LOGL_FATAL, "Unable to allocate config\n"); exit(1); @@ -334,7 +334,7 @@ } /* start telnet after reading config for vty_get_bind_addr() */ - rc = telnet_init_dynif(tall_bsc_ctx, NULL, + rc = telnet_init_dynif(tall_sgsn_ctx, NULL, vty_get_bind_addr(), OSMO_VTY_PORT_GBPROXY); if (rc < 0) exit(1); diff --git a/src/gprs/gb_proxy_patch.c b/src/gprs/gb_proxy_patch.c index 9cca9a8..251bb67 100644 --- a/src/gprs/gb_proxy_patch.c +++ b/src/gprs/gb_proxy_patch.c @@ -29,7 +29,7 @@ #include #include -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; /* patch RA identifier in place */ static void gbproxy_patch_raid(struct gsm48_ra_id *raid_enc, struct gbproxy_peer *peer, @@ -420,7 +420,7 @@ if (rc == 0) { match->enable = 1; - match->re_str = talloc_strdup(tall_bsc_ctx, filter); + match->re_str = talloc_strdup(tall_sgsn_ctx, filter); return 0; } diff --git a/src/gprs/gb_proxy_peer.c b/src/gprs/gb_proxy_peer.c index a862a83..48482b6 100644 --- a/src/gprs/gb_proxy_peer.c +++ b/src/gprs/gb_proxy_peer.c @@ -32,7 +32,7 @@ #include -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; static const struct rate_ctr_desc peer_ctr_description[] = { { "blocked", "BVC Block " }, @@ -185,7 +185,7 @@ { struct gbproxy_peer *peer; - peer = talloc_zero(tall_bsc_ctx, struct gbproxy_peer); + peer = talloc_zero(tall_sgsn_ctx, struct gbproxy_peer); if (!peer) return NULL; diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index a0221ea..cc6ea4a 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -68,7 +68,7 @@ #define PTMSI_ALLOC extern struct sgsn_instance *sgsn; -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; static const struct tlv_definition gsm48_gmm_att_tlvdef = { .def = { @@ -2623,7 +2623,7 @@ goto no_context; /* schedule a dynamic look-up */ - mmctx->ggsn_lookup = talloc_zero(tall_bsc_ctx, struct sgsn_ggsn_lookup); + mmctx->ggsn_lookup = talloc_zero(tall_sgsn_ctx, struct sgsn_ggsn_lookup); if (!mmctx->ggsn_lookup) goto no_context; diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index efbae22..bac7325 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -56,7 +56,7 @@ #define GPRS_LLME_CHECK_TICK 30 extern struct sgsn_instance *sgsn; -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; LLIST_HEAD(sgsn_mm_ctxts); LLIST_HEAD(sgsn_ggsn_ctxts); @@ -135,7 +135,7 @@ }; void sgsn_rate_ctr_init() { - sgsn->rate_ctrs = rate_ctr_group_alloc(tall_bsc_ctx, &sgsn_ctrg_desc, 0); + sgsn->rate_ctrs = rate_ctr_group_alloc(tall_sgsn_ctx, &sgsn_ctrg_desc, 0); OSMO_ASSERT(sgsn->rate_ctrs); } @@ -223,7 +223,7 @@ { struct sgsn_mm_ctx *ctx; - ctx = talloc_zero(tall_bsc_ctx, struct sgsn_mm_ctx); + ctx = talloc_zero(tall_sgsn_ctx, struct sgsn_mm_ctx); if (!ctx) return NULL; @@ -257,7 +257,7 @@ struct sgsn_mm_ctx *ctx; struct ranap_ue_conn_ctx *ue_ctx = uectx; - ctx = talloc_zero(tall_bsc_ctx, struct sgsn_mm_ctx); + ctx = talloc_zero(tall_sgsn_ctx, struct sgsn_mm_ctx); if (!ctx) return NULL; @@ -403,7 +403,7 @@ if (pdp) return NULL; - pdp = talloc_zero(tall_bsc_ctx, struct sgsn_pdp_ctx); + pdp = talloc_zero(tall_sgsn_ctx, struct sgsn_pdp_ctx); if (!pdp) return NULL; @@ -512,7 +512,7 @@ { struct sgsn_ggsn_ctx *ggc; - ggc = talloc_zero(tall_bsc_ctx, struct sgsn_ggsn_ctx); + ggc = talloc_zero(tall_sgsn_ctx, struct sgsn_ggsn_ctx); if (!ggc) return NULL; @@ -575,7 +575,7 @@ { struct apn_ctx *actx; - actx = talloc_zero(tall_bsc_ctx, struct apn_ctx); + actx = talloc_zero(tall_sgsn_ctx, struct apn_ctx); if (!actx) return NULL; actx->name = talloc_strdup(actx, ap_name); diff --git a/src/gprs/gprs_subscriber.c b/src/gprs/gprs_subscriber.c index dfd697b..6c4f81f 100644 --- a/src/gprs/gprs_subscriber.c +++ b/src/gprs/gprs_subscriber.c @@ -47,7 +47,7 @@ (gsup)->imsi, \ ## args) -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; LLIST_HEAD(_gprs_subscribers); struct llist_head * const gprs_subscribers = &_gprs_subscribers; @@ -141,7 +141,7 @@ static struct gprs_subscr *gprs_subscr_alloc(void) { struct gprs_subscr *gsub; - gsub = talloc_zero(tall_bsc_ctx, struct gprs_subscr); + gsub = talloc_zero(tall_sgsn_ctx, struct gprs_subscr); if (!gsub) return NULL; llist_add_tail(&gsub->entry, gprs_subscribers); diff --git a/src/gprs/gsup_client.c b/src/gprs/gsup_client.c index 95c4988..37bebd9 100644 --- a/src/gprs/gsup_client.c +++ b/src/gprs/gsup_client.c @@ -33,7 +33,7 @@ #include #include -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; static void start_test_procedure(struct gsup_client *gsupc); @@ -274,7 +274,7 @@ struct gsup_client *gsupc; int rc; - gsupc = talloc_zero(tall_bsc_ctx, struct gsup_client); + gsupc = talloc_zero(tall_sgsn_ctx, struct gsup_client); OSMO_ASSERT(gsupc); /* struct ipaccess_unit has a non-const unit_name, so let's copy to be diff --git a/src/gprs/gtphub_main.c b/src/gprs/gtphub_main.c index f824016..0369ed7 100644 --- a/src/gprs/gtphub_main.c +++ b/src/gprs/gtphub_main.c @@ -51,7 +51,7 @@ #endif extern void *osmo_gtphub_ctx; -void *tall_bsc_ctx; +void *tall_sgsn_ctx; const char *gtphub_copyright = "Copyright (C) 2015 sysmocom s.f.m.c GmbH \r\n" diff --git a/src/gprs/gtphub_vty.c b/src/gprs/gtphub_vty.c index ec35e4d..abc08fd 100644 --- a/src/gprs/gtphub_vty.c +++ b/src/gprs/gtphub_vty.c @@ -37,7 +37,7 @@ * globals. */ #include extern struct sgsn_instance *sgsn; -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; static struct gtphub *g_hub = 0; static struct gtphub_cfg *g_cfg = 0; @@ -270,7 +270,7 @@ "grx-dns-add A.B.C.D", "Add DNS server\nIPv4 address\n") { - struct ares_addr_node *node = talloc_zero(tall_bsc_ctx, struct ares_addr_node); + struct ares_addr_node *node = talloc_zero(tall_sgsn_ctx, struct ares_addr_node); node->family = AF_INET; inet_aton(argv[0], &node->addr.addr4); diff --git a/src/gprs/sgsn_ares.c b/src/gprs/sgsn_ares.c index 17567c4..ba168d6 100644 --- a/src/gprs/sgsn_ares.c +++ b/src/gprs/sgsn_ares.c @@ -24,7 +24,7 @@ #include -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; struct cares_event_fd { struct llist_head head; @@ -110,7 +110,7 @@ } LOGP(DGPRS, LOGL_DEBUG, "Registering C-ares fd (%d)\n", fd); - ufd = talloc_zero(tall_bsc_ctx, struct cares_event_fd); + ufd = talloc_zero(tall_sgsn_ctx, struct cares_event_fd); ufd->fd.fd = fd; ufd->fd.cb = ares_osmo_fd_cb; ufd->fd.data = data; @@ -137,7 +137,7 @@ { struct cares_cb_data *cb_data; - cb_data = talloc_zero(tall_bsc_ctx, struct cares_cb_data); + cb_data = talloc_zero(tall_sgsn_ctx, struct cares_cb_data); cb_data->cb = cb; cb_data->data = data; ares_gethostbyname(sgsn->ares_channel, name, AF_INET, ares_cb, cb_data); diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c index 11ed5d3..a17d925 100644 --- a/src/gprs/sgsn_main.c +++ b/src/gprs/sgsn_main.c @@ -76,7 +76,7 @@ #define _GNU_SOURCE #include -void *tall_bsc_ctx; +void *tall_sgsn_ctx; struct ctrl_handle *g_ctrlh; struct gprs_ns_inst *sgsn_nsi; @@ -165,7 +165,7 @@ * and then return to the caller, who will abort the process */ case SIGUSR1: talloc_report(tall_vty_ctx, stderr); - talloc_report_full(tall_bsc_ctx, stderr); + talloc_report_full(tall_sgsn_ctx, stderr); break; case SIGUSR2: talloc_report_full(tall_vty_ctx, stderr); @@ -375,9 +375,9 @@ #endif srand(time(NULL)); - tall_bsc_ctx = talloc_named_const(NULL, 0, "osmo_sgsn"); - msgb_talloc_ctx_init(tall_bsc_ctx, 0); - vty_info.tall_ctx = tall_bsc_ctx; + tall_sgsn_ctx = talloc_named_const(NULL, 0, "osmo_sgsn"); + msgb_talloc_ctx_init(tall_sgsn_ctx, 0); + vty_info.tall_ctx = tall_sgsn_ctx; signal(SIGINT, &signal_handler); signal(SIGTERM, &signal_handler); @@ -386,8 +386,8 @@ signal(SIGUSR2, &signal_handler); osmo_init_ignore_signals(); - osmo_init_logging2(tall_bsc_ctx, &gprs_log_info); - osmo_stats_init(tall_bsc_ctx); + osmo_init_logging2(tall_sgsn_ctx, &gprs_log_info); + osmo_stats_init(tall_sgsn_ctx); vty_info.copyright = openbsc_copyright; vty_init(&vty_info); @@ -395,11 +395,11 @@ osmo_talloc_vty_add_cmds(); osmo_stats_vty_add_cmds(&gprs_log_info); sgsn_vty_init(&sgsn_inst.cfg); - ctrl_vty_init(tall_bsc_ctx); + ctrl_vty_init(tall_sgsn_ctx); #if BUILD_IU osmo_ss7_init(); - osmo_ss7_vty_init_asp(tall_bsc_ctx); + osmo_ss7_vty_init_asp(tall_sgsn_ctx); osmo_sccp_vty_init(); #endif @@ -420,12 +420,12 @@ sgsn_inst.config_file = CONFIG_FILE_DEFAULT; } - rate_ctr_init(tall_bsc_ctx); + rate_ctr_init(tall_sgsn_ctx); gprs_ns_set_log_ss(DNS); bssgp_set_log_ss(DBSSGP); - sgsn_nsi = gprs_ns_instantiate(&sgsn_ns_cb, tall_bsc_ctx); + sgsn_nsi = gprs_ns_instantiate(&sgsn_ns_cb, tall_sgsn_ctx); if (!sgsn_nsi) { LOGP(DGPRS, LOGL_ERROR, "Unable to instantiate NS\n"); exit(1); @@ -451,7 +451,7 @@ } /* start telnet after reading config for vty_get_bind_addr() */ - rc = telnet_init_dynif(tall_bsc_ctx, NULL, + rc = telnet_init_dynif(tall_sgsn_ctx, NULL, vty_get_bind_addr(), OSMO_VTY_PORT_SGSN); if (rc < 0) exit(1); @@ -507,7 +507,7 @@ #if BUILD_IU /* Note that these are mostly defaults and can be overriden from the VTY */ - sccp = osmo_sccp_simple_client(tall_bsc_ctx, "OsmoSGSN", + sccp = osmo_sccp_simple_client(tall_sgsn_ctx, "OsmoSGSN", (23 << 3) + 4, OSMO_SS7_ASP_PROT_M3UA, 0, NULL, @@ -517,7 +517,7 @@ return 8; } - ranap_iu_init(tall_bsc_ctx, DRANAP, "OsmoSGSN-IuPS", sccp, gsm0408_gprs_rcvmsg_iu, sgsn_ranap_iu_event); + ranap_iu_init(tall_sgsn_ctx, DRANAP, "OsmoSGSN-IuPS", sccp, gsm0408_gprs_rcvmsg_iu, sgsn_ranap_iu_event); #endif if (daemonize) { diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index 87c6884..72a310b 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -56,7 +56,7 @@ #include #endif -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; static struct sgsn_config *g_cfg = NULL; @@ -416,7 +416,7 @@ "Use the specified IP address for DNS-resolving the AP names to GGSN IP addresses\n" "IPv4 address\n") { - struct ares_addr_node *node = talloc_zero(tall_bsc_ctx, struct ares_addr_node); + struct ares_addr_node *node = talloc_zero(tall_sgsn_ctx, struct ares_addr_node); node->family = AF_INET; inet_aton(argv[0], &node->addr.addr4); diff --git a/tests/gbproxy/gbproxy_test.c b/tests/gbproxy/gbproxy_test.c index a183320..55776be 100644 --- a/tests/gbproxy/gbproxy_test.c +++ b/tests/gbproxy/gbproxy_test.c @@ -47,7 +47,7 @@ #define MATCH_ANY (-1) -void *tall_bsc_ctx = NULL; +void *tall_sgsn_ctx = NULL; struct gbproxy_config gbcfg = {0}; @@ -1329,7 +1329,7 @@ static void test_gbproxy() { - struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx); + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx); struct sockaddr_in bss_peer[4] = {{0},}; struct sockaddr_in sgsn_peer= {0}; @@ -1497,7 +1497,7 @@ static void test_gbproxy_ident_changes() { - struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx); + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx); struct sockaddr_in bss_peer[1] = {{0},}; struct sockaddr_in sgsn_peer= {0}; uint16_t nsei[2] = {0x1000, 0x2000}; @@ -1629,7 +1629,7 @@ static void test_gbproxy_ra_patching() { - struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx); + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx); struct sockaddr_in bss_peer[1] = {{0},}; struct sockaddr_in sgsn_peer= {0}; struct gprs_ra_id rai_bss = @@ -1657,7 +1657,7 @@ gbcfg.nsi = bssgp_nsi; gbcfg.nsip_sgsn_nsei = SGSN_NSEI; gbcfg.core_plmn = (struct osmo_plmn_id){ .mcc = 123, .mnc = 456 }; - gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100); + gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100); gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar"); gbcfg.patch_ptmsi = 0; @@ -1971,7 +1971,7 @@ static void test_gbproxy_ptmsi_assignment() { - struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx); + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx); struct sockaddr_in bss_peer[1] = {{0},}; struct sockaddr_in sgsn_peer= {0}; struct gprs_ra_id rai_bss = @@ -2000,7 +2000,7 @@ gbcfg.nsi = bssgp_nsi; gbcfg.nsip_sgsn_nsei = SGSN_NSEI; gbcfg.core_plmn = (struct osmo_plmn_id){}; - gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100); + gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100); gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar"); gbcfg.patch_ptmsi = 0; @@ -2187,7 +2187,7 @@ static void test_gbproxy_ptmsi_patching() { - struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx); + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx); struct sockaddr_in bss_peer[1] = {{0},}; struct sockaddr_in sgsn_peer= {0}; struct gprs_ra_id rai_bss = @@ -2236,7 +2236,7 @@ gbcfg.nsi = bssgp_nsi; gbcfg.nsip_sgsn_nsei = SGSN_NSEI; gbcfg.core_plmn = (struct osmo_plmn_id){ .mcc = 123, .mnc = 456 }; - gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100); + gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100); gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar"); gbcfg.patch_ptmsi = 1; @@ -2526,7 +2526,7 @@ static void test_gbproxy_ptmsi_patching_bad_cases() { - struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx); + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx); struct sockaddr_in bss_peer[1] = {{0},}; struct sockaddr_in sgsn_peer= {0}; struct gprs_ra_id rai_bss = @@ -2557,7 +2557,7 @@ gbcfg.nsi = bssgp_nsi; gbcfg.nsip_sgsn_nsei = SGSN_NSEI; gbcfg.core_plmn = (struct osmo_plmn_id){ .mcc = 123, .mnc = 456 }; - gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100); + gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100); gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar"); gbcfg.patch_ptmsi = 1; @@ -2708,7 +2708,7 @@ static void test_gbproxy_imsi_acquisition() { - struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx); + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx); struct sockaddr_in bss_peer[1] = {{0},}; struct sockaddr_in sgsn_peer= {0}; struct gprs_ra_id rai_bss = @@ -2743,7 +2743,7 @@ gbcfg.nsi = bssgp_nsi; gbcfg.nsip_sgsn_nsei = SGSN_NSEI; gbcfg.core_plmn = (struct osmo_plmn_id){ .mcc = 123, .mnc = 456 }; - gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100); + gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100); gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar"); gbcfg.patch_ptmsi = 1; gbcfg.acquire_imsi = 1; @@ -3021,7 +3021,7 @@ static void test_gbproxy_secondary_sgsn() { - struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx); + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx); struct sockaddr_in bss_peer[1] = {{0},}; struct sockaddr_in sgsn_peer[2]= {{0},}; struct gprs_ra_id rai_bss = @@ -3071,7 +3071,7 @@ gbcfg.nsi = bssgp_nsi; gbcfg.nsip_sgsn_nsei = SGSN_NSEI; gbcfg.core_plmn = (struct osmo_plmn_id){ .mcc = 123, .mnc = 456 }; - gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100); + gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100); gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar"); gbcfg.patch_ptmsi = 1; gbcfg.acquire_imsi = 1; @@ -3525,7 +3525,7 @@ static void test_gbproxy_keep_info() { - struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx); + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx); struct sockaddr_in bss_peer[1] = {{0},}; struct sockaddr_in sgsn_peer= {0}; struct gprs_ra_id rai_bss = @@ -4833,7 +4833,7 @@ static void test_gbproxy_stored_messages() { - struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx); + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx); struct sockaddr_in bss_peer[1] = {{0},}; struct sockaddr_in sgsn_peer= {0}; struct gprs_ra_id rai_bss = @@ -4857,7 +4857,7 @@ gbcfg.nsi = bssgp_nsi; gbcfg.nsip_sgsn_nsei = SGSN_NSEI; gbcfg.core_plmn = (struct osmo_plmn_id){}; - gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100); + gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100); gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar"); gbcfg.patch_ptmsi = 0; gbcfg.acquire_imsi = 1; @@ -5030,10 +5030,10 @@ int main(int argc, char **argv) { talloc_enable_leak_report(); - tall_bsc_ctx = talloc_named_const(NULL, 0, "gbproxy_test"); - void *log_ctx = talloc_named_const(tall_bsc_ctx, 0, "log"); + tall_sgsn_ctx = talloc_named_const(NULL, 0, "gbproxy_test"); + void *log_ctx = talloc_named_const(tall_sgsn_ctx, 0, "log"); - msgb_talloc_ctx_init(tall_bsc_ctx, 0); + msgb_talloc_ctx_init(tall_sgsn_ctx, 0); osmo_init_logging2(log_ctx, &info); log_set_use_color(osmo_stderr_target, 0); @@ -5044,7 +5044,7 @@ log_set_log_level(osmo_stderr_target, LOGL_DEBUG); log_set_all_filter(osmo_stderr_target, 1); - rate_ctr_init(tall_bsc_ctx); + rate_ctr_init(tall_sgsn_ctx); setlinebuf(stdout); @@ -5070,8 +5070,8 @@ talloc_free(log_ctx); /* expecting root and msgb ctx, empty */ - OSMO_ASSERT(talloc_total_blocks(tall_bsc_ctx) == 2); - talloc_free(tall_bsc_ctx); + OSMO_ASSERT(talloc_total_blocks(tall_sgsn_ctx) == 2); + talloc_free(tall_sgsn_ctx); return 0; } diff --git a/tests/sgsn/sgsn_test.c b/tests/sgsn/sgsn_test.c index 3e86266..214d07b 100644 --- a/tests/sgsn/sgsn_test.c +++ b/tests/sgsn/sgsn_test.c @@ -40,7 +40,7 @@ #include -void *tall_bsc_ctx; +void *tall_sgsn_ctx; static struct sgsn_instance sgsn_inst = { .config_file = "osmo_sgsn.cfg", .cfg = { @@ -1637,7 +1637,7 @@ osmo_sgsn_ctx = talloc_named_const(NULL, 0, "osmo_sgsn"); osmo_init_logging2(osmo_sgsn_ctx, &info); - tall_bsc_ctx = talloc_named_const(osmo_sgsn_ctx, 0, "bsc"); + tall_sgsn_ctx = talloc_named_const(osmo_sgsn_ctx, 0, "sgsn"); msgb_ctx = msgb_talloc_ctx_init(osmo_sgsn_ctx, 0); sgsn_rate_ctr_init(); @@ -1661,7 +1661,7 @@ talloc_report_full(osmo_sgsn_ctx, stderr); OSMO_ASSERT(talloc_total_blocks(msgb_ctx) == 1); - OSMO_ASSERT(talloc_total_blocks(tall_bsc_ctx) == 2); + OSMO_ASSERT(talloc_total_blocks(tall_sgsn_ctx) == 2); return 0; } diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py index afe1cfd..73dd399 100755 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -75,7 +75,7 @@ "doc/examples/osmo-gbproxy/osmo-gbproxy.cfg"] def vty_app(self): - return (4246, "./src/gprs/osmo-gbproxy", "OsmoGbProxy", "bsc") + return (4246, "./src/gprs/osmo-gbproxy", "OsmoGbProxy", "gbproxy") def testVtyTree(self): self.vty.enable() -- To view, visit https://gerrit.osmocom.org/11528 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I93f0dc721c2eff8a87fb9248882f24768f708713 Gerrit-Change-Number: 11528 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 16:39:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 16:39:38 +0000 Subject: Change in osmo-bsc[master]: gsm_data: make cgi_for_msc available for other modules In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11527 ) Change subject: gsm_data: make cgi_for_msc available for other modules ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11527/1/src/osmo-bsc/gsm_data.c File src/osmo-bsc/gsm_data.c: https://gerrit.osmocom.org/#/c/11527/1/src/osmo-bsc/gsm_data.c at 1690 PS1, Line 1690: if (!msc) Better break changes & movements in separate patches. Moreover, do we really want to allow to pass NULL MSC or BSC? I'd remove those. -- To view, visit https://gerrit.osmocom.org/11527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I301fac6e83a429ae59b5c586aa283ad7ba54053d Gerrit-Change-Number: 11527 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 30 Oct 2018 16:39:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 17:14:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 17:14:03 +0000 Subject: Change in osmo-sgsn[master]: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr In-Reply-To: References: Message-ID: Pau Espin Pedrol has uploaded a new patch set (#4) to the change originally created by Harald Welte. ( https://gerrit.osmocom.org/10284 ) Change subject: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr ...................................................................... Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr osmo-hlr has recently (as of Change-Id Iad227bb477d64da30dd6bfbbe1bd0c0a55be9474) a working shared library implementation of libosmo-gsup-client. We can remove the local implementation in osmo-sgsn and use the system-installed shared library instead. Change-Id: I6f542945403cf2e3ddac419186b09ec0e2d43b69 --- M configure.ac M contrib/jenkins.sh M debian/control M include/osmocom/sgsn/Makefile.am D include/osmocom/sgsn/gsup_client.h M include/osmocom/sgsn/sgsn.h M src/gprs/Makefile.am M src/gprs/gprs_subscriber.c D src/gprs/gsup_client.c M src/gprs/sgsn_vty.c M tests/sgsn/Makefile.am M tests/sgsn/sgsn_test.c 12 files changed, 30 insertions(+), 443 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/84/10284/4 -- To view, visit https://gerrit.osmocom.org/10284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6f542945403cf2e3ddac419186b09ec0e2d43b69 Gerrit-Change-Number: 10284 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 17:14:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 17:14:04 +0000 Subject: Change in osmo-sgsn[master]: Allocate sgsn_instance with talloc Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11529 Change subject: Allocate sgsn_instance with talloc ...................................................................... Allocate sgsn_instance with talloc Change-Id: I4a83c5799f0dbd5eb762039c6cfba671f6e465be --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/gprs_sgsn.c M src/gprs/sgsn_main.c 3 files changed, 28 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/29/11529/1 diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index 1913591..cf78766 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -396,7 +396,8 @@ extern struct llist_head sgsn_pdp_ctxts; uint32_t sgsn_alloc_ptmsi(void); -void sgsn_inst_init(void); +struct sgsn_instance *sgsn_instance_alloc(void *talloc_ctx); +void sgsn_inst_init(struct sgsn_instance *sgsn); char *gprs_pdpaddr2str(uint8_t *pdpa, uint8_t len); diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index bac7325..01f039a 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -978,7 +979,17 @@ osmo_timer_schedule(&sgsn->llme_timer, GPRS_LLME_CHECK_TICK, 0); } -void sgsn_inst_init() +struct sgsn_instance *sgsn_instance_alloc(void *talloc_ctx) +{ + struct sgsn_instance *inst; + inst = talloc_zero(talloc_ctx, struct sgsn_instance); + inst->cfg.gtp_statedir = talloc_strdup(inst, "./"); + inst->cfg.auth_policy = SGSN_AUTH_POLICY_CLOSED; + inst->cfg.gsup_server_port = OSMO_GSUP_PORT; + return inst; +} + +void sgsn_inst_init(struct sgsn_instance *sgsn) { osmo_timer_setup(&sgsn->llme_timer, sgsn_llme_check_cb, NULL); osmo_timer_schedule(&sgsn->llme_timer, GPRS_LLME_CHECK_TICK, 0); diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c index a17d925..04fc5e1 100644 --- a/src/gprs/sgsn_main.c +++ b/src/gprs/sgsn_main.c @@ -40,8 +40,6 @@ #include #include -#include - #include #include @@ -90,15 +88,8 @@ #define CONFIG_FILE_DEFAULT "osmo-sgsn.cfg" #define CONFIG_FILE_LEGACY "osmo_sgsn.cfg" -static struct sgsn_instance sgsn_inst = { - .config_file = NULL, - .cfg = { - .gtp_statedir = "./", - .auth_policy = SGSN_AUTH_POLICY_CLOSED, - .gsup_server_port = OSMO_GSUP_PORT, - }, -}; -struct sgsn_instance *sgsn = &sgsn_inst; + +struct sgsn_instance *sgsn; /* call-back function for the NS protocol */ static int sgsn_ns_cb(enum gprs_ns_evt event, struct gprs_nsvc *nsvc, @@ -261,7 +252,7 @@ daemonize = 1; break; case 'c': - sgsn_inst.config_file = strdup(optarg); + osmo_talloc_replace_string(sgsn, &sgsn->config_file, optarg); break; case 'T': log_set_print_timestamp(osmo_stderr_target, 1); @@ -376,6 +367,7 @@ srand(time(NULL)); tall_sgsn_ctx = talloc_named_const(NULL, 0, "osmo_sgsn"); + sgsn = sgsn_instance_alloc(tall_sgsn_ctx); msgb_talloc_ctx_init(tall_sgsn_ctx, 0); vty_info.tall_ctx = tall_sgsn_ctx; @@ -394,7 +386,7 @@ logging_vty_add_cmds(NULL); osmo_talloc_vty_add_cmds(); osmo_stats_vty_add_cmds(&gprs_log_info); - sgsn_vty_init(&sgsn_inst.cfg); + sgsn_vty_init(&sgsn->cfg); ctrl_vty_init(tall_sgsn_ctx); #if BUILD_IU @@ -411,13 +403,13 @@ * previous setups that might rely on the legacy default config file * name, we need to look for the old config file if no -c option was * passed AND no file exists with the new default file name. */ - if (!sgsn_inst.config_file) { + if (sgsn->config_file) { /* No -c option was passed */ if (file_exists(CONFIG_FILE_LEGACY) && !file_exists(CONFIG_FILE_DEFAULT)) - sgsn_inst.config_file = CONFIG_FILE_LEGACY; + osmo_talloc_replace_string(sgsn, &sgsn->config_file, CONFIG_FILE_LEGACY); else - sgsn_inst.config_file = CONFIG_FILE_DEFAULT; + osmo_talloc_replace_string(sgsn, &sgsn->config_file, CONFIG_FILE_DEFAULT); } rate_ctr_init(tall_sgsn_ctx); @@ -430,21 +422,21 @@ LOGP(DGPRS, LOGL_ERROR, "Unable to instantiate NS\n"); exit(1); } - bssgp_nsi = sgsn_inst.cfg.nsi = sgsn_nsi; + bssgp_nsi = sgsn->cfg.nsi = sgsn_nsi; gprs_llc_init("/usr/local/lib/osmocom/crypt/"); sgsn_rate_ctr_init(); - sgsn_inst_init(); + sgsn_inst_init(sgsn); gprs_ns_vty_init(bssgp_nsi); bssgp_vty_init(); gprs_llc_vty_init(); gprs_sndcp_vty_init(); sgsn_auth_init(); - sgsn_cdr_init(&sgsn_inst); + sgsn_cdr_init(sgsn); /* FIXME: register signal handler for SS_L_NS */ - rc = sgsn_parse_config(sgsn_inst.config_file); + rc = sgsn_parse_config(sgsn->config_file); if (rc < 0) { LOGP(DGPRS, LOGL_FATAL, "Error in config file\n"); exit(2); @@ -471,14 +463,14 @@ } - rc = sgsn_gtp_init(&sgsn_inst); + rc = sgsn_gtp_init(sgsn); if (rc) { LOGP(DGPRS, LOGL_FATAL, "Cannot bind/listen on GTP socket\n"); exit(2); } else LOGP(DGPRS, LOGL_NOTICE, "libGTP v%s initialized\n", gtp_version()); - rc = gprs_subscr_init(&sgsn_inst); + rc = gprs_subscr_init(sgsn); if (rc < 0) { LOGP(DGPRS, LOGL_FATAL, "Cannot set up subscriber management\n"); exit(2); -- To view, visit https://gerrit.osmocom.org/11529 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4a83c5799f0dbd5eb762039c6cfba671f6e465be Gerrit-Change-Number: 11529 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 17:31:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 17:31:23 +0000 Subject: Change in osmo-sgsn[master]: Allocate sgsn_instance with talloc In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11529 to look at the new patch set (#2). Change subject: Allocate sgsn_instance with talloc ...................................................................... Allocate sgsn_instance with talloc Change-Id: I4a83c5799f0dbd5eb762039c6cfba671f6e465be --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/gprs_sgsn.c M src/gprs/sgsn_main.c 3 files changed, 28 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/29/11529/2 -- To view, visit https://gerrit.osmocom.org/11529 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4a83c5799f0dbd5eb762039c6cfba671f6e465be Gerrit-Change-Number: 11529 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 17:36:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 17:36:55 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Remove .conf suffic from scenarios In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11525 ) Change subject: default-suites: Remove .conf suffic from scenarios ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I090a3ba8c5eb8fc256f09c798bfb5a17cdca274e Gerrit-Change-Number: 11525 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 30 Oct 2018 17:36:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 17:36:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 17:36:56 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites.conf: Make sure we use fr codec with IPA dyn TS In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11526 ) Change subject: default-suites.conf: Make sure we use fr codec with IPA dyn TS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0039ef60b323ed72cfe00d8fd9e9287e9c82d49f Gerrit-Change-Number: 11526 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 30 Oct 2018 17:36:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 17:36:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 17:36:58 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Remove .conf suffic from scenarios In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11525 ) Change subject: default-suites: Remove .conf suffic from scenarios ...................................................................... default-suites: Remove .conf suffic from scenarios Change-Id: I090a3ba8c5eb8fc256f09c798bfb5a17cdca274e --- M example/default-suites.conf 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/example/default-suites.conf b/example/default-suites.conf index 597dc0d..c95bda8 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -12,8 +12,8 @@ - gprs:sysmo - gprs:sysmo+mod-bts0-dynts-ipa - gprs:sysmo+mod-bts0-dynts-osmo -- dynts:sysmo+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 -- dynts:sysmo+mod-bts0-dynts67-osmo.conf+cfg-codec-fr1 +- dynts:sysmo+mod-bts0-dynts67-ipa+cfg-codec-fr1 +- dynts:sysmo+mod-bts0-dynts67-osmo+cfg-codec-fr1 - nitb_sms:trx-b200 - sms:trx-b200 @@ -31,8 +31,8 @@ - gprs:trx-b200+mod-bts0-dynts-ipa - gprs:trx-b200+mod-bts0-dynts-osmo - gprs:trx-b200+mod-bts0-numtrx2+mod-bts0-chanallocdescend -- dynts:trx-b200+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 -- dynts:trx-b200+mod-bts0-dynts67-osmo.conf+cfg-codec-fr1 +- dynts:trx-b200+mod-bts0-dynts67-ipa+cfg-codec-fr1 +- dynts:trx-b200+mod-bts0-dynts67-osmo+cfg-codec-fr1 - nitb_sms:trx-sysmocell5000 - sms:trx-sysmocell5000 @@ -48,8 +48,8 @@ - gprs:trx-sysmocell5000 - gprs:trx-sysmocell5000+mod-bts0-dynts-ipa - gprs:trx-sysmocell5000+mod-bts0-dynts-osmo -- dynts:trx-sysmocell5000+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 -- dynts:trx-sysmocell5000+mod-bts0-dynts67-osmo.conf+cfg-codec-fr1 +- dynts:trx-sysmocell5000+mod-bts0-dynts67-ipa+cfg-codec-fr1 +- dynts:trx-sysmocell5000+mod-bts0-dynts67-osmo+cfg-codec-fr1 - nitb_sms:nanobts - sms:nanobts+band-1900 @@ -62,7 +62,7 @@ - voice:nanobts+band-1900+mod-bts0-dynts-ipa - gprs:nanobts+band-1900 - gprs:nanobts+band-1900+mod-bts0-dynts-ipa -- dynts:nanobts+band-1900+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 +- dynts:nanobts+band-1900+mod-bts0-dynts67-ipa+cfg-codec-fr1 - sms:nanobts+band-900 - nitb_ussd:nanobts+band-900 @@ -76,7 +76,7 @@ - gprs:nanobts+band-900 - gprs:nanobts+band-900+mod-bts0-dynts-ipa - gprs:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend -- dynts:nanobts+band-900+mod-bts0-dynts67-ipa.conf+cfg-codec-fr1 +- dynts:nanobts+band-900+mod-bts0-dynts67-ipa+cfg-codec-fr1 - nitb_smpp - smpp -- To view, visit https://gerrit.osmocom.org/11525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I090a3ba8c5eb8fc256f09c798bfb5a17cdca274e Gerrit-Change-Number: 11525 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 17:36:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 17:36:58 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites.conf: Make sure we use fr codec with IPA dyn TS In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11526 ) Change subject: default-suites.conf: Make sure we use fr codec with IPA dyn TS ...................................................................... default-suites.conf: Make sure we use fr codec with IPA dyn TS IPA style dynamic timeslots (TCH/F_PDCH) support only TCH/F and thus only full rate codecs are to be used. On the other hand, OSMO style dynamic timeslots (TCH/F_TCH/H_PDCH) can use both full rate and half rate, so no need to be restrictive there. Change-Id: I0039ef60b323ed72cfe00d8fd9e9287e9c82d49f --- M example/default-suites.conf A example/scenarios/cfg-codec-fr-any.conf 2 files changed, 20 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/example/default-suites.conf b/example/default-suites.conf index c95bda8..c7f2377 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -7,13 +7,13 @@ - voice:sysmo+mod-bts0-ts-tchf+cfg-codec-fr3 - voice:sysmo+mod-bts0-ts-tchh+cfg-codec-hr1 - voice:sysmo+mod-bts0-ts-tchh+cfg-codec-hr3 -- voice:sysmo+mod-bts0-dynts-ipa +- voice:sysmo+mod-bts0-dynts-ipa+cfg-codec-fr-any - voice:sysmo+mod-bts0-dynts-osmo - gprs:sysmo - gprs:sysmo+mod-bts0-dynts-ipa - gprs:sysmo+mod-bts0-dynts-osmo -- dynts:sysmo+mod-bts0-dynts67-ipa+cfg-codec-fr1 -- dynts:sysmo+mod-bts0-dynts67-osmo+cfg-codec-fr1 +- dynts:sysmo+mod-bts0-dynts67-ipa+cfg-codec-fr-any +- dynts:sysmo+mod-bts0-dynts67-osmo - nitb_sms:trx-b200 - sms:trx-b200 @@ -24,15 +24,15 @@ - voice:trx-b200+mod-bts0-ts-tchf+cfg-codec-fr3 - voice:trx-b200+mod-bts0-ts-tchh+cfg-codec-hr1 - voice:trx-b200+mod-bts0-ts-tchh+cfg-codec-hr3 -- voice:trx-b200+mod-bts0-dynts-ipa +- voice:trx-b200+mod-bts0-dynts-ipa+cfg-codec-fr-any - voice:trx-b200+mod-bts0-dynts-osmo - voice:trx-b200+mod-bts0-numtrx2+mod-bts0-chanallocdescend - gprs:trx-b200 - gprs:trx-b200+mod-bts0-dynts-ipa - gprs:trx-b200+mod-bts0-dynts-osmo - gprs:trx-b200+mod-bts0-numtrx2+mod-bts0-chanallocdescend -- dynts:trx-b200+mod-bts0-dynts67-ipa+cfg-codec-fr1 -- dynts:trx-b200+mod-bts0-dynts67-osmo+cfg-codec-fr1 +- dynts:trx-b200+mod-bts0-dynts67-ipa+cfg-codec-fr-any +- dynts:trx-b200+mod-bts0-dynts67-osmo - nitb_sms:trx-sysmocell5000 - sms:trx-sysmocell5000 @@ -43,13 +43,13 @@ - voice:trx-sysmocell5000+mod-bts0-ts-tchf+cfg-codec-fr3 - voice:trx-sysmocell5000+mod-bts0-ts-tchh+cfg-codec-hr1 - voice:trx-sysmocell5000+mod-bts0-ts-tchh+cfg-codec-hr3 -- voice:trx-sysmocell5000+mod-bts0-dynts-ipa +- voice:trx-sysmocell5000+mod-bts0-dynts-ipa+cfg-codec-fr-any - voice:trx-sysmocell5000+mod-bts0-dynts-osmo - gprs:trx-sysmocell5000 - gprs:trx-sysmocell5000+mod-bts0-dynts-ipa - gprs:trx-sysmocell5000+mod-bts0-dynts-osmo -- dynts:trx-sysmocell5000+mod-bts0-dynts67-ipa+cfg-codec-fr1 -- dynts:trx-sysmocell5000+mod-bts0-dynts67-osmo+cfg-codec-fr1 +- dynts:trx-sysmocell5000+mod-bts0-dynts67-ipa+cfg-codec-fr-any +- dynts:trx-sysmocell5000+mod-bts0-dynts67-osmo - nitb_sms:nanobts - sms:nanobts+band-1900 @@ -59,10 +59,10 @@ - voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr2 - voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr3 - voice:nanobts+band-1900+mod-bts0-ts-tchh+cfg-codec-hr3 -- voice:nanobts+band-1900+mod-bts0-dynts-ipa +- voice:nanobts+band-1900+mod-bts0-dynts-ipa+cfg-codec-fr-any - gprs:nanobts+band-1900 - gprs:nanobts+band-1900+mod-bts0-dynts-ipa -- dynts:nanobts+band-1900+mod-bts0-dynts67-ipa+cfg-codec-fr1 +- dynts:nanobts+band-1900+mod-bts0-dynts67-ipa+cfg-codec-fr-any - sms:nanobts+band-900 - nitb_ussd:nanobts+band-900 @@ -71,12 +71,12 @@ - voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr2 - voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr3 - voice:nanobts+band-900+mod-bts0-ts-tchh+cfg-codec-hr3 -- voice:nanobts+band-900+mod-bts0-dynts-ipa +- voice:nanobts+band-900+mod-bts0-dynts-ipa+cfg-codec-fr-any - voice:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend - gprs:nanobts+band-900 - gprs:nanobts+band-900+mod-bts0-dynts-ipa - gprs:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend -- dynts:nanobts+band-900+mod-bts0-dynts67-ipa+cfg-codec-fr1 +- dynts:nanobts+band-900+mod-bts0-dynts67-ipa+cfg-codec-fr-any - nitb_smpp - smpp diff --git a/example/scenarios/cfg-codec-fr-any.conf b/example/scenarios/cfg-codec-fr-any.conf new file mode 100644 index 0000000..9cab6cc --- /dev/null +++ b/example/scenarios/cfg-codec-fr-any.conf @@ -0,0 +1,7 @@ +config: + bsc: + net: + codec_list: + - fr1 + - fr2 + - fr3 -- To view, visit https://gerrit.osmocom.org/11526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0039ef60b323ed72cfe00d8fd9e9287e9c82d49f Gerrit-Change-Number: 11526 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 18:05:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 30 Oct 2018 18:05:35 +0000 Subject: Change in osmo-sgsn[master]: Update wrong references to bsc in sgsn code In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11528 ) Change subject: Update wrong references to bsc in sgsn code ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11528 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I93f0dc721c2eff8a87fb9248882f24768f708713 Gerrit-Change-Number: 11528 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 30 Oct 2018 18:05:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 18:05:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 30 Oct 2018 18:05:54 +0000 Subject: Change in osmo-sgsn[master]: Allocate sgsn_instance with talloc In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11529 ) Change subject: Allocate sgsn_instance with talloc ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11529 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4a83c5799f0dbd5eb762039c6cfba671f6e465be Gerrit-Change-Number: 11529 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 30 Oct 2018 18:05:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 18:06:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 30 Oct 2018 18:06:03 +0000 Subject: Change in osmo-sgsn[master]: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10284 ) Change subject: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f542945403cf2e3ddac419186b09ec0e2d43b69 Gerrit-Change-Number: 10284 Gerrit-PatchSet: 5 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 30 Oct 2018 18:06:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 18:06:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 30 Oct 2018 18:06:06 +0000 Subject: Change in osmo-sgsn[master]: Update wrong references to bsc in sgsn code In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11528 ) Change subject: Update wrong references to bsc in sgsn code ...................................................................... Update wrong references to bsc in sgsn code Change-Id: I93f0dc721c2eff8a87fb9248882f24768f708713 --- M src/gprs/gb_proxy.c M src/gprs/gb_proxy_main.c M src/gprs/gb_proxy_patch.c M src/gprs/gb_proxy_peer.c M src/gprs/gprs_gmm.c M src/gprs/gprs_sgsn.c M src/gprs/gprs_subscriber.c M src/gprs/gsup_client.c M src/gprs/gtphub_main.c M src/gprs/gtphub_vty.c M src/gprs/sgsn_ares.c M src/gprs/sgsn_main.c M src/gprs/sgsn_vty.c M tests/gbproxy/gbproxy_test.c M tests/sgsn/sgsn_test.c M tests/vty_test_runner.py 16 files changed, 80 insertions(+), 80 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c index 8bb6789..fe6a6c6 100644 --- a/src/gprs/gb_proxy.c +++ b/src/gprs/gb_proxy.c @@ -50,7 +50,7 @@ #include #include -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; static const struct rate_ctr_desc global_ctr_description[] = { { "inv-bvci", "Invalid BVC Identifier " }, @@ -1447,7 +1447,7 @@ struct timespec tp; INIT_LLIST_HEAD(&cfg->bts_peers); - cfg->ctrg = rate_ctr_group_alloc(tall_bsc_ctx, &global_ctrg_desc, 0); + cfg->ctrg = rate_ctr_group_alloc(tall_sgsn_ctx, &global_ctrg_desc, 0); if (!cfg->ctrg) { LOGP(DGPRS, LOGL_ERROR, "Cannot allocate global counter group!\n"); return -1; diff --git a/src/gprs/gb_proxy_main.c b/src/gprs/gb_proxy_main.c index 97e6342..19fbbba 100644 --- a/src/gprs/gb_proxy_main.c +++ b/src/gprs/gb_proxy_main.c @@ -62,7 +62,7 @@ #define _GNU_SOURCE #include -void *tall_bsc_ctx; +void *tall_sgsn_ctx; const char *openbsc_copyright = "Copyright (C) 2010 Harald Welte and On-Waves\r\n" @@ -116,7 +116,7 @@ * and then return to the caller, who will abort the process */ case SIGUSR1: talloc_report(tall_vty_ctx, stderr); - talloc_report_full(tall_bsc_ctx, stderr); + talloc_report_full(tall_sgsn_ctx, stderr); break; case SIGUSR2: talloc_report_full(tall_vty_ctx, stderr); @@ -269,9 +269,9 @@ int rc; struct ctrl_handle *ctrl; - tall_bsc_ctx = talloc_named_const(NULL, 0, "nsip_proxy"); - msgb_talloc_ctx_init(tall_bsc_ctx, 0); - vty_info.tall_ctx = tall_bsc_ctx; + tall_sgsn_ctx = talloc_named_const(NULL, 0, "nsip_proxy"); + msgb_talloc_ctx_init(tall_sgsn_ctx, 0); + vty_info.tall_ctx = tall_sgsn_ctx; signal(SIGINT, &signal_handler); signal(SIGTERM, &signal_handler); @@ -280,7 +280,7 @@ signal(SIGUSR2, &signal_handler); osmo_init_ignore_signals(); - osmo_init_logging2(tall_bsc_ctx, &gprs_log_info); + osmo_init_logging2(tall_sgsn_ctx, &gprs_log_info); vty_info.copyright = openbsc_copyright; vty_init(&vty_info); @@ -306,16 +306,16 @@ config_file = CONFIG_FILE_DEFAULT; } - rate_ctr_init(tall_bsc_ctx); - osmo_stats_init(tall_bsc_ctx); + rate_ctr_init(tall_sgsn_ctx); + osmo_stats_init(tall_sgsn_ctx); - bssgp_nsi = gprs_ns_instantiate(&proxy_ns_cb, tall_bsc_ctx); + bssgp_nsi = gprs_ns_instantiate(&proxy_ns_cb, tall_sgsn_ctx); if (!bssgp_nsi) { LOGP(DGPRS, LOGL_ERROR, "Unable to instantiate NS\n"); exit(1); } - gbcfg = talloc_zero(tall_bsc_ctx, struct gbproxy_config); + gbcfg = talloc_zero(tall_sgsn_ctx, struct gbproxy_config); if (!gbcfg) { LOGP(DGPRS, LOGL_FATAL, "Unable to allocate config\n"); exit(1); @@ -334,7 +334,7 @@ } /* start telnet after reading config for vty_get_bind_addr() */ - rc = telnet_init_dynif(tall_bsc_ctx, NULL, + rc = telnet_init_dynif(tall_sgsn_ctx, NULL, vty_get_bind_addr(), OSMO_VTY_PORT_GBPROXY); if (rc < 0) exit(1); diff --git a/src/gprs/gb_proxy_patch.c b/src/gprs/gb_proxy_patch.c index 9cca9a8..251bb67 100644 --- a/src/gprs/gb_proxy_patch.c +++ b/src/gprs/gb_proxy_patch.c @@ -29,7 +29,7 @@ #include #include -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; /* patch RA identifier in place */ static void gbproxy_patch_raid(struct gsm48_ra_id *raid_enc, struct gbproxy_peer *peer, @@ -420,7 +420,7 @@ if (rc == 0) { match->enable = 1; - match->re_str = talloc_strdup(tall_bsc_ctx, filter); + match->re_str = talloc_strdup(tall_sgsn_ctx, filter); return 0; } diff --git a/src/gprs/gb_proxy_peer.c b/src/gprs/gb_proxy_peer.c index a862a83..48482b6 100644 --- a/src/gprs/gb_proxy_peer.c +++ b/src/gprs/gb_proxy_peer.c @@ -32,7 +32,7 @@ #include -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; static const struct rate_ctr_desc peer_ctr_description[] = { { "blocked", "BVC Block " }, @@ -185,7 +185,7 @@ { struct gbproxy_peer *peer; - peer = talloc_zero(tall_bsc_ctx, struct gbproxy_peer); + peer = talloc_zero(tall_sgsn_ctx, struct gbproxy_peer); if (!peer) return NULL; diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index a0221ea..cc6ea4a 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -68,7 +68,7 @@ #define PTMSI_ALLOC extern struct sgsn_instance *sgsn; -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; static const struct tlv_definition gsm48_gmm_att_tlvdef = { .def = { @@ -2623,7 +2623,7 @@ goto no_context; /* schedule a dynamic look-up */ - mmctx->ggsn_lookup = talloc_zero(tall_bsc_ctx, struct sgsn_ggsn_lookup); + mmctx->ggsn_lookup = talloc_zero(tall_sgsn_ctx, struct sgsn_ggsn_lookup); if (!mmctx->ggsn_lookup) goto no_context; diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index efbae22..bac7325 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -56,7 +56,7 @@ #define GPRS_LLME_CHECK_TICK 30 extern struct sgsn_instance *sgsn; -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; LLIST_HEAD(sgsn_mm_ctxts); LLIST_HEAD(sgsn_ggsn_ctxts); @@ -135,7 +135,7 @@ }; void sgsn_rate_ctr_init() { - sgsn->rate_ctrs = rate_ctr_group_alloc(tall_bsc_ctx, &sgsn_ctrg_desc, 0); + sgsn->rate_ctrs = rate_ctr_group_alloc(tall_sgsn_ctx, &sgsn_ctrg_desc, 0); OSMO_ASSERT(sgsn->rate_ctrs); } @@ -223,7 +223,7 @@ { struct sgsn_mm_ctx *ctx; - ctx = talloc_zero(tall_bsc_ctx, struct sgsn_mm_ctx); + ctx = talloc_zero(tall_sgsn_ctx, struct sgsn_mm_ctx); if (!ctx) return NULL; @@ -257,7 +257,7 @@ struct sgsn_mm_ctx *ctx; struct ranap_ue_conn_ctx *ue_ctx = uectx; - ctx = talloc_zero(tall_bsc_ctx, struct sgsn_mm_ctx); + ctx = talloc_zero(tall_sgsn_ctx, struct sgsn_mm_ctx); if (!ctx) return NULL; @@ -403,7 +403,7 @@ if (pdp) return NULL; - pdp = talloc_zero(tall_bsc_ctx, struct sgsn_pdp_ctx); + pdp = talloc_zero(tall_sgsn_ctx, struct sgsn_pdp_ctx); if (!pdp) return NULL; @@ -512,7 +512,7 @@ { struct sgsn_ggsn_ctx *ggc; - ggc = talloc_zero(tall_bsc_ctx, struct sgsn_ggsn_ctx); + ggc = talloc_zero(tall_sgsn_ctx, struct sgsn_ggsn_ctx); if (!ggc) return NULL; @@ -575,7 +575,7 @@ { struct apn_ctx *actx; - actx = talloc_zero(tall_bsc_ctx, struct apn_ctx); + actx = talloc_zero(tall_sgsn_ctx, struct apn_ctx); if (!actx) return NULL; actx->name = talloc_strdup(actx, ap_name); diff --git a/src/gprs/gprs_subscriber.c b/src/gprs/gprs_subscriber.c index dfd697b..6c4f81f 100644 --- a/src/gprs/gprs_subscriber.c +++ b/src/gprs/gprs_subscriber.c @@ -47,7 +47,7 @@ (gsup)->imsi, \ ## args) -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; LLIST_HEAD(_gprs_subscribers); struct llist_head * const gprs_subscribers = &_gprs_subscribers; @@ -141,7 +141,7 @@ static struct gprs_subscr *gprs_subscr_alloc(void) { struct gprs_subscr *gsub; - gsub = talloc_zero(tall_bsc_ctx, struct gprs_subscr); + gsub = talloc_zero(tall_sgsn_ctx, struct gprs_subscr); if (!gsub) return NULL; llist_add_tail(&gsub->entry, gprs_subscribers); diff --git a/src/gprs/gsup_client.c b/src/gprs/gsup_client.c index 95c4988..37bebd9 100644 --- a/src/gprs/gsup_client.c +++ b/src/gprs/gsup_client.c @@ -33,7 +33,7 @@ #include #include -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; static void start_test_procedure(struct gsup_client *gsupc); @@ -274,7 +274,7 @@ struct gsup_client *gsupc; int rc; - gsupc = talloc_zero(tall_bsc_ctx, struct gsup_client); + gsupc = talloc_zero(tall_sgsn_ctx, struct gsup_client); OSMO_ASSERT(gsupc); /* struct ipaccess_unit has a non-const unit_name, so let's copy to be diff --git a/src/gprs/gtphub_main.c b/src/gprs/gtphub_main.c index f824016..0369ed7 100644 --- a/src/gprs/gtphub_main.c +++ b/src/gprs/gtphub_main.c @@ -51,7 +51,7 @@ #endif extern void *osmo_gtphub_ctx; -void *tall_bsc_ctx; +void *tall_sgsn_ctx; const char *gtphub_copyright = "Copyright (C) 2015 sysmocom s.f.m.c GmbH \r\n" diff --git a/src/gprs/gtphub_vty.c b/src/gprs/gtphub_vty.c index ec35e4d..abc08fd 100644 --- a/src/gprs/gtphub_vty.c +++ b/src/gprs/gtphub_vty.c @@ -37,7 +37,7 @@ * globals. */ #include extern struct sgsn_instance *sgsn; -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; static struct gtphub *g_hub = 0; static struct gtphub_cfg *g_cfg = 0; @@ -270,7 +270,7 @@ "grx-dns-add A.B.C.D", "Add DNS server\nIPv4 address\n") { - struct ares_addr_node *node = talloc_zero(tall_bsc_ctx, struct ares_addr_node); + struct ares_addr_node *node = talloc_zero(tall_sgsn_ctx, struct ares_addr_node); node->family = AF_INET; inet_aton(argv[0], &node->addr.addr4); diff --git a/src/gprs/sgsn_ares.c b/src/gprs/sgsn_ares.c index 17567c4..ba168d6 100644 --- a/src/gprs/sgsn_ares.c +++ b/src/gprs/sgsn_ares.c @@ -24,7 +24,7 @@ #include -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; struct cares_event_fd { struct llist_head head; @@ -110,7 +110,7 @@ } LOGP(DGPRS, LOGL_DEBUG, "Registering C-ares fd (%d)\n", fd); - ufd = talloc_zero(tall_bsc_ctx, struct cares_event_fd); + ufd = talloc_zero(tall_sgsn_ctx, struct cares_event_fd); ufd->fd.fd = fd; ufd->fd.cb = ares_osmo_fd_cb; ufd->fd.data = data; @@ -137,7 +137,7 @@ { struct cares_cb_data *cb_data; - cb_data = talloc_zero(tall_bsc_ctx, struct cares_cb_data); + cb_data = talloc_zero(tall_sgsn_ctx, struct cares_cb_data); cb_data->cb = cb; cb_data->data = data; ares_gethostbyname(sgsn->ares_channel, name, AF_INET, ares_cb, cb_data); diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c index 11ed5d3..a17d925 100644 --- a/src/gprs/sgsn_main.c +++ b/src/gprs/sgsn_main.c @@ -76,7 +76,7 @@ #define _GNU_SOURCE #include -void *tall_bsc_ctx; +void *tall_sgsn_ctx; struct ctrl_handle *g_ctrlh; struct gprs_ns_inst *sgsn_nsi; @@ -165,7 +165,7 @@ * and then return to the caller, who will abort the process */ case SIGUSR1: talloc_report(tall_vty_ctx, stderr); - talloc_report_full(tall_bsc_ctx, stderr); + talloc_report_full(tall_sgsn_ctx, stderr); break; case SIGUSR2: talloc_report_full(tall_vty_ctx, stderr); @@ -375,9 +375,9 @@ #endif srand(time(NULL)); - tall_bsc_ctx = talloc_named_const(NULL, 0, "osmo_sgsn"); - msgb_talloc_ctx_init(tall_bsc_ctx, 0); - vty_info.tall_ctx = tall_bsc_ctx; + tall_sgsn_ctx = talloc_named_const(NULL, 0, "osmo_sgsn"); + msgb_talloc_ctx_init(tall_sgsn_ctx, 0); + vty_info.tall_ctx = tall_sgsn_ctx; signal(SIGINT, &signal_handler); signal(SIGTERM, &signal_handler); @@ -386,8 +386,8 @@ signal(SIGUSR2, &signal_handler); osmo_init_ignore_signals(); - osmo_init_logging2(tall_bsc_ctx, &gprs_log_info); - osmo_stats_init(tall_bsc_ctx); + osmo_init_logging2(tall_sgsn_ctx, &gprs_log_info); + osmo_stats_init(tall_sgsn_ctx); vty_info.copyright = openbsc_copyright; vty_init(&vty_info); @@ -395,11 +395,11 @@ osmo_talloc_vty_add_cmds(); osmo_stats_vty_add_cmds(&gprs_log_info); sgsn_vty_init(&sgsn_inst.cfg); - ctrl_vty_init(tall_bsc_ctx); + ctrl_vty_init(tall_sgsn_ctx); #if BUILD_IU osmo_ss7_init(); - osmo_ss7_vty_init_asp(tall_bsc_ctx); + osmo_ss7_vty_init_asp(tall_sgsn_ctx); osmo_sccp_vty_init(); #endif @@ -420,12 +420,12 @@ sgsn_inst.config_file = CONFIG_FILE_DEFAULT; } - rate_ctr_init(tall_bsc_ctx); + rate_ctr_init(tall_sgsn_ctx); gprs_ns_set_log_ss(DNS); bssgp_set_log_ss(DBSSGP); - sgsn_nsi = gprs_ns_instantiate(&sgsn_ns_cb, tall_bsc_ctx); + sgsn_nsi = gprs_ns_instantiate(&sgsn_ns_cb, tall_sgsn_ctx); if (!sgsn_nsi) { LOGP(DGPRS, LOGL_ERROR, "Unable to instantiate NS\n"); exit(1); @@ -451,7 +451,7 @@ } /* start telnet after reading config for vty_get_bind_addr() */ - rc = telnet_init_dynif(tall_bsc_ctx, NULL, + rc = telnet_init_dynif(tall_sgsn_ctx, NULL, vty_get_bind_addr(), OSMO_VTY_PORT_SGSN); if (rc < 0) exit(1); @@ -507,7 +507,7 @@ #if BUILD_IU /* Note that these are mostly defaults and can be overriden from the VTY */ - sccp = osmo_sccp_simple_client(tall_bsc_ctx, "OsmoSGSN", + sccp = osmo_sccp_simple_client(tall_sgsn_ctx, "OsmoSGSN", (23 << 3) + 4, OSMO_SS7_ASP_PROT_M3UA, 0, NULL, @@ -517,7 +517,7 @@ return 8; } - ranap_iu_init(tall_bsc_ctx, DRANAP, "OsmoSGSN-IuPS", sccp, gsm0408_gprs_rcvmsg_iu, sgsn_ranap_iu_event); + ranap_iu_init(tall_sgsn_ctx, DRANAP, "OsmoSGSN-IuPS", sccp, gsm0408_gprs_rcvmsg_iu, sgsn_ranap_iu_event); #endif if (daemonize) { diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index 87c6884..72a310b 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -56,7 +56,7 @@ #include #endif -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; static struct sgsn_config *g_cfg = NULL; @@ -416,7 +416,7 @@ "Use the specified IP address for DNS-resolving the AP names to GGSN IP addresses\n" "IPv4 address\n") { - struct ares_addr_node *node = talloc_zero(tall_bsc_ctx, struct ares_addr_node); + struct ares_addr_node *node = talloc_zero(tall_sgsn_ctx, struct ares_addr_node); node->family = AF_INET; inet_aton(argv[0], &node->addr.addr4); diff --git a/tests/gbproxy/gbproxy_test.c b/tests/gbproxy/gbproxy_test.c index a183320..55776be 100644 --- a/tests/gbproxy/gbproxy_test.c +++ b/tests/gbproxy/gbproxy_test.c @@ -47,7 +47,7 @@ #define MATCH_ANY (-1) -void *tall_bsc_ctx = NULL; +void *tall_sgsn_ctx = NULL; struct gbproxy_config gbcfg = {0}; @@ -1329,7 +1329,7 @@ static void test_gbproxy() { - struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx); + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx); struct sockaddr_in bss_peer[4] = {{0},}; struct sockaddr_in sgsn_peer= {0}; @@ -1497,7 +1497,7 @@ static void test_gbproxy_ident_changes() { - struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx); + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx); struct sockaddr_in bss_peer[1] = {{0},}; struct sockaddr_in sgsn_peer= {0}; uint16_t nsei[2] = {0x1000, 0x2000}; @@ -1629,7 +1629,7 @@ static void test_gbproxy_ra_patching() { - struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx); + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx); struct sockaddr_in bss_peer[1] = {{0},}; struct sockaddr_in sgsn_peer= {0}; struct gprs_ra_id rai_bss = @@ -1657,7 +1657,7 @@ gbcfg.nsi = bssgp_nsi; gbcfg.nsip_sgsn_nsei = SGSN_NSEI; gbcfg.core_plmn = (struct osmo_plmn_id){ .mcc = 123, .mnc = 456 }; - gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100); + gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100); gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar"); gbcfg.patch_ptmsi = 0; @@ -1971,7 +1971,7 @@ static void test_gbproxy_ptmsi_assignment() { - struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx); + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx); struct sockaddr_in bss_peer[1] = {{0},}; struct sockaddr_in sgsn_peer= {0}; struct gprs_ra_id rai_bss = @@ -2000,7 +2000,7 @@ gbcfg.nsi = bssgp_nsi; gbcfg.nsip_sgsn_nsei = SGSN_NSEI; gbcfg.core_plmn = (struct osmo_plmn_id){}; - gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100); + gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100); gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar"); gbcfg.patch_ptmsi = 0; @@ -2187,7 +2187,7 @@ static void test_gbproxy_ptmsi_patching() { - struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx); + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx); struct sockaddr_in bss_peer[1] = {{0},}; struct sockaddr_in sgsn_peer= {0}; struct gprs_ra_id rai_bss = @@ -2236,7 +2236,7 @@ gbcfg.nsi = bssgp_nsi; gbcfg.nsip_sgsn_nsei = SGSN_NSEI; gbcfg.core_plmn = (struct osmo_plmn_id){ .mcc = 123, .mnc = 456 }; - gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100); + gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100); gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar"); gbcfg.patch_ptmsi = 1; @@ -2526,7 +2526,7 @@ static void test_gbproxy_ptmsi_patching_bad_cases() { - struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx); + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx); struct sockaddr_in bss_peer[1] = {{0},}; struct sockaddr_in sgsn_peer= {0}; struct gprs_ra_id rai_bss = @@ -2557,7 +2557,7 @@ gbcfg.nsi = bssgp_nsi; gbcfg.nsip_sgsn_nsei = SGSN_NSEI; gbcfg.core_plmn = (struct osmo_plmn_id){ .mcc = 123, .mnc = 456 }; - gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100); + gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100); gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar"); gbcfg.patch_ptmsi = 1; @@ -2708,7 +2708,7 @@ static void test_gbproxy_imsi_acquisition() { - struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx); + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx); struct sockaddr_in bss_peer[1] = {{0},}; struct sockaddr_in sgsn_peer= {0}; struct gprs_ra_id rai_bss = @@ -2743,7 +2743,7 @@ gbcfg.nsi = bssgp_nsi; gbcfg.nsip_sgsn_nsei = SGSN_NSEI; gbcfg.core_plmn = (struct osmo_plmn_id){ .mcc = 123, .mnc = 456 }; - gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100); + gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100); gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar"); gbcfg.patch_ptmsi = 1; gbcfg.acquire_imsi = 1; @@ -3021,7 +3021,7 @@ static void test_gbproxy_secondary_sgsn() { - struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx); + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx); struct sockaddr_in bss_peer[1] = {{0},}; struct sockaddr_in sgsn_peer[2]= {{0},}; struct gprs_ra_id rai_bss = @@ -3071,7 +3071,7 @@ gbcfg.nsi = bssgp_nsi; gbcfg.nsip_sgsn_nsei = SGSN_NSEI; gbcfg.core_plmn = (struct osmo_plmn_id){ .mcc = 123, .mnc = 456 }; - gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100); + gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100); gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar"); gbcfg.patch_ptmsi = 1; gbcfg.acquire_imsi = 1; @@ -3525,7 +3525,7 @@ static void test_gbproxy_keep_info() { - struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx); + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx); struct sockaddr_in bss_peer[1] = {{0},}; struct sockaddr_in sgsn_peer= {0}; struct gprs_ra_id rai_bss = @@ -4833,7 +4833,7 @@ static void test_gbproxy_stored_messages() { - struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_bsc_ctx); + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx); struct sockaddr_in bss_peer[1] = {{0},}; struct sockaddr_in sgsn_peer= {0}; struct gprs_ra_id rai_bss = @@ -4857,7 +4857,7 @@ gbcfg.nsi = bssgp_nsi; gbcfg.nsip_sgsn_nsei = SGSN_NSEI; gbcfg.core_plmn = (struct osmo_plmn_id){}; - gbcfg.core_apn = talloc_zero_size(tall_bsc_ctx, 100); + gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100); gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar"); gbcfg.patch_ptmsi = 0; gbcfg.acquire_imsi = 1; @@ -5030,10 +5030,10 @@ int main(int argc, char **argv) { talloc_enable_leak_report(); - tall_bsc_ctx = talloc_named_const(NULL, 0, "gbproxy_test"); - void *log_ctx = talloc_named_const(tall_bsc_ctx, 0, "log"); + tall_sgsn_ctx = talloc_named_const(NULL, 0, "gbproxy_test"); + void *log_ctx = talloc_named_const(tall_sgsn_ctx, 0, "log"); - msgb_talloc_ctx_init(tall_bsc_ctx, 0); + msgb_talloc_ctx_init(tall_sgsn_ctx, 0); osmo_init_logging2(log_ctx, &info); log_set_use_color(osmo_stderr_target, 0); @@ -5044,7 +5044,7 @@ log_set_log_level(osmo_stderr_target, LOGL_DEBUG); log_set_all_filter(osmo_stderr_target, 1); - rate_ctr_init(tall_bsc_ctx); + rate_ctr_init(tall_sgsn_ctx); setlinebuf(stdout); @@ -5070,8 +5070,8 @@ talloc_free(log_ctx); /* expecting root and msgb ctx, empty */ - OSMO_ASSERT(talloc_total_blocks(tall_bsc_ctx) == 2); - talloc_free(tall_bsc_ctx); + OSMO_ASSERT(talloc_total_blocks(tall_sgsn_ctx) == 2); + talloc_free(tall_sgsn_ctx); return 0; } diff --git a/tests/sgsn/sgsn_test.c b/tests/sgsn/sgsn_test.c index 3e86266..214d07b 100644 --- a/tests/sgsn/sgsn_test.c +++ b/tests/sgsn/sgsn_test.c @@ -40,7 +40,7 @@ #include -void *tall_bsc_ctx; +void *tall_sgsn_ctx; static struct sgsn_instance sgsn_inst = { .config_file = "osmo_sgsn.cfg", .cfg = { @@ -1637,7 +1637,7 @@ osmo_sgsn_ctx = talloc_named_const(NULL, 0, "osmo_sgsn"); osmo_init_logging2(osmo_sgsn_ctx, &info); - tall_bsc_ctx = talloc_named_const(osmo_sgsn_ctx, 0, "bsc"); + tall_sgsn_ctx = talloc_named_const(osmo_sgsn_ctx, 0, "sgsn"); msgb_ctx = msgb_talloc_ctx_init(osmo_sgsn_ctx, 0); sgsn_rate_ctr_init(); @@ -1661,7 +1661,7 @@ talloc_report_full(osmo_sgsn_ctx, stderr); OSMO_ASSERT(talloc_total_blocks(msgb_ctx) == 1); - OSMO_ASSERT(talloc_total_blocks(tall_bsc_ctx) == 2); + OSMO_ASSERT(talloc_total_blocks(tall_sgsn_ctx) == 2); return 0; } diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py index afe1cfd..73dd399 100755 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -75,7 +75,7 @@ "doc/examples/osmo-gbproxy/osmo-gbproxy.cfg"] def vty_app(self): - return (4246, "./src/gprs/osmo-gbproxy", "OsmoGbProxy", "bsc") + return (4246, "./src/gprs/osmo-gbproxy", "OsmoGbProxy", "gbproxy") def testVtyTree(self): self.vty.enable() -- To view, visit https://gerrit.osmocom.org/11528 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I93f0dc721c2eff8a87fb9248882f24768f708713 Gerrit-Change-Number: 11528 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 18:06:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 30 Oct 2018 18:06:07 +0000 Subject: Change in osmo-sgsn[master]: Allocate sgsn_instance with talloc In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11529 ) Change subject: Allocate sgsn_instance with talloc ...................................................................... Allocate sgsn_instance with talloc Change-Id: I4a83c5799f0dbd5eb762039c6cfba671f6e465be --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/gprs_sgsn.c M src/gprs/sgsn_main.c 3 files changed, 28 insertions(+), 24 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index 1913591..cf78766 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -396,7 +396,8 @@ extern struct llist_head sgsn_pdp_ctxts; uint32_t sgsn_alloc_ptmsi(void); -void sgsn_inst_init(void); +struct sgsn_instance *sgsn_instance_alloc(void *talloc_ctx); +void sgsn_inst_init(struct sgsn_instance *sgsn); char *gprs_pdpaddr2str(uint8_t *pdpa, uint8_t len); diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index bac7325..01f039a 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -978,7 +979,17 @@ osmo_timer_schedule(&sgsn->llme_timer, GPRS_LLME_CHECK_TICK, 0); } -void sgsn_inst_init() +struct sgsn_instance *sgsn_instance_alloc(void *talloc_ctx) +{ + struct sgsn_instance *inst; + inst = talloc_zero(talloc_ctx, struct sgsn_instance); + inst->cfg.gtp_statedir = talloc_strdup(inst, "./"); + inst->cfg.auth_policy = SGSN_AUTH_POLICY_CLOSED; + inst->cfg.gsup_server_port = OSMO_GSUP_PORT; + return inst; +} + +void sgsn_inst_init(struct sgsn_instance *sgsn) { osmo_timer_setup(&sgsn->llme_timer, sgsn_llme_check_cb, NULL); osmo_timer_schedule(&sgsn->llme_timer, GPRS_LLME_CHECK_TICK, 0); diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c index a17d925..1c76d6f 100644 --- a/src/gprs/sgsn_main.c +++ b/src/gprs/sgsn_main.c @@ -40,8 +40,6 @@ #include #include -#include - #include #include @@ -90,15 +88,8 @@ #define CONFIG_FILE_DEFAULT "osmo-sgsn.cfg" #define CONFIG_FILE_LEGACY "osmo_sgsn.cfg" -static struct sgsn_instance sgsn_inst = { - .config_file = NULL, - .cfg = { - .gtp_statedir = "./", - .auth_policy = SGSN_AUTH_POLICY_CLOSED, - .gsup_server_port = OSMO_GSUP_PORT, - }, -}; -struct sgsn_instance *sgsn = &sgsn_inst; + +struct sgsn_instance *sgsn; /* call-back function for the NS protocol */ static int sgsn_ns_cb(enum gprs_ns_evt event, struct gprs_nsvc *nsvc, @@ -261,7 +252,7 @@ daemonize = 1; break; case 'c': - sgsn_inst.config_file = strdup(optarg); + osmo_talloc_replace_string(sgsn, &sgsn->config_file, optarg); break; case 'T': log_set_print_timestamp(osmo_stderr_target, 1); @@ -376,6 +367,7 @@ srand(time(NULL)); tall_sgsn_ctx = talloc_named_const(NULL, 0, "osmo_sgsn"); + sgsn = sgsn_instance_alloc(tall_sgsn_ctx); msgb_talloc_ctx_init(tall_sgsn_ctx, 0); vty_info.tall_ctx = tall_sgsn_ctx; @@ -394,7 +386,7 @@ logging_vty_add_cmds(NULL); osmo_talloc_vty_add_cmds(); osmo_stats_vty_add_cmds(&gprs_log_info); - sgsn_vty_init(&sgsn_inst.cfg); + sgsn_vty_init(&sgsn->cfg); ctrl_vty_init(tall_sgsn_ctx); #if BUILD_IU @@ -411,13 +403,13 @@ * previous setups that might rely on the legacy default config file * name, we need to look for the old config file if no -c option was * passed AND no file exists with the new default file name. */ - if (!sgsn_inst.config_file) { + if (!sgsn->config_file) { /* No -c option was passed */ if (file_exists(CONFIG_FILE_LEGACY) && !file_exists(CONFIG_FILE_DEFAULT)) - sgsn_inst.config_file = CONFIG_FILE_LEGACY; + osmo_talloc_replace_string(sgsn, &sgsn->config_file, CONFIG_FILE_LEGACY); else - sgsn_inst.config_file = CONFIG_FILE_DEFAULT; + osmo_talloc_replace_string(sgsn, &sgsn->config_file, CONFIG_FILE_DEFAULT); } rate_ctr_init(tall_sgsn_ctx); @@ -430,21 +422,21 @@ LOGP(DGPRS, LOGL_ERROR, "Unable to instantiate NS\n"); exit(1); } - bssgp_nsi = sgsn_inst.cfg.nsi = sgsn_nsi; + bssgp_nsi = sgsn->cfg.nsi = sgsn_nsi; gprs_llc_init("/usr/local/lib/osmocom/crypt/"); sgsn_rate_ctr_init(); - sgsn_inst_init(); + sgsn_inst_init(sgsn); gprs_ns_vty_init(bssgp_nsi); bssgp_vty_init(); gprs_llc_vty_init(); gprs_sndcp_vty_init(); sgsn_auth_init(); - sgsn_cdr_init(&sgsn_inst); + sgsn_cdr_init(sgsn); /* FIXME: register signal handler for SS_L_NS */ - rc = sgsn_parse_config(sgsn_inst.config_file); + rc = sgsn_parse_config(sgsn->config_file); if (rc < 0) { LOGP(DGPRS, LOGL_FATAL, "Error in config file\n"); exit(2); @@ -471,14 +463,14 @@ } - rc = sgsn_gtp_init(&sgsn_inst); + rc = sgsn_gtp_init(sgsn); if (rc) { LOGP(DGPRS, LOGL_FATAL, "Cannot bind/listen on GTP socket\n"); exit(2); } else LOGP(DGPRS, LOGL_NOTICE, "libGTP v%s initialized\n", gtp_version()); - rc = gprs_subscr_init(&sgsn_inst); + rc = gprs_subscr_init(sgsn); if (rc < 0) { LOGP(DGPRS, LOGL_FATAL, "Cannot set up subscriber management\n"); exit(2); -- To view, visit https://gerrit.osmocom.org/11529 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4a83c5799f0dbd5eb762039c6cfba671f6e465be Gerrit-Change-Number: 11529 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 18:06:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 30 Oct 2018 18:06:08 +0000 Subject: Change in osmo-sgsn[master]: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10284 ) Change subject: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr ...................................................................... Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr osmo-hlr has recently (as of Change-Id Iad227bb477d64da30dd6bfbbe1bd0c0a55be9474) a working shared library implementation of libosmo-gsup-client. We can remove the local implementation in osmo-sgsn and use the system-installed shared library instead. Change-Id: I6f542945403cf2e3ddac419186b09ec0e2d43b69 --- M configure.ac M contrib/jenkins.sh M debian/control M include/osmocom/sgsn/Makefile.am D include/osmocom/sgsn/gsup_client.h M include/osmocom/sgsn/sgsn.h M src/gprs/Makefile.am M src/gprs/gprs_subscriber.c D src/gprs/gsup_client.c M src/gprs/sgsn_vty.c M tests/sgsn/Makefile.am M tests/sgsn/sgsn_test.c 12 files changed, 30 insertions(+), 443 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 73b6dce..0e4ff94 100644 --- a/configure.ac +++ b/configure.ac @@ -46,6 +46,7 @@ PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.11.0) PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.2.0) +PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 0.2.1) # Enable/disable 3G aka IuPS + IuCS support? AC_ARG_ENABLE([iu], [AS_HELP_STRING([--enable-iu], [Build 3G support, aka IuPS and IuCS interfaces])], diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index d873ee9..64663d6 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -28,6 +28,7 @@ osmo-build-dep.sh libosmo-abis osmo-build-dep.sh libosmo-netif osmo-build-dep.sh osmo-ggsn +osmo-build-dep.sh osmo-hlr enable_werror="" if [ "x$IU" = "x--enable-iu" ]; then diff --git a/debian/control b/debian/control index 8e34dbe..9594a08 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,8 @@ libosmo-ranap-dev, libosmo-sccp-dev, libosmo-sigtran-dev, - libosmo-netif-dev + libosmo-netif-dev, + libosmo-gsup-client-dev Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-sgsn.git Vcs-Browser: https://git.osmocom.org/osmo-sgsn diff --git a/include/osmocom/sgsn/Makefile.am b/include/osmocom/sgsn/Makefile.am index 3b563c4..cbf7c51 100644 --- a/include/osmocom/sgsn/Makefile.am +++ b/include/osmocom/sgsn/Makefile.am @@ -16,7 +16,6 @@ gprs_sndcp_xid.h \ gprs_subscriber.h \ gprs_utils.h \ - gsup_client.h \ gtphub.h \ sgsn.h \ signal.h \ diff --git a/include/osmocom/sgsn/gsup_client.h b/include/osmocom/sgsn/gsup_client.h deleted file mode 100644 index 6ba0d15..0000000 --- a/include/osmocom/sgsn/gsup_client.h +++ /dev/null @@ -1,63 +0,0 @@ -/* GPRS Subscriber Update Protocol client */ - -/* (C) 2014 by Sysmocom s.f.m.c. GmbH - * All Rights Reserved - * - * Author: Jacob Erlbeck - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ -#pragma once - -#include - -#include - -#define GSUP_CLIENT_RECONNECT_INTERVAL 10 -#define GSUP_CLIENT_PING_INTERVAL 20 - -struct msgb; -struct ipa_client_conn; -struct gsup_client; - -/* Expects message in msg->l2h */ -typedef int (*gsup_client_read_cb_t)(struct gsup_client *gsupc, - struct msgb *msg); - -struct gsup_client { - const char *unit_name; - - struct ipa_client_conn *link; - gsup_client_read_cb_t read_cb; - void *data; - - struct osmo_oap_client_state oap_state; - - struct osmo_timer_list ping_timer; - struct osmo_timer_list connect_timer; - int is_connected; - int got_ipa_pong; -}; - -struct gsup_client *gsup_client_create(const char *unit_name, - const char *ip_addr, - unsigned int tcp_port, - gsup_client_read_cb_t read_cb, - struct osmo_oap_client_config *oapc_config); - -void gsup_client_destroy(struct gsup_client *gsupc); -int gsup_client_send(struct gsup_client *gsupc, struct msgb *msg); -struct msgb *gsup_client_msgb_alloc(void); - diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h index 59d0bd7..3a34ff9 100644 --- a/include/osmocom/sgsn/sgsn.h +++ b/include/osmocom/sgsn/sgsn.h @@ -7,6 +7,7 @@ #include #include #include +#include #include #include "../../bscconfig.h" @@ -18,7 +19,6 @@ #include #include -struct gprs_gsup_client; struct hostent; enum sgsn_auth_policy { @@ -138,7 +138,7 @@ /* GSN instance for libgtp */ struct gsn_t *gsn; /* Subscriber */ - struct gsup_client *gsup_client; + struct osmo_gsup_client *gsup_client; /* LLME inactivity timer */ struct osmo_timer_list llme_timer; diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am index 0f7c5fa..ba5dfd6 100644 --- a/src/gprs/Makefile.am +++ b/src/gprs/Makefile.am @@ -13,6 +13,7 @@ $(LIBOSMOCTRL_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOGB_CFLAGS) \ + $(LIBOSMOGSUPCLIENT_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(LIBCARES_CFLAGS) \ $(LIBGTP_CFLAGS) \ @@ -84,11 +85,11 @@ slhc.c \ gprs_llc_xid.c \ v42bis.c \ - gsup_client.c \ $(NULL) osmo_sgsn_LDADD = \ $(OSMO_LIBS) \ $(LIBOSMOABIS_LIBS) \ + $(LIBOSMOGSUPCLIENT_LIBS) \ $(LIBCARES_LIBS) \ $(LIBGTP_LIBS) \ -lrt \ diff --git a/src/gprs/gprs_subscriber.c b/src/gprs/gprs_subscriber.c index 6c4f81f..4ab45c2 100644 --- a/src/gprs/gprs_subscriber.c +++ b/src/gprs/gprs_subscriber.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include @@ -52,7 +52,7 @@ LLIST_HEAD(_gprs_subscribers); struct llist_head * const gprs_subscribers = &_gprs_subscribers; -static int gsup_read_cb(struct gsup_client *gsupc, struct msgb *msg); +static int gsup_read_cb(struct osmo_gsup_client *gsupc, struct msgb *msg); /* TODO: Some functions are specific to the SGSN, but this file is more general * (it has gprs_* name). Either move these functions elsewhere, split them and @@ -69,7 +69,8 @@ addr_str = inet_ntoa(sgi->cfg.gsup_server_addr.sin_addr); - sgi->gsup_client = gsup_client_create( + sgi->gsup_client = osmo_gsup_client_create( + sgi, "SGSN", addr_str, sgi->cfg.gsup_server_port, &gsup_read_cb, @@ -81,7 +82,7 @@ return 1; } -static int gsup_read_cb(struct gsup_client *gsupc, struct msgb *msg) +static int gsup_read_cb(struct osmo_gsup_client *gsupc, struct msgb *msg) { int rc; @@ -194,7 +195,7 @@ static int gprs_subscr_tx_gsup_message(struct gprs_subscr *subscr, struct osmo_gsup_message *gsup_msg) { - struct msgb *msg = gsup_client_msgb_alloc(); + struct msgb *msg = osmo_gsup_client_msgb_alloc(); if (strlen(gsup_msg->imsi) == 0 && subscr) osmo_strlcpy(gsup_msg->imsi, subscr->imsi, @@ -210,7 +211,7 @@ return -ENOTSUP; } - return gsup_client_send(sgsn->gsup_client, msg); + return osmo_gsup_client_send(sgsn->gsup_client, msg); } static int gprs_subscr_tx_gsup_error_reply(struct gprs_subscr *subscr, diff --git a/src/gprs/gsup_client.c b/src/gprs/gsup_client.c deleted file mode 100644 index 37bebd9..0000000 --- a/src/gprs/gsup_client.c +++ /dev/null @@ -1,355 +0,0 @@ -/* Generic Subscriber Update Protocol client */ - -/* (C) 2014-2016 by Sysmocom s.f.m.c. GmbH - * All Rights Reserved - * - * Author: Jacob Erlbeck - * Author: Neels Hofmeyr - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include - -#include -#include -#include -#include - -#include - -#include -#include - -extern void *tall_sgsn_ctx; - -static void start_test_procedure(struct gsup_client *gsupc); - -static void gsup_client_send_ping(struct gsup_client *gsupc) -{ - struct msgb *msg = gsup_client_msgb_alloc(); - - msg->l2h = msgb_put(msg, 1); - msg->l2h[0] = IPAC_MSGT_PING; - ipa_msg_push_header(msg, IPAC_PROTO_IPACCESS); - ipa_client_conn_send(gsupc->link, msg); -} - -static int gsup_client_connect(struct gsup_client *gsupc) -{ - int rc; - - if (gsupc->is_connected) - return 0; - - if (osmo_timer_pending(&gsupc->connect_timer)) { - LOGP(DLGSUP, LOGL_DEBUG, - "GSUP connect: connect timer already running\n"); - osmo_timer_del(&gsupc->connect_timer); - } - - if (osmo_timer_pending(&gsupc->ping_timer)) { - LOGP(DLGSUP, LOGL_DEBUG, - "GSUP connect: ping timer already running\n"); - osmo_timer_del(&gsupc->ping_timer); - } - - if (ipa_client_conn_clear_queue(gsupc->link) > 0) - LOGP(DLGSUP, LOGL_DEBUG, "GSUP connect: discarded stored messages\n"); - - rc = ipa_client_conn_open(gsupc->link); - - if (rc >= 0) { - LOGP(DLGSUP, LOGL_NOTICE, "GSUP connecting to %s:%d\n", - gsupc->link->addr, gsupc->link->port); - return 0; - } - - LOGP(DLGSUP, LOGL_ERROR, "GSUP failed to connect to %s:%d: %s\n", - gsupc->link->addr, gsupc->link->port, strerror(-rc)); - - if (rc == -EBADF || rc == -ENOTSOCK || rc == -EAFNOSUPPORT || - rc == -EINVAL) - return rc; - - osmo_timer_schedule(&gsupc->connect_timer, - GSUP_CLIENT_RECONNECT_INTERVAL, 0); - - LOGP(DLGSUP, LOGL_INFO, "Scheduled timer to retry GSUP connect to %s:%d\n", - gsupc->link->addr, gsupc->link->port); - - return 0; -} - -static void connect_timer_cb(void *gsupc_) -{ - struct gsup_client *gsupc = gsupc_; - - if (gsupc->is_connected) - return; - - gsup_client_connect(gsupc); -} - -static void client_send(struct gsup_client *gsupc, int proto_ext, - struct msgb *msg_tx) -{ - ipa_prepend_header_ext(msg_tx, proto_ext); - ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO); - ipa_client_conn_send(gsupc->link, msg_tx); - /* msg_tx is now queued and will be freed. */ -} - -static void gsup_client_oap_register(struct gsup_client *gsupc) -{ - struct msgb *msg_tx; - int rc; - rc = osmo_oap_client_register(&gsupc->oap_state, &msg_tx); - - if ((rc < 0) || (!msg_tx)) { - LOGP(DLGSUP, LOGL_ERROR, "GSUP OAP set up, but cannot register.\n"); - return; - } - - client_send(gsupc, IPAC_PROTO_EXT_OAP, msg_tx); -} - -static void gsup_client_updown_cb(struct ipa_client_conn *link, int up) -{ - struct gsup_client *gsupc = link->data; - - LOGP(DLGSUP, LOGL_INFO, "GSUP link to %s:%d %s\n", - link->addr, link->port, up ? "UP" : "DOWN"); - - gsupc->is_connected = up; - - if (up) { - start_test_procedure(gsupc); - - if (gsupc->oap_state.state == OSMO_OAP_INITIALIZED) - gsup_client_oap_register(gsupc); - - osmo_timer_del(&gsupc->connect_timer); - } else { - osmo_timer_del(&gsupc->ping_timer); - - osmo_timer_schedule(&gsupc->connect_timer, - GSUP_CLIENT_RECONNECT_INTERVAL, 0); - } -} - -static int gsup_client_oap_handle(struct gsup_client *gsupc, struct msgb *msg_rx) -{ - int rc; - struct msgb *msg_tx; - - /* If the oap_state is disabled, this will reject the messages. */ - rc = osmo_oap_client_handle(&gsupc->oap_state, msg_rx, &msg_tx); - msgb_free(msg_rx); - if (rc < 0) - return rc; - - if (msg_tx) - client_send(gsupc, IPAC_PROTO_EXT_OAP, msg_tx); - - return 0; -} - -static int gsup_client_read_cb(struct ipa_client_conn *link, struct msgb *msg) -{ - struct ipaccess_head *hh = (struct ipaccess_head *) msg->data; - struct ipaccess_head_ext *he = (struct ipaccess_head_ext *) msgb_l2(msg); - struct gsup_client *gsupc = (struct gsup_client *)link->data; - int rc; - struct ipaccess_unit ipa_dev = { - /* see gsup_client_create() on const vs non-const */ - .unit_name = (char*)gsupc->unit_name, - }; - - OSMO_ASSERT(ipa_dev.unit_name); - - msg->l2h = &hh->data[0]; - - rc = ipaccess_bts_handle_ccm(link, &ipa_dev, msg); - - if (rc < 0) { - LOGP(DLGSUP, LOGL_NOTICE, - "GSUP received an invalid IPA/CCM message from %s:%d\n", - link->addr, link->port); - /* Link has been closed */ - gsupc->is_connected = 0; - msgb_free(msg); - return -1; - } - - if (rc == 1) { - uint8_t msg_type = *(msg->l2h); - /* CCM message */ - if (msg_type == IPAC_MSGT_PONG) { - LOGP(DLGSUP, LOGL_DEBUG, "GSUP receiving PONG\n"); - gsupc->got_ipa_pong = 1; - } - - msgb_free(msg); - return 0; - } - - if (hh->proto != IPAC_PROTO_OSMO) - goto invalid; - - if (!he || msgb_l2len(msg) < sizeof(*he)) - goto invalid; - - msg->l2h = &he->data[0]; - - if (he->proto == IPAC_PROTO_EXT_GSUP) { - OSMO_ASSERT(gsupc->read_cb != NULL); - gsupc->read_cb(gsupc, msg); - /* expecting read_cb() to free msg */ - } else if (he->proto == IPAC_PROTO_EXT_OAP) { - return gsup_client_oap_handle(gsupc, msg); - /* gsup_client_oap_handle frees msg */ - } else - goto invalid; - - return 0; - -invalid: - LOGP(DLGSUP, LOGL_NOTICE, - "GSUP received an invalid IPA message from %s:%d, size = %d\n", - link->addr, link->port, msgb_length(msg)); - - msgb_free(msg); - return -1; -} - -static void ping_timer_cb(void *gsupc_) -{ - struct gsup_client *gsupc = gsupc_; - - LOGP(DLGSUP, LOGL_INFO, "GSUP ping callback (%s, %s PONG)\n", - gsupc->is_connected ? "connected" : "not connected", - gsupc->got_ipa_pong ? "got" : "didn't get"); - - if (gsupc->got_ipa_pong) { - start_test_procedure(gsupc); - return; - } - - LOGP(DLGSUP, LOGL_NOTICE, "GSUP ping timed out, reconnecting\n"); - ipa_client_conn_close(gsupc->link); - gsupc->is_connected = 0; - - gsup_client_connect(gsupc); -} - -static void start_test_procedure(struct gsup_client *gsupc) -{ - osmo_timer_setup(&gsupc->ping_timer, ping_timer_cb, gsupc); - - gsupc->got_ipa_pong = 0; - osmo_timer_schedule(&gsupc->ping_timer, GSUP_CLIENT_PING_INTERVAL, 0); - LOGP(DLGSUP, LOGL_DEBUG, "GSUP sending PING\n"); - gsup_client_send_ping(gsupc); -} - -struct gsup_client *gsup_client_create(const char *unit_name, - const char *ip_addr, - unsigned int tcp_port, - gsup_client_read_cb_t read_cb, - struct osmo_oap_client_config *oapc_config) -{ - struct gsup_client *gsupc; - int rc; - - gsupc = talloc_zero(tall_sgsn_ctx, struct gsup_client); - OSMO_ASSERT(gsupc); - - /* struct ipaccess_unit has a non-const unit_name, so let's copy to be - * able to have a non-const unit_name here as well. To not taint the - * public gsup_client API, let's store it in a const char* anyway. */ - gsupc->unit_name = talloc_strdup(gsupc, unit_name); - OSMO_ASSERT(gsupc->unit_name); - - /* a NULL oapc_config will mark oap_state disabled. */ - rc = osmo_oap_client_init(oapc_config, &gsupc->oap_state); - if (rc != 0) - goto failed; - - gsupc->link = ipa_client_conn_create(gsupc, - /* no e1inp */ NULL, - 0, - ip_addr, tcp_port, - gsup_client_updown_cb, - gsup_client_read_cb, - /* default write_cb */ NULL, - gsupc); - if (!gsupc->link) - goto failed; - - osmo_timer_setup(&gsupc->connect_timer, connect_timer_cb, gsupc); - - rc = gsup_client_connect(gsupc); - - if (rc < 0) - goto failed; - - gsupc->read_cb = read_cb; - - return gsupc; - -failed: - gsup_client_destroy(gsupc); - return NULL; -} - -void gsup_client_destroy(struct gsup_client *gsupc) -{ - osmo_timer_del(&gsupc->connect_timer); - osmo_timer_del(&gsupc->ping_timer); - - if (gsupc->link) { - ipa_client_conn_close(gsupc->link); - ipa_client_conn_destroy(gsupc->link); - gsupc->link = NULL; - } - talloc_free(gsupc); -} - -int gsup_client_send(struct gsup_client *gsupc, struct msgb *msg) -{ - if (!gsupc) { - LOGP(DGPRS, LOGL_NOTICE, "No GSUP client, unable to " - "send %s\n", msgb_hexdump(msg)); - msgb_free(msg); - return -ENOTCONN; - } - - if (!gsupc->is_connected) { - LOGP(DGPRS, LOGL_NOTICE, "GSUP not connected, unable to " - "send %s\n", msgb_hexdump(msg)); - msgb_free(msg); - return -EAGAIN; - } - - client_send(gsupc, IPAC_PROTO_EXT_GSUP, msg); - - return 0; -} - -struct msgb *gsup_client_msgb_alloc(void) -{ - return msgb_alloc_headroom(4000, 64, __func__); -} diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index 72a310b..f57a2b9 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am index 0eb2100..956ef8d 100644 --- a/tests/sgsn/Makefile.am +++ b/tests/sgsn/Makefile.am @@ -9,6 +9,7 @@ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOGSUPCLIENT_CFLAGS) \ $(LIBCARES_CFLAGS) \ $(LIBGTP_CFLAGS) \ $(NULL) @@ -37,7 +38,7 @@ -Wl,--wrap=sgsn_update_subscriber_data \ -Wl,--wrap=gprs_subscr_request_update_location \ -Wl,--wrap=gprs_subscr_request_auth_info \ - -Wl,--wrap=gsup_client_send \ + -Wl,--wrap=osmo_gsup_client_send \ $(NULL) sgsn_test_LDADD = \ @@ -62,11 +63,11 @@ $(top_builddir)/src/gprs/gprs_sndcp_pcomp.o \ $(top_builddir)/src/gprs/v42bis.o \ $(top_builddir)/src/gprs/gprs_sndcp_dcomp.o \ - $(top_builddir)/src/gprs/gsup_client.o \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOGB_LIBS) \ + $(LIBOSMOGSUPCLIENT_LIBS) \ $(LIBCARES_LIBS) \ $(LIBGTP_LIBS) \ -lrt \ diff --git a/tests/sgsn/sgsn_test.c b/tests/sgsn/sgsn_test.c index 214d07b..111515e 100644 --- a/tests/sgsn/sgsn_test.c +++ b/tests/sgsn/sgsn_test.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include @@ -148,13 +148,13 @@ }; /* override, requires '-Wl,--wrap=gsup_client_send' */ -int __real_gsup_client_send(struct gsup_client *gsupc, struct msgb *msg); -int (*gsup_client_send_cb)(struct gsup_client *gsupc, struct msgb *msg) = - &__real_gsup_client_send; +int __real_osmo_gsup_client_send(struct osmo_gsup_client *gsupc, struct msgb *msg); +int (*osmo_gsup_client_send_cb)(struct osmo_gsup_client *gsupc, struct msgb *msg) = + &__real_osmo_gsup_client_send; -int __wrap_gsup_client_send(struct gsup_client *gsupc, struct msgb *msg) +int __wrap_osmo_gsup_client_send(struct osmo_gsup_client *gsupc, struct msgb *msg) { - return (*gsup_client_send_cb)(gsupc, msg); + return (*osmo_gsup_client_send_cb)(gsupc, msg); }; static int count(struct llist_head *head) @@ -729,7 +729,7 @@ cleanup_test(); } -int my_gsup_client_send_dummy(struct gsup_client *gsupc, struct msgb *msg) +int my_gsup_client_send_dummy(struct osmo_gsup_client *gsupc, struct msgb *msg) { msgb_free(msg); return 0; @@ -1032,7 +1032,7 @@ return rx_gsup_message(update_location_res, sizeof(update_location_res)); }; -int my_gsup_client_send(struct gsup_client *gsupc, struct msgb *msg) +int my_gsup_client_send(struct osmo_gsup_client *gsupc, struct msgb *msg) { struct osmo_gsup_message to_peer = {0}; struct osmo_gsup_message from_peer = {0}; @@ -1074,7 +1074,7 @@ return 0; } - reply_msg = gsup_client_msgb_alloc(); + reply_msg = osmo_gsup_client_msgb_alloc(); reply_msg->l2h = reply_msg->data; osmo_gsup_encode(reply_msg, &from_peer); gprs_subscr_rx_gsup_message(reply_msg); @@ -1451,7 +1451,7 @@ printf("Testing GGSN selection\n"); - gsup_client_send_cb = my_gsup_client_send_dummy; + osmo_gsup_client_send_cb = my_gsup_client_send_dummy; /* Check for emptiness */ OSMO_ASSERT(gprs_subscr_get_by_imsi(imsi1) == NULL); @@ -1570,7 +1570,7 @@ sgsn_ggsn_ctx_free(ggcs[1]); sgsn_ggsn_ctx_free(ggcs[2]); - gsup_client_send_cb = __real_gsup_client_send; + osmo_gsup_client_send_cb = __real_osmo_gsup_client_send; cleanup_test(); } -- To view, visit https://gerrit.osmocom.org/10284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6f542945403cf2e3ddac419186b09ec0e2d43b69 Gerrit-Change-Number: 10284 Gerrit-PatchSet: 5 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 18:27:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 18:27:33 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: build-osmo-sgsn: Depend on osmo-hlr build Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11530 Change subject: contrib: build-osmo-sgsn: Depend on osmo-hlr build ...................................................................... contrib: build-osmo-sgsn: Depend on osmo-hlr build Since osmo-sgsn f4b2c4ca42cc530c38c9ac6f275e4d7da9315fa2, it depends on libosmo-gsup-client available in osmo-hlr. Change-Id: I6aa997ff2092f9ddf2ac475fd094803be9063980 --- M contrib/jenkins-build-osmo-sgsn.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/30/11530/1 diff --git a/contrib/jenkins-build-osmo-sgsn.sh b/contrib/jenkins-build-osmo-sgsn.sh index ffa787c..f296f8b 100755 --- a/contrib/jenkins-build-osmo-sgsn.sh +++ b/contrib/jenkins-build-osmo-sgsn.sh @@ -9,6 +9,7 @@ build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen build_repo libosmo-sccp ${SANITIZE_FLAGS} build_repo osmo-ggsn ${SANITIZE_FLAGS} +build_repo osmo-hlr ${SANITIZE_FLAGS} build_repo libasn1c ${SANITIZE_FLAGS} build_repo osmo-iuh ${SANITIZE_FLAGS} build_repo osmo-sgsn ${SANITIZE_FLAGS} --enable-iu -- To view, visit https://gerrit.osmocom.org/11530 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6aa997ff2092f9ddf2ac475fd094803be9063980 Gerrit-Change-Number: 11530 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 18:51:31 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 30 Oct 2018 18:51:31 +0000 Subject: Change in osmo-msc[master]: lu_fsm: result cb: use proper cause type (warning/coverity) Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11531 Change subject: lu_fsm: result cb: use proper cause type (warning/coverity) ...................................................................... lu_fsm: result cb: use proper cause type (warning/coverity) enum gsm48_gmm_cause is the wrong enum to pass to lu_fsm_failure(). Use enum gsm48_reject_value instead. Change-Id: If661f72056decb28c0ee82ad2449630a24d4f31c --- M src/libvlr/vlr_lu_fsm.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/31/11531/1 diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index bf23551..717db42 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -1188,8 +1188,8 @@ /* continue in MSC ?!? */ } else { /* unsuccessful case */ - enum gsm48_gmm_cause cause = - *(enum gsm48_gmm_cause *)data; + enum gsm48_reject_value cause = + *(enum gsm48_reject_value *)data; /* Ignoring standalone mode for now. */ if (0 /* procedure_error && vlr->cfg.standalone_mode */) { osmo_fsm_inst_state_chg(fi, -- To view, visit https://gerrit.osmocom.org/11531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If661f72056decb28c0ee82ad2449630a24d4f31c Gerrit-Change-Number: 11531 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 18:54:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 30 Oct 2018 18:54:46 +0000 Subject: Change in osmo-msc[master]: lu_fsm: result cb: use proper cause type (warning/coverity) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11531 ) Change subject: lu_fsm: result cb: use proper cause type (warning/coverity) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If661f72056decb28c0ee82ad2449630a24d4f31c Gerrit-Change-Number: 11531 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 30 Oct 2018 18:54:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 21:16:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 30 Oct 2018 21:16:55 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: build-osmo-sgsn: Depend on osmo-hlr build In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11530 ) Change subject: contrib: build-osmo-sgsn: Depend on osmo-hlr build ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11530 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6aa997ff2092f9ddf2ac475fd094803be9063980 Gerrit-Change-Number: 11530 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Tue, 30 Oct 2018 21:16:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 21:17:22 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 30 Oct 2018 21:17:22 +0000 Subject: Change in osmo-gsm-tester[master]: suits: Rename netreg_mass to nitb_netreg_mass In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/11515 ) Change subject: suits: Rename netreg_mass to nitb_netreg_mass ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11515 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5a83f5fd984084e8050edbb4d8224c1ba1d756c8 Gerrit-Change-Number: 11515 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: osmith Gerrit-Comment-Date: Tue, 30 Oct 2018 21:17:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 21:17:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 30 Oct 2018 21:17:43 +0000 Subject: Change in osmo-gsm-tester[master]: utils: Introduce show_usb_device.py In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11460 ) Change subject: utils: Introduce show_usb_device.py ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iec049e2d56d61ecd50b65b64d95d69641fa0f8be Gerrit-Change-Number: 11460 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 30 Oct 2018 21:17:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 21:17:52 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 30 Oct 2018 21:17:52 +0000 Subject: Change in osmo-gsm-tester[master]: suits: Rename netreg_mass to nitb_netreg_mass In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/11515 ) Change subject: suits: Rename netreg_mass to nitb_netreg_mass ...................................................................... Patch Set 2: FYI: I will have some time the next few days to review and move this forward as well. -- To view, visit https://gerrit.osmocom.org/11515 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5a83f5fd984084e8050edbb4d8224c1ba1d756c8 Gerrit-Change-Number: 11515 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: osmith Gerrit-Comment-Date: Tue, 30 Oct 2018 21:17:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 21:19:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 30 Oct 2018 21:19:04 +0000 Subject: Change in osmocom-bb[master]: l1ctl_proto.h: use flexible array member for traffic messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11395 ) Change subject: l1ctl_proto.h: use flexible array member for traffic messages ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I119fa36c84e95c3003d57c19e25f8146ed45c3c6 Gerrit-Change-Number: 11395 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 30 Oct 2018 21:19:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 21:22:59 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 30 Oct 2018 21:22:59 +0000 Subject: Change in osmo-gsm-tester[master]: Integrate mass LU test to run fine under osmo-gsm-tester In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/11516 ) Change subject: Integrate mass LU test to run fine under osmo-gsm-tester ...................................................................... Patch Set 2: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/11516/2/src/osmo_ms_driver/starter.py File src/osmo_ms_driver/starter.py: https://gerrit.osmocom.org/#/c/11516/2/src/osmo_ms_driver/starter.py at 64 PS2, Line 64: #pcap_recorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), None, : # 'host %s and port not 22' % self.addr()) I think starting 10k tcpdump is not that desirable. https://gerrit.osmocom.org/#/c/11516/2/src/osmo_ms_driver/starter.py at 55 PS2, Line 55: inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmocom-bb'))) : : binary = inst.child('bin', 'virtphy') : if not os.path.isfile(binary): : raise RuntimeError('Binary missing: %r' % binary) : lib = inst.child('lib') : if not os.path.isdir(lib): : raise RuntimeError('No lib/ in %r' % inst) : : #pcap_recorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), None, : # 'host %s and port not 22' % self.addr()) : : env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } Can this be in a helper returning the binary + env? https://gerrit.osmocom.org/#/c/11516/2/src/osmo_ms_driver/starter.py at 141 PS2, Line 141: self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) : : inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmocom-bb'))) : : binary = inst.child('bin', 'mobile') : if not os.path.isfile(binary): : raise RuntimeError('Binary missing: %r' % binary) : lib = inst.child('lib') : if not os.path.isdir(lib): : raise RuntimeError('No lib/ in %r' % inst) : : #pcap_recorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), None, : # 'host %s and port not 22' % self.addr()) : : env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } Utility function please. -- To view, visit https://gerrit.osmocom.org/11516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6748fce6ca25c7d4daedafe87b6b77c471d17bf9 Gerrit-Change-Number: 11516 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 30 Oct 2018 21:22:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 21:23:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 30 Oct 2018 21:23:24 +0000 Subject: Change in osmocom-bb[master]: layer23/common: introduce L23SAP API for L1CTL In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11246 ) Change subject: layer23/common: introduce L23SAP API for L1CTL ...................................................................... Patch Set 2: I still don't see the value of this, sorry. And actually I think adding another layer makes the code even harder to read compared with the existing code. If you are strongly in fasvor, I'll. +2 thixz series, as you are the most active developer in this area. Let me know. -- To view, visit https://gerrit.osmocom.org/11246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I22d7932ddc03c692f2616726ced53b6e8eef822d Gerrit-Change-Number: 11246 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 30 Oct 2018 21:23:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 21:26:20 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 30 Oct 2018 21:26:20 +0000 Subject: Change in osmo-gsm-tester[master]: Always initialize the _started in the test In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/10685 ) Change subject: Always initialize the _started in the test ...................................................................... Always initialize the _started in the test We don't know at which state the termiation routine will be called and it is best to have a fully initialized object. In prepare we start with a fresh list just to be sure. Change-Id: I675772c89e32620da5695aa4793b735cc266684c --- M src/osmo_ms_driver/location_update_test.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_ms_driver/location_update_test.py b/src/osmo_ms_driver/location_update_test.py index e83d91b..010c278 100644 --- a/src/osmo_ms_driver/location_update_test.py +++ b/src/osmo_ms_driver/location_update_test.py @@ -83,6 +83,7 @@ self._event_server = event_server self._event_server.register(self.handle_msg) self._unstarted = copy(self._mobiles) + self._started = [] def mobiles(self): return self._mobiles -- To view, visit https://gerrit.osmocom.org/10685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I675772c89e32620da5695aa4793b735cc266684c Gerrit-Change-Number: 10685 Gerrit-PatchSet: 7 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 21:28:43 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 30 Oct 2018 21:28:43 +0000 Subject: Change in osmo-gsm-tester[master]: Create a "ms_driver" stub for the testsuite In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/10686 ) Change subject: Create a "ms_driver" stub for the testsuite ...................................................................... Create a "ms_driver" stub for the testsuite All config parameters are hardcoded for now and it should push subscribers into the test (which should be a base class but not a specific test). Change-Id: I586b6d532c6e6395b4e6f2cf2128372237d05a7d --- A src/osmo_gsm_tester/ms_driver.py M src/osmo_gsm_tester/suite.py 2 files changed, 137 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py new file mode 100644 index 0000000..808989e --- /dev/null +++ b/src/osmo_gsm_tester/ms_driver.py @@ -0,0 +1,131 @@ +# ms_driver: Launch OsmocomBB mobile's virtually connected to a BTS +# +# Copyright (C) 2018 by Holger Hans Peter Freyther +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from datetime import timedelta +from . import log +from osmo_ms_driver.cdf import cdfs +from osmo_ms_driver.event_server import EventServer +from osmo_ms_driver.simple_loop import SimpleLoop +from osmo_ms_driver.location_update_test import MassUpdateLocationTest + +import os.path +import shutil +import tempfile + +class Subscriber(log.Origin): + def __init__(self, imsi, ki): + super().__init__(log.C_RUN, 'subscriber') + self._imsi = imsi + self._ki = ki + self._auth_algo = "comp128v1" + self._msisdn = None + + def msisdn(self): + return self._msisdn + + def set_msisdn(self, msisdn): + self._msisdn = msisdn + + def imsi(self): + return self._imsi + + def ki(self): + return self._ki + + def auth_algo(self): + return self._auth_algo + +class MsDriver(log.Origin): + + def __init__(self, suite_run): + super().__init__(log.C_RUN, 'ms-driver') + self._suite_run = suite_run + + # TODO: take config out of the test scenario + self._num_ms = 10 + self._time_start = timedelta(seconds=60) + self._time_step = timedelta(milliseconds=100) + self._test_duration = timedelta(seconds=120) + self._cdf = cdfs["ease_in_out"](self._time_start, self._time_step) + self._loop = SimpleLoop() + self._suite_run.remember_to_stop(self) + self._test_case = None + + if len(self.event_server_path().encode()) > 107: + raise log.Error('Path for event_server socket is longer than max allowed len for unix socket path (107):', self.event_server_path()) + + def event_server_path(self): + if self.event_server_sk_tmp_dir is None: + self.event_server_sk_tmp_dir = tempfile.mkdtemp('', 'ogteventserversk') + return os.path.join(self.event_server_sk_tmp_dir, 'osmo_ms_driver.unix') + + def configure(self): + """ + Configures the subscribers, tests and registration server. Needs to be + called after the complete configuration of this driver. + """ + event_server_path = self.event_server_path() + + self._ev_server = EventServer("ev_server", event_server_path) + self._ev_server.listen(self._loop) + self._test_case = MassUpdateLocationTest("mass", self._num_ms, self._cdf, self._ev_server, self.event_server_sk_tmp_dir) + + # TODO: We should pass subscribers down to the test and not get it from + # there. + self._subs = [Subscriber(imsi=mob.imsi(), ki=mob.ki()) for mob in self._test_case.mobiles()] + + + def ms_subscribers(self): + """ + Returns a list of 'subscribers' that were configured in the + current scenario. + """ + if not hasattr(self, '_subs'): + self.configure() + return self._subs + + def run_test(self): + """ + Runs the configured tests by starting the configured amount of mobile + devices according to their schedule. Returns once all tests succeeded + or the configured timeout has passed. + """ + if not hasattr(self, '_subs'): + self.configure() + self._test_case.run_test(self._loop, self._test_duration) + + def print_stats(self): + """ + Prints statistics about the test run. + """ + self._test_case.print_stats() + + def cleanup(self): + """ + Stops the testcase and all launched processes. Called by the + suite. + """ + + # Clean-up the temporary directory. + if self.event_server_sk_tmp_dir: + shutil.rmtree(path=self.event_server_sk_tmp_dir) + + if not self._test_case: + return + self._test_case.stop_all() + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index 932a6ab..22a47a2 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -23,7 +23,7 @@ import pprint from . import config, log, util, resource, test from .event_loop import MainLoop -from . import osmo_nitb, osmo_hlr, osmo_mgcpgw, osmo_mgw, osmo_msc, osmo_bsc, osmo_stp, osmo_ggsn, osmo_sgsn, modem, esme, osmocon +from . import osmo_nitb, osmo_hlr, osmo_mgcpgw, osmo_mgw, osmo_msc, osmo_bsc, osmo_stp, osmo_ggsn, osmo_sgsn, modem, esme, osmocon, ms_driver class Timeout(Exception): pass @@ -311,6 +311,11 @@ ip_address = self.ip_address() return osmo_stp.OsmoStp(self, ip_address) + def ms_driver(self): + ms = ms_driver.MsDriver(self) + self.register_for_cleanup(ms) + return ms + def bts(self, specifics=None): bts = bts_obj(self, self.reserved_resources.get(resource.R_BTS, specifics=specifics)) bts.set_lac(self.lac()) -- To view, visit https://gerrit.osmocom.org/10686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I586b6d532c6e6395b4e6f2cf2128372237d05a7d Gerrit-Change-Number: 10686 Gerrit-PatchSet: 7 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 23:06:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 30 Oct 2018 23:06:02 +0000 Subject: Change in osmo-gsm-manuals[master]: bsc: document handover Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11532 Change subject: bsc: document handover ...................................................................... bsc: document handover Add chapter "Handover", explaining: - intra- and - inter-BSC handover, - HO algorithm 1 and - algorithm 2 - new neighbor configuration Adjust copyright, add revision and add me as author. Change-Id: I7afb3f66c98abda07fc8acc76e00c46091fe55e2 --- M OsmoBSC/Makefile A OsmoBSC/chapters/handover.adoc A OsmoBSC/chapters/handover_inter_bsc.dot A OsmoBSC/chapters/handover_intra_bsc.dot M OsmoBSC/osmobsc-usermanual-docinfo.xml M OsmoBSC/osmobsc-usermanual.adoc 6 files changed, 642 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/32/11532/1 diff --git a/OsmoBSC/Makefile b/OsmoBSC/Makefile index 1533482..b9f50d0 100644 --- a/OsmoBSC/Makefile +++ b/OsmoBSC/Makefile @@ -2,7 +2,7 @@ ASCIIDOC = osmobsc-usermanual.adoc osmux-reference.adoc aoip-mgw-options.adoc include $(TOPDIR)/build/Makefile.asciidoc.inc -osmobsc-usermanual.pdf: chapters/*.adoc +osmobsc-usermanual.pdf: chapters/*.adoc chapters/*.dot aoip-mgw-options.pdf: aoip-mgw-options.adoc mgw/*.msc VTY_REFERENCE = osmobsc-vty-reference.xml diff --git a/OsmoBSC/chapters/handover.adoc b/OsmoBSC/chapters/handover.adoc new file mode 100644 index 0000000..3c9204e --- /dev/null +++ b/OsmoBSC/chapters/handover.adoc @@ -0,0 +1,552 @@ +== Handover + +Handover is the process of moving a continuously used channel (lchan) from one +cell to another. Usually, that is an ongoing call, so that phones are able to +move across cell coverage areas without interrupting the voice transmission. + +A handover can + +- stay within one given cell (intra-cell, i.e. simply a new RR Assignment Command); +- occur between two cells that belong to the same BSS (intra-BSC, via RR Handover Command); +- cross BSS boundaries (inter-BSC, via BSSMAP handover procedures); +- move to another MSC (inter-MSC); +- move to another RAN type, e.g. from 2G to 3G (inter-RAT, inter-Radio-Access-Technology). + +The physical distance is by definition always very near, but handover +negotiation may range from being invisible to the MSC all the way to +orchestrating completely separate RAN stacks. + +OsmoBSC currently supports handover within one BSS and between separate BSS. +Whether inter-MSC is supported depends on the MSC implementation (to the BSC, +inter-MSC handover looks identical to inter-BSC handover). Inter-RAT handover +is currently not implemented. + +At the time of writing, OsmoMSC's inter-BSC handover support is not complete +yet, so OsmoBSC can perform handover between separate BSS only in conjunction +with a 3rd party MSC implementation. + +.Handover support in Osmocom at the time of writing +[cols="^,^,^,^,^"] +|==== +| | intra-BSC HO (local BSS) | inter-BSC HO (remote BSS) | inter-MSC HO | inter-RAT HO +| OsmoBSC | rxlev, load-based | rxlev | (planned) | - +| OsmoMSC | (not involved, except for codec changes) | (planned) | (planned) | - +|==== + + +=== How Handover Works + +This chapter generally explains handover operations between 2G cells. + +==== Internal / Intra-BSC Handover + +The BSS is configured to know which cell is physically adjacent to which other +cells, its "neighbors". On the MS/BTS/BSS level, individual cells are +identified by ARFCN+BSIC (frequency + 6-bit identification code). + +Each BTS is told by the BSC which cells identified by ARFCN+BSIC are its +adjacent cells. Via System Information, each MS receives a list of these +ARFCN+BSIC, and the MS then return measurements of reception levels. + +The BSC is the point of decision whether to do handover or not. This can be a +hugely complex combination of heuristics, knowledge of cell load and codec +capabilites. The most important indicator for handover though is: does an MS +report a neighbor with a better signal than the current cell? See +<>. + +[[intra_bsc_ho_dot]] +.Intra-BSC Handover stays within the BSS (shows steps only up to activation of the new lchan -- this would be followed by an RR Handover Command, RACH causing Handover Detection, Handover Complete, ...) +[graphviz] +---- +include::handover_intra_bsc.dot[] +---- + +If the BSC sees the need for handover, it will: + +- activate a new lchan (with a handover reference ID), +- send an RR Handover Command to the current lchan, and +- wait for the MS to send a Handover RACH to the new lchan ("Handover Detect"). +- The RTP stream then is switched over to the new lchan, +- an RSL Establish Indication is expected on the new lchan, +- and the old lchan is released. + +Should handover fail at any point, e.g. the new lchan never receives a RACH, or +the MS reports a Handover Failure, then the new lchan is simply released again, +and the old lchan remains in use. If the RTP stream has already been switched +over to the new lchan, it may actually be switched back to the old lchan. + +This is simple enough if the new cell is managed by the same BSC: the OsmoMGW +is simply instructed to relay the BTS-side of the RTP stream to another IP +address and port, and the BSC continues to forward DTAP to the MSC +transparently. The operation happens completely within the BSS. If the voice +codec has remained unchanged, the MSC/MNCC may not even be notified that +anything has happened at all. + +==== External / Inter-BSC Handover + +If the adjacent target cell belongs to a different BSS, the RR procedure for +handover remains the same, but we need to tell the _remote_ BSC to allocate the +new lchan. + +The only way to reach the remote BSC is via the MSC, so the MSC must be able +to: + +- identify which other BSC we want to talk to, +- forward various BSSMAP Handover messages between old and new BSC, +- redirect the core-side RTP stream to the new BSS at the appropriate time, +- and must finally BSSMAP Clear the connection to the old BSS to conclude the + inter-BSC handover. + +[[inter_bsc_ho_dot]] +.Inter-BSC Handover requires the MSC to relay between two BSCs (shows steps only up to the BSSMAP Handover Command -- this would be followed by an RR Handover Command, RACH causing Handover Detection, Handover Complete, ...) +[graphviz] +---- +include::handover_inter_bsc.dot[] +---- + +The first part, identifying the remote BSC, is not as trivial as it sounds: as +mentioned above, on the level of cell information seen by BTS and MS, the +neighbor cells are identified by ARFCN+BSIC. However, on the A-interface and in +the MSC, there is no knowledge of ARFCN+BSIC configurations, and instead each +cell is identified by a LAC and CI (Location Area Code and Cell Identifier). + +NOTE: There are several different cell identification types on the A-interface: +from Cell Global Identifier (MCC+MNC+LAC+CI) down to only LAC. OsmoBSC supports +most of these (see <>). For simplicity, this description +focuses on LAC+CI identification. + +The most obvious reason for using LAC+CI is that identical ARFCN+BSIC are +typically re-used across many cells of the same network operator: an operator +will have only very few ARFCNs available, and the 6bit BSIC opens only a very +limited range of distinction between cells. As long as each cell has no more +than one neighbor per given ARFCN+BSIC, these values can be re-used any number +of times across a network, and even between cells managed by one and the same +BSC. + +The consequence of this is that + +- the BSC needs to know which remote-BSS cells' ARFCN+BSIC correspond to + exactly which global LAC+CI, and +- the MSC needs to know which LAC+CI are managed by which BSC. + +In other words, each BSC requires prior knowledge about the cell configuration +of its remote-BSS neighbor cells, and the MSC requires prior knowledge about +each BSC's cell identifiers; i.e. these config items are spread reduntantly. + +=== Configuring Neighbors + +The most important step to enable handover in OsmoBSC is to configure each cell +with the ARFCN+BSIC identities of its adjacent neighbors -- both local-BSS and +remote-BSS. + +For a long time, OsmoBSC has offered configuration to manually enter the +ARFCN+BSIC sent out as neighbors on various System Information messages (all +`neighbor-list` related commands). This is still possible, however, +particularly for re-using ARFCN+BSIC within one BSS, this method will not work +well. + +With the addition of inter-BSC handover support, the new `neighbor` config item +has been added to the `bts` config, to maintain explicit cell-to-cell neighbor +relations, with the possibility to re-use ARFCN+BSIC in each cell. + +It is recommended to completely replace `neighbor-list` configurations with the +new `neighbor` configuration described below. + +[[neighbor_conf_list]] +.Overview of neighbor configuration on the `bts` config node +[frame="none",grid="none",cols="^10%,^10%,80%"] +|==== +| Local | Remote BSS | +| ? | | neighbor bts 5 +| ? | | neighbor lac 200 +| ? | | neighbor lac-ci 200 3 +| ? | | neighbor cgi 001 01 200 3 +| ? | ? | neighbor lac 200 arfcn 123 bsic 1 +| ? | ? | neighbor lac-ci 200 3 arfcn 123 bsic 1 +| ? | ? | neighbor cgi 001 01 200 3 arfcn 123 bsic 1 +|==== + +==== Local-BSS Neighbors + +Local neighbors can be configured by just the local BTS number, or by LAC+CI, +or any other supported A-interface type cell identification; also including the +ARFCN+BSIC is optional, it will be derived from the local configuration if +omitted. + +OsmoBSC will log errors in case the configuration includes ambiguous ARFCN+BSIC +relations (when one given cell has more than one neighbor for any one +ARFCN+BSIC). + +Neighbor relations must be configured explicitly in both directions, i.e. each +cell has to name all of its neighbors, even if the other cell already has an +identical neighbor relation in the reverse direction. + +.Example: configuring neighbors within the local BSS in osmo-bsc.cfg, identified by local BTS number +---- +network + bts 0 + neighbor bts 1 + bts 1 + neighbor bts 0 +---- + +.Example: configuring neighbors within the local BSS in osmo-bsc.cfg, identified by LAC+CI +---- +network + + bts 0 + # this cell's LAC=23 CI=5 + location_area_code 23 + cell_identity 5 + # reference bts 1 + neighbor lac-ci 23 6 + + bts 1 + # this cell's LAC=23 CI=6 + location_area_code 23 + cell_identity 6 + # reference bts 0 + neighbor lac-ci 23 5 +---- + +It is allowed to include the ARFCN and BSIC of local neighbor cells, even +though that is redundant with the already known local configuration of the +other cell. The idea is to ease generating the neighbor configuration +automatically, since local-BSS and remote-BSS neighbors then share identical +configuration formatting. For human readability and maintainability, it may +instead be desirable to use the `neighbor bts <0-255>` format. + +.Example: configuring neighbors within the local BSS in osmo-bsc.cfg, redundantly identified by LAC+CI as well as ARFCN+BSIC +---- +network + + bts 0 + # this cell's LAC=23 CI=5 + location_area_code 23 + cell_identity 5 + # this cell's ARFCN=1 BSIC=1 + trx 0 + arfcn 1 + base_station_id_code 1 + # reference bts 1 + neighbor lac-ci 23 6 arfcn 2 bsic 2 + + bts 1 + # LAC=23 CI=6 + location_area_code 23 + cell_identity 6 + # this cell's ARFCN=2 BSIC=2 + trx 0 + arfcn 2 + base_station_id_code 2 + # reference bts 0 + neighbor lac-ci 23 5 arfcn 1 bsic 1 +---- + +If the cell identification matches a local cell, OsmoBSC will report errors if +the provided ARFCN+BSIC do not match. + +==== Remote-BSS Neighbors + +Remote-BSS neighbors _always_ need to be configured with full A-interface +identification _and_ ARFCN+BSIC, to allow mapping a cell's neighbor ARFCN+BSIC +to a _BSSMAP Cell Identifier_ (see 3GPP TS 48.008 3.1.5.1 Handover Required +Indication and 3.2.1.9 HANDOVER REQUIRED). + +.Example: configuring remote-BSS neighbors in osmo-bsc.cfg, identified by LAC+CI (showing both BSCs' configurations) +---- +# BSC Alpha's osmo-bsc.cfg +network + bts 0 + # this cell's LAC=23 CI=6 + location_area_code 23 + cell_identity 6 + # this cell's ARFCN=2 BSIC=2 + trx 0 + arfcn 2 + base_station_id_code 2 + # fully describe the remote cell by LAC+CI and ARFCN+BSIC + neighbor lac-ci 42 3 arfcn 1 bsic 3 + +# BSC Beta's osmo-bsc.cfg +network + bts 0 + # this cell's LAC=42 CI=3 + location_area_code 42 + cell_identity 3 + # this cell's ARFCN=1 BSIC=3 + trx 0 + arfcn 1 + base_station_id_code 3 + # fully describe the remote cell by LAC+CI and ARFCN+BSIC + neighbor lac-ci 23 6 arfcn 2 bsic 2 +---- + +NOTE: It is strongly recommended to stick to a single format for remote-BSS +neighbors' cell identifiers all across an OsmoBSC configuration; i.e. decide +once to use `lac`, `lac-ci` or `cgi` and then stick to that within a given +osmo-bsc.cfg. The reason is that the _Cell Identifier List_ sent in the _BSSMAP +Handover Required_ message must have one single cell identifier type for all +list items. Hence, to be able to send several alternative remote neighbors to +the MSC, the configured cell identifiers must be of the same type. If in doubt, +use the full CGI identifier everywhere. + +=== Configuring Handover Decisions + +For a long time, OsmoBSC has supported handover based on reception level +hysteresis (RXLEV) and distance (TA, Timing Advance), known has `algorithm 1`. + +Since 2018, OsmoBSC also supports a load-based handover decision algorithm, +known as `algorithm 2`, which also takes cell load, available codecs and +oscillation into consideration. Algorithm 2 had actually been implemented for +the legacy OsmoNITB program many years before the OsmoMSC split, but remained +on a branch, until it was forward-ported to OsmoBSC in 2018. + +.What handover decision algorithms take into account +[frame="none",grid="none",cols="^10%,^10%,80%"] +|==== +| algorithm 1 | algorithm 2 | +| ? | ?| RXLEV +| ? | ?| RXQUAL +| ? | ?| TA (distance) +| ? | ?| interference (good RXLEV, bad RXQUAL) +| | ?| load (nr of free lchans, minimum RXLEV and RXQUAL) +| | ?| penalty time to avoid oscillation +| | ?| voice rate / codec bias +| ? | | inter-BSC: RXLEV hysteresis +| | ?| inter-BSC: only below minimum RXLEV, RXQUAL +|==== + +==== Common Configuration + +Handover is disabled by default; to disable/enable handover, use `handover +(0|1)`. + +Once enabled, algorithm 1 is used by default; choose a handover algorithm with +`handover algorithm (1|2)`: + +---- +network + # Enable handover + handover 1 + + # Choose algorithm + handover algorithm 2 + + # Tweak parameters for algorithm 2 (optional) + handover2 min-free-slots tch/f 4 + handover2 penalty-time failed-ho 30 + handover2 retries 1 +---- + +All handover algorithms share a common configuration scheme, with an overlay of +three levels: + +* immutable compile-time default values, +* configuration on the `network` level for all cells, +* individual cells' configuration on each `bts` node. + +Configuration settings relevant for algorithm 1 start with `handover1`, for +algorithm 2 with `handover2`. + +The following example overrides the compile-time default for all cells, and +furthermore sets one particular cell on its own individual setting, for the +`min-free-slots tch/f` value: + +---- +network + handover2 min-free-slots tch/f 4 + bts 23 + handover2 min-free-slots tch/f 2 +---- + +The order in which these settings are issued makes no difference for the +overlay; i.e., this configuration is perfectly identical to the above, and the +individual cell's value remains in force: + +---- +network + bts 23 + handover2 min-free-slots tch/f 2 + handover2 min-free-slots tch/f 4 +---- + +Each setting can be reset to a default value with the `default` keyword. When +resetting an individual cell's value, the globally configured value is used. +When resetting the global value, the compile-time default is used (unless +individual cells still have explicit values configured). For example, this +telnet VTY session removes above configuration first from the cell, then from +the global level: + +---- +OsmoBSC(config)# network +OsmoBSC(config-net)# bts 23 +OsmoBSC(config-net-bts)# handover2 min-free-slots tch/f default +% 'handover2 min-free-slots tch/f' setting removed, now is 4 +OsmoBSC(config-net-bts)# exit +OsmoBSC(config-net)# handover2 min-free-slots tch/f default +% 'handover2 min-free-slots tch/f' setting removed, now is 0 +---- + +==== Handover Algorithm 1 + +Algorithm 1 takes action only when RR Measurement Reports are received from a +BTS. As soon as a neighbor's average RXLEV is higher than the current cell's +average RXLEV plus a hysteresis distance, handover is triggered. + +If a handover fails, algorithm 1 will again attempt handover to the same cell +with the next Measurement Report received. + +Configuration settings relevant for algorithm 1 start with `handover1`. For +further details, please refer to the OsmoBSC VTY Reference +(<>) or the telnet VTY online documentation. + +==== Handover Algorithm 2 + +Algorithm 2 is specifically designed to distribute load across cells. A +subscriber will not necessarily remain attached to the cell that has the best +RXLEV average, if that cell is heavily loaded and a less loaded neighbor is +above the minimum allowed RXLEV. + +Algorithm 2 also features penalty timers to avoid oscillation: for each +subscriber, if handover to a specific neighbor failed (for a configurable +number of retries), a holdoff timer prevents repeated attempts to handover to +that same neighbor. Several hold-off timeouts following specific situations are +configurable (see `handover2 penalty-time` configuration items). + +Configuration settings relevant for algorithm 2 start with `handover2`. For +further details, please refer to the OsmoBSC VTY Reference +<> or the telnet VTY online documentation. + +===== Load Distribution + +Load distribution is only supported by algorithm 2. + +Load distribution occurs: + +- explicitly: every N seconds, OsmoBSC considers all local cells and actively + triggers handover operations to reduce congestion, if any. See + `min-free-slots` below, and the `congestion-check` setting. + +- implicitly: when choosing the best neighbor candidate for a handover + triggered otherwise, a congested cell (in terms of `min-free-slots`) is only + used as handover target if there is no alternative that causes less cell + load. + +In either case, load distribution will only occur towards neighbor cells that +adhere to minimum reception levels and distance, see `min rxlev` and `max +distance`. + +Load distribution will take effect only for already established voice channels. +An MS will always first establish a voice call with its current cell choice; in +load situations, it might be moved to another cell shortly after that. +Considering the best neighbor _before_ starting a new voice call might be +desirable, but is currently not implemented. Consider that RXLEV/RXQUAL ratings +are averaged over a given number of measurement reports, so that the neighbor +ratings may not be valid/reliable yet during early call establishment. In +consequence, it is recommended to ensure a sufficient number of unused logical +channels at all times, though there is no single correct configuration for all +situations. + +Most important for load distribution are the `min-free-slots tch/f` and +`min-free-slots tch/h` settings. The default is zero, meaning _no_ load +distribution. To enable, set `min-free-slots` >= 1 for `tch/f` and/or `tch/h` +as appropriate. This setting refers to the minimum number of voice channels +that should ideally remain unused in each individual BTS at all times. + +NOTE: it is not harmful to configure `min-free-slots` for a TCH kind that is +not actually present. Such settings will simply be ignored. + +NOTE: the number of TCH/F timeslots corresponds 1:1 to the number indicated by +`min-free-slots tch/f`, because each TCH/F physical channel has exactly one +logical channel. In contrast, for each TCH/H timeslot, there are two logical +channels, hence `min-free-slots tch/h` corresponds to twice the number of TCH/H +timeslots configured per cell. In fact, a more accurate naming would have been +"min-free-lchans". + +Think of the `min-free-slots` setting as the threshold at which load +distribution is considered. If as many logical channels as required by this +setting are available in a given cell, only changes in RXLEV/RXQUAL/TA trigger +handover away from that cell. As soon as less logical channels remain free, the +periodical congestion check attempts to distribute MS to less loaded neighbor +cells. Every time, the one MS that will suffer the least RXLEV loss while still +reducing congestion will be instructed to move first. + +If a cell and its neighbors are all loaded past their `min-free-slots` +settings, the algorithmic aim is equal load: a load-based handover will never +cause the target cell to be more congested than the source cell. + +The min-free-slots setting is a tradeoff between immediate voice service +availability and optimal reception levels. A sane choice could be: + +- Start off with `min-free-slots` set to half the available logical channels. +- Increase `min-free-slots` if you see MS being rejected too often even though + close neighbors had unused logical channels. +- Decrease `min-free-slots` if you see too many handovers happening for no + apparent reason. + +Choosing the optimal setting is not trivial, consider these examples: + +- Configure `min-free-slots` = 1: load distribution to other cells will occur + exactly when the last available logical channel has become occupied. The next + time the congestion check runs, at most one handover will occur, so that one + channel is available again. In the intermediate time, all channels will be + occupied, and some MS might be denied immediate voice service because of + that, even though, possibly, other neighbor cells would have provided + excellent reception levels and were completely unloaded. For those MS that + are already in an ongoing voice call and are not physically moving, though, + this almost guarantees service by the closest/best cell. + +- Set `min-free-slots` = 2: up to two MS can successfully request voice service + simultaneously (e.g. one MS is establishing a new voice call while another MS + is travelling into this cell). Ideally, two slots have been kept open and are + immediately available. But if a third MS is also traveling into this cell at + the same time, it will not be able to handover into this cell until load + distribution has again taken action to make logical channels available. The + same scenario applies to any arbitrary number of MS asking for voice channels + simultaneously. The operator needs to choose where to draw the line. + +- Set `min-free-slots` >= the number of available channels: as soon as any + neighbor is less loaded than a given cell, handover will be attempted. But + imagine there are only two active voice calls on this cell with plenty of + logical channels still unused, and the closest neighbor rates only just above + `min rxlev`; then moving one of the MS _for no good reason_ causes all of: + increased power consumption, reduced reception stability and channel + management overhead. + +NOTE: In the presence of dynamic timeslots to provide GPRS service, the number +of voice timeslots left unused also determines the amount of bandwidth +available for GPRS. + +==== External / Inter-BSC Handover Considerations + +There currently is a profound difference for inter-BSC handover between +algorithm 1 and 2: + +For algorithm 1, inter-BSC handover is triggered as soon as the Measurement +Reports and hysteresis indicate a better neighbor than the current cell, +period. + +For algorithm 2, a subscriber is "sticky" to the current BSS, and inter-BSC +handover is only even considered when RXLEV/TA drop below minimum requirements. + +- If your network topology is such that each OsmoBSC instance manages a single + BTS, and you would like to encourage handover between these, choose handover + algorithm 1. Load balancing will not be available, but RXLEV hysteresis will. + +- If your network topology has many cells per BSS, and/or if your BSS + boundaries in tendency correspond to physical/semantic boundaries that favor + handover to remain within a BSS, then choose handover algorithm 2. + +The reason for the difference between algorithm 1 and 2 for remote-BSS +handovers is, in summary, the young age of the inter-BSC handover feature in +OsmoBSC: + +- So far the mechanisms to communicate cell load to remote-BSS available in the + BSSMAP Handover messages are not implemented, so, a handover due to cell load + across BSS boundaries would be likely to cause handover oscillation between + the two BSS (continuous handover of the same MS back and forth between the + same two cells). +- Algorithm 1 has no `min rxlev` setting. +- Algorithm 1 does not actually use any information besides the Measurement + Reports, and hence can trivially treat all neighbor cells identically. diff --git a/OsmoBSC/chapters/handover_inter_bsc.dot b/OsmoBSC/chapters/handover_inter_bsc.dot new file mode 100644 index 0000000..0cc6554 --- /dev/null +++ b/OsmoBSC/chapters/handover_inter_bsc.dot @@ -0,0 +1,35 @@ +digraph G { +rankdir=LR + +subgraph cluster_bss_a { + label="BSS Alpha" + BTS_a0 [rank=min,label="bts 0\nARFCN=1 BSIC=1\nLAC=23 CI=5"] + BTS_a1 [rank=min,label="bts 1\nARFCN=2 BSIC=2\nLAC=23 CI=6"] + BSC_a [label="BSC Alpha"]; + {BTS_a0,BTS_a1} -> BSC_a [arrowhead=none,label=Abis] +} + +subgraph cluster_bss_b { + label="BSS Beta" + BTS_b0 [rank=min,label="bts 0\nARFCN=1 BSIC=3\nLAC=42 CI=3"] + BTS_b1 [rank=min,label="bts 1\nARFCN=2 BSIC=4\nLAC=42 CI=1"] + BSC_b [label="BSC Beta"] + {BTS_b0,BTS_b1} -> BSC_b [arrowhead=none,label=Abis] +} + +MS -> BTS_a1 [label="(3) Measurement:\nARFCN=1 BSIC=3 RXLEV"] +BTS_a1 -> MS [label="(1) my neighbors:\nARFCN=1 BSIC=1\nARFCN=1 BSIC=3"] +BTS_b0 -> MS [label="(2) good RXLEV",style=dotted] +MS -> {BTS_a0,BTS_b0,BTS_b1} [style=invisible,arrowhead=none] + +BTS_a1 -> BSC_a [label="(4) Measurement\nReport",style=dashed] +BTS_a1 -> BTS_b0 [label="(5) BSC decides to do\ninter-BSC Handover",style=dashed,constraint=false] + +{BSC_a,BSC_b} -> MSC [arrowhead=none,label=A] + +BSC_a -> MSC [label="(6) --> Handover Required\nto LAC=42 CI=6\n(10) <-- Handover Command",style=dashed,constraint=false,arrowhead=none] +MSC -> BSC_b [label="(7) <-- Handover Request\n(9) --> Handover Request ACK",style=dashed,constraint=false,arrowhead=none] + +BSC_b -> BTS_b0 [label="(8) activate new lchan",style=dashed,constraint=false] + +} diff --git a/OsmoBSC/chapters/handover_intra_bsc.dot b/OsmoBSC/chapters/handover_intra_bsc.dot new file mode 100644 index 0000000..2a4f6cf --- /dev/null +++ b/OsmoBSC/chapters/handover_intra_bsc.dot @@ -0,0 +1,31 @@ +digraph G { +rankdir=LR + +subgraph cluster_bss_a { + label="BSS Alpha" + BTS_a0 [rank=min,label="bts 0\nARFCN=1 BSIC=1\nLAC=23 CI=5"] + BTS_a1 [rank=min,label="bts 1\nARFCN=2 BSIC=2\nLAC=23 CI=6"] + BSC_a [label="BSC Alpha"]; + {BTS_a0,BTS_a1} -> BSC_a [arrowhead=none,label=Abis] +} + +subgraph cluster_bss_b { + label="BSS Beta" + BTS_b0 [rank=min,label="bts 0\nARFCN=1 BSIC=3\nLAC=42 CI=3"] + BTS_b1 [rank=min,label="bts 1\nARFCN=2 BSIC=4\nLAC=42 CI=1"] + BSC_b [label="BSC Beta"] + {BTS_b0,BTS_b1} -> BSC_b [arrowhead=none,label=Abis] +} + +MS -> BTS_a1 [label="(3) Measurement:\nARFCN=1 BSIC=1 RXLEV"] +BTS_a1 -> MS [label="(1) my neighbors:\nARFCN=1 BSIC=1\nARFCN=1 BSIC=3"] +BTS_a0 -> MS [label="(2) good RXLEV",style=dotted] +MS -> {BTS_a0,BTS_b0,BTS_b1} [style=invisible,arrowhead=none] + +BTS_a1 -> BSC_a [label="(4) Measurement\nReport",style=dashed] +BTS_a1 -> BTS_a0 [label="(5) BSC decides to do\nintra-BSC Handover",style=dashed,constraint=false] +BSC_a -> BTS_a0 [label="(6) activate new lchan",style=dashed,constraint=false] + +{BSC_a,BSC_b} -> MSC [arrowhead=none,label=A] + +} diff --git a/OsmoBSC/osmobsc-usermanual-docinfo.xml b/OsmoBSC/osmobsc-usermanual-docinfo.xml index 5ac3742..6de53b2 100644 --- a/OsmoBSC/osmobsc-usermanual-docinfo.xml +++ b/OsmoBSC/osmobsc-usermanual-docinfo.xml @@ -7,6 +7,15 @@ Initial OsmoBSC manual, recycling OsmoNITB sections + + 2 + October 2018 + NH + + Add Handover chapter: document new neighbor configuration, HO algorithm 2 + and inter-BSC handover. + + @@ -32,10 +41,21 @@ Managing Director + + Neels + Hofmeyr + nhofmeyr at sysmocom.de + NH + + sysmocom + sysmocom - s.f.m.c. GmbH + Developer + + - 2012-2016 + 2012-2018 sysmocom - s.f.m.c. GmbH diff --git a/OsmoBSC/osmobsc-usermanual.adoc b/OsmoBSC/osmobsc-usermanual.adoc index e3eadaf..0ec15e5 100644 --- a/OsmoBSC/osmobsc-usermanual.adoc +++ b/OsmoBSC/osmobsc-usermanual.adoc @@ -15,6 +15,8 @@ include::chapters/counters.adoc[] +include::chapters/handover.adoc[] + include::../common/chapters/vty.adoc[] include::../common/chapters/logging.adoc[] -- To view, visit https://gerrit.osmocom.org/11532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7afb3f66c98abda07fc8acc76e00c46091fe55e2 Gerrit-Change-Number: 11532 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 23:14:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 30 Oct 2018 23:14:02 +0000 Subject: Change in osmo-gsm-manuals[master]: bsc: document handover In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11532 to look at the new patch set (#2). Change subject: bsc: document handover ...................................................................... bsc: document handover Add chapter "Handover", explaining: - intra- and - inter-BSC handover, - HO algorithm 1 and - algorithm 2 - new neighbor configuration Adjust copyright, add revision and add me as author. Change-Id: I7afb3f66c98abda07fc8acc76e00c46091fe55e2 --- M OsmoBSC/Makefile A OsmoBSC/chapters/handover.adoc A OsmoBSC/chapters/handover_inter_bsc.dot A OsmoBSC/chapters/handover_intra_bsc.dot M OsmoBSC/osmobsc-usermanual-docinfo.xml M OsmoBSC/osmobsc-usermanual.adoc 6 files changed, 642 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/32/11532/2 -- To view, visit https://gerrit.osmocom.org/11532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7afb3f66c98abda07fc8acc76e00c46091fe55e2 Gerrit-Change-Number: 11532 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 23:14:13 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 30 Oct 2018 23:14:13 +0000 Subject: Change in osmo-gsm-manuals[master]: author info: add "former" to Holger's job title Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11533 Change subject: author info: add "former" to Holger's job title ...................................................................... author info: add "former" to Holger's job title It doesn't seem to have an effect to the generated PDFs though. Change-Id: I0556a3f8dafc051f20a3854fc9006edf4ec1a0d3 --- M OsmoBSC/osmobsc-usermanual-docinfo.xml M OsmoBSC/osmux-reference-docinfo.xml M OsmoNITB/osmonitb-usermanual-docinfo.xml 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/33/11533/1 diff --git a/OsmoBSC/osmobsc-usermanual-docinfo.xml b/OsmoBSC/osmobsc-usermanual-docinfo.xml index 6de53b2..9c0d1c8 100644 --- a/OsmoBSC/osmobsc-usermanual-docinfo.xml +++ b/OsmoBSC/osmobsc-usermanual-docinfo.xml @@ -27,7 +27,7 @@ sysmocom sysmocom - s.f.m.c. GmbH - Managing Director + former Managing Director diff --git a/OsmoBSC/osmux-reference-docinfo.xml b/OsmoBSC/osmux-reference-docinfo.xml index 7e31ec7..a902c5c 100644 --- a/OsmoBSC/osmux-reference-docinfo.xml +++ b/OsmoBSC/osmux-reference-docinfo.xml @@ -47,7 +47,7 @@ sysmocom sysmocom - s.f.m.c. GmbH - Managing Director + former Managing Director diff --git a/OsmoNITB/osmonitb-usermanual-docinfo.xml b/OsmoNITB/osmonitb-usermanual-docinfo.xml index e9c5177..87d72da 100644 --- a/OsmoNITB/osmonitb-usermanual-docinfo.xml +++ b/OsmoNITB/osmonitb-usermanual-docinfo.xml @@ -26,7 +26,7 @@ sysmocom sysmocom - s.f.m.c. GmbH - Managing Director + former Managing Director -- To view, visit https://gerrit.osmocom.org/11533 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0556a3f8dafc051f20a3854fc9006edf4ec1a0d3 Gerrit-Change-Number: 11533 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 30 23:21:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 30 Oct 2018 23:21:37 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11504 to look at the new patch set (#2). Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... gsm0808: add BSSMAP Cell Identifier matching API Add * osmo_lai_cmp() (to use in gsm0808_cell_id_u_matches()) * osmo_cgi_cmp() (to use in gsm0808_cell_id_u_matches()) * gsm0808_cell_id_u_matches() (to re-use for single IDs and lists) * gsm0808_cell_ids_match() * gsm0808_cell_id_matches_list() * Unit tests in gsm0808_test.c Rationale: For inter-BSC handover, it is interesting to find matches between *differing* Cell Identity kinds. For example, if a cell as CGI 23-42-3-5, and a HO for LAC-CI 3-5 should be handled, we need to see the match. This is most interesting for osmo-msc, i.e. to direct the BSSMAP Handover Request towards the correct BSC. It is also interesting for osmo-bsc's VTY interface, to be able to manage cells' neighbors and to trigger manual handovers by various Cell Identity handles, as the user would expect them. Change-Id: I5535f0d149c2173294538df75764dd181b023312 --- M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/gsm23003.h M src/gsm/gsm0808_utils.c M src/gsm/gsm23003.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 7 files changed, 574 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/04/11504/2 -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 01:28:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 31 Oct 2018 01:28:52 +0000 Subject: Change in osmo-gsm-manuals[master]: bsc: handover: clarify default of all-cells-are-neighbors Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11534 Change subject: bsc: handover: clarify default of all-cells-are-neighbors ...................................................................... bsc: handover: clarify default of all-cells-are-neighbors Change-Id: I61f877c7a60419132bdd27c1b4e64150c0520751 --- M OsmoBSC/chapters/handover.adoc 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/34/11534/1 diff --git a/OsmoBSC/chapters/handover.adoc b/OsmoBSC/chapters/handover.adoc index 3c9204e..833ee19 100644 --- a/OsmoBSC/chapters/handover.adoc +++ b/OsmoBSC/chapters/handover.adoc @@ -166,6 +166,22 @@ | ? | ? | neighbor cgi 001 01 200 3 arfcn 123 bsic 1 |==== +==== Default: All Local Cells are Neighbors + +For historical reasons, the default behavior of OsmoBSC is to add all local-BSS cells as neighbors. To +maintain a backwards compatible configuration file format, this is still the case: as soon as no explicit +neighbor cell is configured with a `neighbor` command (either none was configured, or all configured +neighbors have been removed again), a cell automatically lists all of the local-BSS cells as neighbors. +These are implicit mappings in terms of the legacy neighbor configuration scheme, and re-using ARFCN+BSIC +combinations within a BSS will not work well this way. + +As soon as the first explicit neighbor relation is added to a cell, the legacy behavior is switched off, +and only explicit neighbors are in effect. + +NOTE: If a cell is required to not have any neighbors, it is recommended to rather switch off handover +for that cell with `handover 0`. An alternative solution is to set `neighbor-list mode manual` and not +configure any `neighbor-list` entries. + ==== Local-BSS Neighbors Local neighbors can be configured by just the local BTS number, or by LAC+CI, -- To view, visit https://gerrit.osmocom.org/11534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I61f877c7a60419132bdd27c1b4e64150c0520751 Gerrit-Change-Number: 11534 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 01:28:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 31 Oct 2018 01:28:53 +0000 Subject: Change in osmo-gsm-manuals[master]: bsc: handover: mention the need to resend SI for telnet neighbor cfg Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11535 Change subject: bsc: handover: mention the need to resend SI for telnet neighbor cfg ...................................................................... bsc: handover: mention the need to resend SI for telnet neighbor cfg Change-Id: I305ef558b75697015e2532aa7c135f7995662e0d --- M OsmoBSC/chapters/handover.adoc 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/35/11535/1 diff --git a/OsmoBSC/chapters/handover.adoc b/OsmoBSC/chapters/handover.adoc index 833ee19..b05ad00 100644 --- a/OsmoBSC/chapters/handover.adoc +++ b/OsmoBSC/chapters/handover.adoc @@ -307,6 +307,15 @@ the MSC, the configured cell identifiers must be of the same type. If in doubt, use the full CGI identifier everywhere. +==== Reconfiguring Neighbors in a Running OsmoBSC + +When modifying a cell's neighbor configuration in a telnet VTY session while a cell is already active, +the neighbor configuration will merely be cached in the BSC's local config. To take actual effect, it is +necessary to + +- either, re-connect the cell to the BSC (e.g. via `drop bts connection <0-255> oml`) +- or, re-send the System Information using `bts <0-255> resend-system-information`. + === Configuring Handover Decisions For a long time, OsmoBSC has supported handover based on reception level -- To view, visit https://gerrit.osmocom.org/11535 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I305ef558b75697015e2532aa7c135f7995662e0d Gerrit-Change-Number: 11535 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Oct 31 07:36:38 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 31 Oct 2018 07:36:38 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-ggsn_=C2=BB_--disable-gtp?= =?UTF-8?Q?-linux,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1050?= Message-ID: <1949842991.351.1540971398577.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 8.72 KB...] 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 checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking execinfo.h usability... yes checking execinfo.h presence... yes checking for execinfo.h... yes checking sys/select.h usability... yes checking sys/select.h presence... yes checking for sys/select.h... yes checking sys/socket.h usability... yes checking sys/socket.h presence... yes checking for sys/socket.h... yes checking sys/timerfd.h usability... yes checking sys/timerfd.h presence... yes checking for sys/timerfd.h... yes checking syslog.h usability... yes checking syslog.h presence... yes checking for syslog.h... yes checking ctype.h usability... yes checking ctype.h presence... yes checking for ctype.h... yes checking netinet/tcp.h usability... yes checking netinet/tcp.h presence... yes checking for netinet/tcp.h... yes checking for size_t... yes checking for working alloca.h... yes checking for alloca... yes checking for library containing dlopen... -ldl checking for library containing dlsym... -ldl checking for backtrace in -lexecinfo... no checking for doxygen... (cached) false checking whether SYS_getrandom is declared... yes checking if gcc supports -fvisibility=hidden... yes checking for clock_gettime... yes checking for localtime_r... yes checking whether struct tm has tm_gmtoff member... yes checking for TALLOC... yes checking for PCSC... yes checking for LIBGNUTLS... yes checking whether to enable VTY/CTRL tests... no checking whether C compiler accepts -mavx2... yes checking whether C compiler accepts -mssse3... yes checking whether C compiler accepts -msse4.1... yes checking whether gcc has __builtin_cpu_supports built-in... yes CFLAGS="-g -O2 -DBUILDING_LIBOSMOCORE -Wall" CPPFLAGS=" -DBUILDING_LIBOSMOCORE -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmocore.pc config.status: creating libosmocodec.pc config.status: creating libosmocoding.pc config.status: creating libosmovty.pc config.status: creating libosmogsm.pc config.status: creating libosmogb.pc config.status: creating libosmoctrl.pc config.status: creating libosmosim.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating src/vty/Makefile config.status: creating src/codec/Makefile config.status: creating src/coding/Makefile config.status: creating src/sim/Makefile config.status: creating src/gsm/Makefile config.status: creating src/gb/Makefile config.status: creating src/ctrl/Makefile config.status: creating src/pseudotalloc/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating utils/Makefile config.status: creating Doxyfile.core config.status: creating Doxyfile.gsm config.status: creating Doxyfile.vty config.status: creating Doxyfile.codec config.status: creating Doxyfile.coding config.status: creating Doxyfile.gb config.status: creating Doxyfile.ctrl config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j 8 install echo 0.12.0.99-1a14 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory ' Making install in include make[2]: Entering directory ' GEN osmocom/gsm/gsm0503.h Generating header file... Generate 'xcch' declaration Generate 'rach' declaration Generate 'rach_ext' declaration Generate 'sch' declaration Generate 'cs2' declaration Generate 'cs3' declaration Generate 'cs2_np' declaration Generate 'cs3_np' declaration Generate 'tch_afs_12_2' declaration Generate 'tch_afs_10_2' declaration Generate 'tch_afs_7_95' declaration Generate 'tch_afs_7_4' declaration Generate 'tch_afs_6_7' declaration Generate 'tch_afs_5_9' declaration Generate 'tch_afs_5_15' declaration Generate 'tch_afs_4_75' declaration Generate 'tch_fr' declaration Generate 'tch_hr' declaration Generate 'tch_ahs_7_95' declaration Generate 'tch_ahs_7_4' declaration Generate 'tch_ahs_6_7' declaration Generate 'tch_ahs_5_9' declaration Generate 'tch_ahs_5_15' declaration Generate 'tch_ahs_4_75' declaration Generate 'mcs1_dl_hdr' declaration Generate 'mcs1_ul_hdr' declaration Generate 'mcs1' declaration Generate 'mcs2' declaration Generate 'mcs3' declaration Generate 'mcs4' declaration Generate 'mcs5_dl_hdr' declaration Generate 'mcs5_ul_hdr' declaration Generate 'mcs5' declaration Generate 'mcs6' declaration Generate 'mcs7_dl_hdr' declaration Generate 'mcs7_ul_hdr' declaration Generate 'mcs7' declaration Generate 'mcs8' declaration Generate 'mcs9' declaration Generation complete. make install-am make[3]: Entering directory ' GEN osmocom/core/bit16gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc32gen.h make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/application.h osmocom/core/backtrace.h osmocom/core/bit16gen.h osmocom/core/bit32gen.h osmocom/core/bit64gen.h osmocom/core/bits.h osmocom/core/bitvec.h osmocom/core/bitcomp.h osmocom/core/byteswap.h osmocom/core/conv.h osmocom/core/counter.h osmocom/core/crc16.h osmocom/core/crc16gen.h osmocom/core/crc32gen.h osmocom/core/crc64gen.h osmocom/core/crc8gen.h osmocom/core/crcgen.h osmocom/core/endian.h osmocom/core/defs.h osmocom/core/fsm.h osmocom/core/gsmtap.h osmocom/core/gsmtap_util.h osmocom/core/isdnhdlc.h osmocom/core/linuxlist.h osmocom/core/linuxrbtree.h osmocom/core/logging.h osmocom/core/loggingrb.h osmocom/core/stats.h osmocom/core/macaddr.h osmocom/core/msgb.h osmocom/core/panic.h osmocom/core/prbs.h osmocom/core/prim.h osmocom/core/process.h osmocom/core/rate_ctr.h osmocom/core/stat_item.h osmocom/core/select.h osmocom/core/sercomm.h osmocom/core/signal.h osmocom/core/socket.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/coding/gsm0503_tables.h osmocom/coding/gsm0503_parity.h osmocom/coding/gsm0503_mapping.h osmocom/coding/gsm0503_interleaving.h osmocom/coding/gsm0503_coding.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/statistics.h osmocom/core/strrb.h osmocom/core/talloc.h osmocom/core/timer.h osmocom/core/timer_compat.h osmocom/core/utils.h osmocom/core/write_queue.h osmocom/core/plugin.h osmocom/core/msgfile.h osmocom/core/serial.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/vty/buffer.h osmocom/vty/command.h osmocom/vty/logging.h osmocom/vty/stats.h osmocom/vty/misc.h osmocom/vty/telnet_interface.h osmocom/vty/vector.h osmocom/vty/vty.h osmocom/vty/ports.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/protocol/gsm_03_40.h osmocom/gsm/protocol/gsm_03_41.h osmocom/gsm/protocol/gsm_04_08.h osmocom/gsm/protocol/gsm_04_08_gprs.h osmocom/gsm/protocol/gsm_04_11.h osmocom/gsm/protocol/gsm_04_12.h osmocom/gsm/protocol/gsm_04_14.h osmocom/gsm/protocol/gsm_04_80.h osmocom/gsm/protocol/gsm_08_08.h osmocom/gsm/protocol/gsm_08_58.h osmocom/gsm/protocol/gsm_09_02.h osmocom/gsm/protocol/gsm_12_21.h osmocom/gsm/protocol/gsm_23_003.h osmocom/gsm/protocol/gsm_29_118.h osmocom/gsm/protocol/gsm_44_318.h osmocom/gsm/protocol/ipaccess.h osmocom/gsm/protocol/smpp34_osmocom.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/sim/class_tables.h osmocom/sim/sim.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/gprs_bssgp.h osmocom/gprs/gprs_bssgp_bss.h osmocom/gprs/gprs_msgb.h osmocom/gprs/gprs_ns.h osmocom/gprs/gprs_ns_frgre.h osmocom/gprs/gprs_rlc.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/crypt/auth.h osmocom/crypt/gprs_cipher.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/a5.h osmocom/gsm/abis_nm.h osmocom/gsm/apn.h osmocom/gsm/bts_features.h osmocom/gsm/comp128.h osmocom/gsm/comp128v23.h osmocom/gsm/bitvec_gsm.h osmocom/gsm/gan.h osmocom/gsm/gsm0341.h osmocom/gsm/gsm0411_smc.h osmocom/gsm/gsm0411_smr.h osmocom/gsm/gsm0411_utils.h osmocom/gsm/gsm0480.h osmocom/gsm/gsm0502.h osmocom/gsm/gsm0503.h osmocom/gsm/gsm0808.h osmocom/gsm/gsm0808_utils.h osmocom/gsm/gsm23003.h osmocom/gsm/gsm48.h osmocom/gsm/gsm48_ie.h osmocom/gsm/gsm_utils.h osmocom/gsm/gsup.h osmocom/gsm/ipa.h osmocom/gsm/lapd_core.h osmocom/gsm/lapdm.h osmocom/gsm/meas_rep.h osmocom/gsm/mncc.h osmocom/gsm/prim.h osmocom/gsm/l1sap.h osmocom/gsm/oap.h osmocom/gsm/oap_client.h osmocom/gsm/rsl.h osmocom/gsm/rxlev_stat.h osmocom/gsm/sysinfo.h osmocom/gsm/tlv.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/ctrl/control_cmd.h osmocom/ctrl/control_if.h osmocom/ctrl/ports.h osmocom/ctrl/control_vty.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/protocol/gsm_04_60.h osmocom/gprs/protocol/gsm_08_16.h osmocom/gprs/protocol/gsm_08_18.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/codec/ecu.h osmocom/codec/codec.h osmocom/codec/gsm610_bits.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' GEN crc8gen.c GEN crc16gen.c GEN crc32gen.c GEN crc64gen.c make install-am make[3]: Entering directory ' CC timer.lo CC timer_gettimeofday.lo CC select.lo CC timer_clockgettime.lo CC signal.lo CC msgb.lo CC bits.lo CC bitvec.lo /bin/bash: line 2: 24405 Segmentation fault /bin/bash ../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT msgb.lo -MD -MP -MF $depbase.Tpo -c -o msgb.lo msgb.c Makefile:558: recipe for target 'msgb.lo' failed make[3]: *** [msgb.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory ' Makefile:662: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:614: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:913: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Oct 31 07:38:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 31 Oct 2018 07:38:58 +0000 Subject: Change in osmocom-bb[master]: layer23/common: introduce L23SAP API for L1CTL In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11246 ) Change subject: layer23/common: introduce L23SAP API for L1CTL ...................................................................... Patch Set 2: > I still don't see the value of this, sorry. And actually I think > adding another layer makes the code even harder to read compared > with the existing code. If you are strongly in fasvor, I'll. +2 > thixz series, as you are the most active developer in this area. > Let me know. Well, this patch set doesn't prevent me from implementing something else. So I'll abandon it then. -- To view, visit https://gerrit.osmocom.org/11246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I22d7932ddc03c692f2616726ced53b6e8eef822d Gerrit-Change-Number: 11246 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 31 Oct 2018 07:38:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 07:39:13 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 31 Oct 2018 07:39:13 +0000 Subject: Change in osmocom-bb[master]: layer23/common: introduce L23SAP API for L1CTL In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/11246 ) Change subject: layer23/common: introduce L23SAP API for L1CTL ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I22d7932ddc03c692f2616726ced53b6e8eef822d Gerrit-Change-Number: 11246 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 07:39:22 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 31 Oct 2018 07:39:22 +0000 Subject: Change in osmocom-bb[master]: layer23/common: move GSMTAP handling to L23SAP In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/11248 ) Change subject: layer23/common: move GSMTAP handling to L23SAP ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ie143b9e839d944a7a7eebf5529798a49b8e175d7 Gerrit-Change-Number: 11248 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 07:39:29 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 31 Oct 2018 07:39:29 +0000 Subject: Change in osmocom-bb[master]: layer23/common: merge l1ctl_ph_prim_cb() to L23SAP In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/11249 ) Change subject: layer23/common: merge l1ctl_ph_prim_cb() to L23SAP ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ic852b2b7f5a651b7a4debc83778ae24c687e85f8 Gerrit-Change-Number: 11249 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 07:39:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 31 Oct 2018 07:39:37 +0000 Subject: Change in osmocom-bb[master]: layer23/l1ctl.c: cosmetic: drop useless includes In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/11250 ) Change subject: layer23/l1ctl.c: cosmetic: drop useless includes ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I16f595110faf27444175864384ce6800a90e10da Gerrit-Change-Number: 11250 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 07:39:52 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 31 Oct 2018 07:39:52 +0000 Subject: Change in osmocom-bb[master]: layer23/common: move signal loss criteria to L23SAP In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/11251 ) Change subject: layer23/common: move signal loss criteria to L23SAP ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ib70bf9104cf3b5489413dd90819fd4955ec16f95 Gerrit-Change-Number: 11251 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 07:40:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 31 Oct 2018 07:40:00 +0000 Subject: Change in osmocom-bb[master]: layer23/l23sap.c: use safe wrapper around rsl_dec_chan_nr() In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/11254 ) Change subject: layer23/l23sap.c: use safe wrapper around rsl_dec_chan_nr() ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Id78304f494be70aa05e2da11c785ba5d9aeaf6db Gerrit-Change-Number: 11254 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 07:40:09 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 31 Oct 2018 07:40:09 +0000 Subject: Change in osmocom-bb[master]: layer23/l23sap.c: add Osmocom specific cbits for CBCH In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/11255 ) Change subject: layer23/l23sap.c: add Osmocom specific cbits for CBCH ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I35e454c825481e6a390485ee042e384b31a08bf4 Gerrit-Change-Number: 11255 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 07:40:17 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 31 Oct 2018 07:40:17 +0000 Subject: Change in osmocom-bb[master]: (WIP) misc/cbch_sacn: indicate CBCH cbits to L1/PHY In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/11478 ) Change subject: (WIP) misc/cbch_sacn: indicate CBCH cbits to L1/PHY ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: If19f2b2ed645c0f6f5baf7ed853b41011603f1a0 Gerrit-Change-Number: 11478 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 07:40:28 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 31 Oct 2018 07:40:28 +0000 Subject: Change in osmocom-bb[master]: layer23/ccch_scan: unwrap dump_bcch() as gsm48_rx_bcch() In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/11479 ) Change subject: layer23/ccch_scan: unwrap dump_bcch() as gsm48_rx_bcch() ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11479 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I382fbdb60513324164cd1147c36f3367bb6fb22c Gerrit-Change-Number: 11479 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 08:08:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 08:08:58 +0000 Subject: Change in osmo-gsm-manuals[master]: bsc: handover: mention the need to resend SI for telnet neighbor cfg In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11535 ) Change subject: bsc: handover: mention the need to resend SI for telnet neighbor cfg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11535 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I305ef558b75697015e2532aa7c135f7995662e0d Gerrit-Change-Number: 11535 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 31 Oct 2018 08:08:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 08:09:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 08:09:45 +0000 Subject: Change in osmo-gsm-manuals[master]: bsc: handover: clarify default of all-cells-are-neighbors In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11534 ) Change subject: bsc: handover: clarify default of all-cells-are-neighbors ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I61f877c7a60419132bdd27c1b4e64150c0520751 Gerrit-Change-Number: 11534 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 31 Oct 2018 08:09:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 08:12:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 08:12:29 +0000 Subject: Change in osmo-gsm-manuals[master]: bsc: document handover In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11532 ) Change subject: bsc: document handover ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11532/2/OsmoBSC/chapters/handover.adoc File OsmoBSC/chapters/handover.adoc: https://gerrit.osmocom.org/#/c/11532/2/OsmoBSC/chapters/handover.adoc at 12 PS2, Line 12: - move to another MSC (inter-MSC); strictly speaking, there's also inter-PLMN hand-over, but AFAIK it's only a normal inter-MSC HO with a fancy name -- To view, visit https://gerrit.osmocom.org/11532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7afb3f66c98abda07fc8acc76e00c46091fe55e2 Gerrit-Change-Number: 11532 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 31 Oct 2018 08:12:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 08:13:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 08:13:11 +0000 Subject: Change in osmo-gsm-manuals[master]: author info: add "former" to Holger's job title In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11533 ) Change subject: author info: add "former" to Holger's job title ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11533 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0556a3f8dafc051f20a3854fc9006edf4ec1a0d3 Gerrit-Change-Number: 11533 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 31 Oct 2018 08:13:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 08:14:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 08:14:51 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: build-osmo-sgsn: Depend on osmo-hlr build In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11530 ) Change subject: contrib: build-osmo-sgsn: Depend on osmo-hlr build ...................................................................... contrib: build-osmo-sgsn: Depend on osmo-hlr build Since osmo-sgsn f4b2c4ca42cc530c38c9ac6f275e4d7da9315fa2, it depends on libosmo-gsup-client available in osmo-hlr. Change-Id: I6aa997ff2092f9ddf2ac475fd094803be9063980 --- M contrib/jenkins-build-osmo-sgsn.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins-build-osmo-sgsn.sh b/contrib/jenkins-build-osmo-sgsn.sh index ffa787c..f296f8b 100755 --- a/contrib/jenkins-build-osmo-sgsn.sh +++ b/contrib/jenkins-build-osmo-sgsn.sh @@ -9,6 +9,7 @@ build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen build_repo libosmo-sccp ${SANITIZE_FLAGS} build_repo osmo-ggsn ${SANITIZE_FLAGS} +build_repo osmo-hlr ${SANITIZE_FLAGS} build_repo libasn1c ${SANITIZE_FLAGS} build_repo osmo-iuh ${SANITIZE_FLAGS} build_repo osmo-sgsn ${SANITIZE_FLAGS} --enable-iu -- To view, visit https://gerrit.osmocom.org/11530 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6aa997ff2092f9ddf2ac475fd094803be9063980 Gerrit-Change-Number: 11530 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 08:15:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 08:15:27 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11521 ) Change subject: add DLCX command statistics to osmo-mgw ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c at 1573 PS1, Line 1573: OSMO_ASSERT(trunk->mgcp_dlcx_ctr_group); > I think we can drop this kind of check, unless rate_ctr_group_alloc does a lot more than just clalin [?] It doesn't hurt either. We don't use OSMO_ASSERT() on our allocations, do we? -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 31 Oct 2018 08:15:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 08:19:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 08:19:41 +0000 Subject: Change in libosmo-sccp[master]: vty: SCCP timers: add optional units In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11130 ) Change subject: vty: SCCP timers: add optional units ...................................................................... Patch Set 2: Code-Review-1 We don't need sub-second resolution timers here. The way how timers/timeouts are treated in other parts of the code is that the unit is stated in the help text for the timer, so pressing "?" while entering will give you a hint in what kind of unit to enter it. I think it's absolutely acceptable for timers that are in the few-seconds to few-minutes cases (like here for SCCP) to expect the user to be able to compute something like 180 seconds or 240 seconds in their head to 3 or 4 minutes. So unless Neels has a really strong feeling about this, I would rather say no. We generally should have one way of specifying a given parameter, not N number of different ways. Particularly not, if this is for one given sub-system only, and not a generalized feature available to every piece of code using the VTY. And having a generalized feature would require a much higher abstraction level of the VTY. -- To view, visit https://gerrit.osmocom.org/11130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I020d5dab19bc67e8444ed548db15b2a4d8871a9c Gerrit-Change-Number: 11130 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 31 Oct 2018 08:19:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 08:21:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 08:21:24 +0000 Subject: Change in osmo-dev[master]: 3G+2G.deps: add osmo-trx In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11389 ) Change subject: 3G+2G.deps: add osmo-trx ...................................................................... Patch Set 2: Code-Review+1 > I don't seem to have +2 in this repo. not even I do here, because it's more or less a "private project" (of course it's public, but it's something Neels created without clear mandate to improve his workflow and shared it with a wider audience) by neels which intrinsically he as the original author has the ultimate say. -- To view, visit https://gerrit.osmocom.org/11389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia4ebf2732694cee0600b602b82c660cf6278958d Gerrit-Change-Number: 11389 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Wed, 31 Oct 2018 08:21:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 08:22:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 08:22:34 +0000 Subject: Change in pysim[master]: pySim-*.py: add command line option for Calypso reader In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11482 ) Change subject: pySim-*.py: add command line option for Calypso reader ...................................................................... Patch Set 4: Code-Review+2 slightly related; maybe it makes sense to generalize some of the command line option parsing and share it between the two programs, rather than having copy+paste? -- To view, visit https://gerrit.osmocom.org/11482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df Gerrit-Change-Number: 11482 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 31 Oct 2018 08:22:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 08:22:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 08:22:57 +0000 Subject: Change in pysim[master]: pySim/transport: introduce Calypso based reader interface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11480 ) Change subject: pySim/transport: introduce Calypso based reader interface ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iec8101140581bf9e2cf7cf3a0b54bdf1875fc51b Gerrit-Change-Number: 11480 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: tnt Gerrit-Comment-Date: Wed, 31 Oct 2018 08:22:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 08:23:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 08:23:47 +0000 Subject: Change in pysim[master]: pySim/transport: introduce Calypso based reader interface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11480 ) Change subject: pySim/transport: introduce Calypso based reader interface ...................................................................... Patch Set 3: assigning to tnt as pySim is his creation. -- To view, visit https://gerrit.osmocom.org/11480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iec8101140581bf9e2cf7cf3a0b54bdf1875fc51b Gerrit-Change-Number: 11480 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: tnt Gerrit-Comment-Date: Wed, 31 Oct 2018 08:23:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 08:29:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 08:29:49 +0000 Subject: Change in osmo-dev[master]: deps: osmo-sgsn depends on osmo-hlr's liboso-gsup-client Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11537 Change subject: deps: osmo-sgsn depends on osmo-hlr's liboso-gsup-client ...................................................................... deps: osmo-sgsn depends on osmo-hlr's liboso-gsup-client Change-Id: Ie47ca98740ca438e04d6ea76421e0f58d9e5715a --- M 3G+2G.deps 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/37/11537/1 diff --git a/3G+2G.deps b/3G+2G.deps index 5a17146..adc2aec 100644 --- a/3G+2G.deps +++ b/3G+2G.deps @@ -11,5 +11,5 @@ osmo-mgw libosmo-netif osmo-msc osmo-iuh osmo-mgw libsmpp34 osmo-bsc libosmo-sccp osmo-mgw -osmo-sgsn osmo-iuh osmo-ggsn +osmo-sgsn osmo-iuh osmo-ggsn osmo-hlr osmo-sip-connector libosmocore -- To view, visit https://gerrit.osmocom.org/11537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie47ca98740ca438e04d6ea76421e0f58d9e5715a Gerrit-Change-Number: 11537 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 08:57:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 08:57:27 +0000 Subject: Change in osmo-gsm-tester[master]: utils: Introduce show_usb_device.py In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11460 ) Change subject: utils: Introduce show_usb_device.py ...................................................................... utils: Introduce show_usb_device.py This is a small script written by Alexander Couzens that is useful to list modems and its properties in a quick and easy way in osmo-gsm-tester setup. Change-Id: Iec049e2d56d61ecd50b65b64d95d69641fa0f8be --- A utils/show_usb_device.py 1 file changed, 97 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/utils/show_usb_device.py b/utils/show_usb_device.py new file mode 100755 index 0000000..9136234 --- /dev/null +++ b/utils/show_usb_device.py @@ -0,0 +1,97 @@ +#!/usr/bin/env python3 +# Alexander Couzens +# MIT + +# show usb device with their net and serial devices + +import os +import usb.core +import usb.util +from pprint import pprint + +def get_path_ids(bus, port_numbers): + port_numbers = [str(port) for port in port_numbers] + ports = '.'.join(port_numbers) + return '{}-{}'.format(bus, ports) + +def get_usb_dir(bus, port_numbers): + return '/sys/bus/usb/devices/' + get_path_ids(bus, port_numbers) + '/' + +def get_usbmisc_from_usb(bus, port_numbers): + usbmisc_ifaces = [] + path = get_usb_dir(bus, port_numbers) + path_ids = get_path_ids(bus, port_numbers) + + usb_interfaces = [f for f in os.listdir(path) if f.startswith(path_ids)] + for usb_iface in usb_interfaces: + listdir = [f for f in os.listdir(path + usb_iface) if f == ('usbmisc')] + if listdir: + # found a net iface + usbmisc_ifaces += os.listdir(path + usb_iface + '/usbmisc/') + return usbmisc_ifaces + +def get_net_from_usb(bus, port_numbers): + net_ifaces = [] + path = get_usb_dir(bus, port_numbers) + path_ids = get_path_ids(bus, port_numbers) + + usb_interfaces = [f for f in os.listdir(path) if f.startswith(path_ids)] + for usb_iface in usb_interfaces: + listdir = [f for f in os.listdir(path + usb_iface) if f == ('net')] + if listdir: + # found a net iface + net_ifaces += os.listdir(path + usb_iface + '/net/') + return net_ifaces + +def get_serial_from_usb(bus, port_numbers): + serial_ifaces = [] + path = get_usb_dir(bus, port_numbers) + path_ids = get_path_ids(bus, port_numbers) + + usb_interfaces = [f for f in os.listdir(path) if f.startswith(path_ids)] + for usb_iface in usb_interfaces: + serial_ifaces += [f for f in os.listdir(path + usb_iface) if f.startswith('tty')] + return serial_ifaces + +def get_product(bus, port_numbers): + usb_dir = get_usb_dir(bus, port_numbers) + try: + product = open(os.path.join(usb_dir, 'product')).read().strip() + except OSError as exp: + product = "Unknown" + return product + +def get_manuf(bus, port_numbers): + usb_dir = get_usb_dir(bus, port_numbers) + try: + manuf = open(os.path.join(usb_dir, 'manufacturer')).read().strip() + except OSError: + manuf = "Unknown" + return manuf + +def get_name(bus, port_numbers): + manuf = get_manuf(bus, port_numbers) + product = get_product(bus, port_numbers) + return "%s %s" % (manuf, product) + +if __name__ == '__main__': + USB_DEVS = [dev for dev in usb.core.find(find_all=True)] + RESULT = {} + for device in USB_DEVS: + result = {} + if not device.port_numbers: + continue + + # retrieve manuf + product from /sys because non-root user can not ask the usb device + result['name'] = get_name(device.bus, device.port_numbers) + result['path'] = get_usb_dir(device.bus, device.port_numbers) + result['net'] = get_net_from_usb(device.bus, device.port_numbers) + result['cdc'] = get_usbmisc_from_usb(device.bus, device.port_numbers) + result['serial'] = get_serial_from_usb(device.bus, device.port_numbers) + + # only show device which have serial or net devices + if result['net'] or result['serial']: + RESULT[device] = result + + pprint(RESULT) + -- To view, visit https://gerrit.osmocom.org/11460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iec049e2d56d61ecd50b65b64d95d69641fa0f8be Gerrit-Change-Number: 11460 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 08:57:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 08:57:29 +0000 Subject: Change in osmo-gsm-tester[master]: utils: Introduce modem-netns-setup.py In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11461 ) Change subject: utils: Introduce modem-netns-setup.py ...................................................................... utils: Introduce modem-netns-setup.py Used to quickly set modem net interfaces into their own net namespace (named after modem USB ID path). The idea is that since osmo-gsm-tester ofono modem.py knowns the USB path from a modem (path yml attr), it can infer the netns from it and run a ping process inside it. Related: OS#2308 Change-Id: Iadb2df2974e132044fba1f1bc2db8b559912e4e1 --- A utils/modem-netns-setup.py 1 file changed, 87 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/utils/modem-netns-setup.py b/utils/modem-netns-setup.py new file mode 100755 index 0000000..e0645d1 --- /dev/null +++ b/utils/modem-netns-setup.py @@ -0,0 +1,87 @@ +#!/usr/bin/env python3 +# Pau Espin Pedrol +# MIT + +# manage netns for ofono modems + +import os +import sys +import subprocess +import usb.core +import usb.util +from pprint import pprint + +def get_path_ids(bus, port_numbers): + port_numbers = [str(port) for port in port_numbers] + ports = '.'.join(port_numbers) + return '{}-{}'.format(bus, ports) + +def get_usb_dir(bus, port_numbers): + return '/sys/bus/usb/devices/' + get_path_ids(bus, port_numbers) + '/' + +def get_net_from_usb(bus, port_numbers): + net_ifaces = [] + path = get_usb_dir(bus, port_numbers) + path_ids = get_path_ids(bus, port_numbers) + + usb_interfaces = [f for f in os.listdir(path) if f.startswith(path_ids)] + for usb_iface in usb_interfaces: + listdir = [f for f in os.listdir(path + usb_iface) if f == ('net')] + if listdir: + # found a net iface + net_ifaces += os.listdir(path + usb_iface + '/net/') + return net_ifaces + +def move_modem_to_netns(usb_path_id, net_li): + + if len(net_li) == 0: + print("%s: Device has no net ifaces, skipping" %(usb_path_id)) + return + + if not os.path.exists("/var/run/netns/%s" % usb_path_id): + print("%s: Creating netns" % (usb_path_id)) + subprocess.check_call(["ip", "netns", "add", usb_path_id]) + else: + print("%s: netns already exists" % (usb_path_id)) + + for netif in net_li: + print("%s: Moving iface %s to netns" % (usb_path_id, netif)) + subprocess.check_call(["ip", "link", "set", netif, "netns", usb_path_id]) + # iface Must be set up AFTER pdp ctx is activated, otherwise we get no DHCP response. + #print("%s: Setting up iface %s" % (usb_path_id, netif)) + #subprocess.check_call(["ip", "netns", "exec", usb_path_id, "ip", "link", "set", "dev", netif, "up"]) + #subprocess.check_call(["ip", "netns", "exec", usb_path_id, "udhcpc", "-i", netif]) + +def delete_modem_netns(usb_path_id): + if os.path.exists("/var/run/netns/%s" % usb_path_id): + print("%s: Deleting netns" % (usb_path_id)) + subprocess.check_call(["ip", "netns", "delete", usb_path_id]) + else: + print("%s: netns doesn't exist" % (usb_path_id)) + +def print_help(): + print("Usage: %s start|stop" % sys.argv[0]) + exit(1) + + +if __name__ == '__main__': + + if len(sys.argv) != 2: + print_help() + + USB_DEVS = [dev for dev in usb.core.find(find_all=True)] + RESULT = {} + for device in USB_DEVS: + result = {} + if not device.port_numbers: + continue + + usb_path_id = get_path_ids(device.bus, device.port_numbers) + net_li = get_net_from_usb(device.bus, device.port_numbers) + + if sys.argv[1] == "start": + move_modem_to_netns(usb_path_id, net_li) + elif sys.argv[1] == "stop": + delete_modem_netns(usb_path_id) + else: + print_help() -- To view, visit https://gerrit.osmocom.org/11461 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iadb2df2974e132044fba1f1bc2db8b559912e4e1 Gerrit-Change-Number: 11461 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 08:57:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 08:57:29 +0000 Subject: Change in osmo-gsm-tester[master]: utils: Add osmo-gsm-tester_setcap_net_*.sh scripts In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11473 ) Change subject: utils: Add osmo-gsm-tester_setcap_net_*.sh scripts ...................................................................... utils: Add osmo-gsm-tester_setcap_net_*.sh scripts This scripts were already being used by osmo-gsm-tester for a while, but were not avaialable in this repository. Let's put them here to easy find them and have all this kind of helper scripts together with code using it. Change-Id: Ib88a1b7818155fc608cc6ff763300fbd0e03a07a --- A utils/osmo-gsm-tester_setcap_net_admin.sh A utils/osmo-gsm-tester_setcap_net_raw.sh 2 files changed, 5 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/utils/osmo-gsm-tester_setcap_net_admin.sh b/utils/osmo-gsm-tester_setcap_net_admin.sh new file mode 100755 index 0000000..60e527a --- /dev/null +++ b/utils/osmo-gsm-tester_setcap_net_admin.sh @@ -0,0 +1,2 @@ +#!/bin/sh +/sbin/setcap cap_net_admin+ep "$1" diff --git a/utils/osmo-gsm-tester_setcap_net_raw.sh b/utils/osmo-gsm-tester_setcap_net_raw.sh new file mode 100755 index 0000000..1f3a727 --- /dev/null +++ b/utils/osmo-gsm-tester_setcap_net_raw.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +/sbin/setcap cap_net_raw+ep "$1" -- To view, visit https://gerrit.osmocom.org/11473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib88a1b7818155fc608cc6ff763300fbd0e03a07a Gerrit-Change-Number: 11473 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 09:00:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 09:00:37 +0000 Subject: Change in osmo-gsm-tester[master]: Introduce iperf3 testing infrastructure In-Reply-To: References: Message-ID: Hello Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11476 to look at the new patch set (#3). Change subject: Introduce iperf3 testing infrastructure ...................................................................... Introduce iperf3 testing infrastructure Change-Id: I6ff6bef14feb535d98ca41b9788700d699e1ef1e --- A src/osmo_gsm_tester/iperf3.py M src/osmo_gsm_tester/suite.py A suites/gprs/iperf3.py M suites/gprs/suite.conf 4 files changed, 189 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/76/11476/3 -- To view, visit https://gerrit.osmocom.org/11476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6ff6bef14feb535d98ca41b9788700d699e1ef1e Gerrit-Change-Number: 11476 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 09:34:02 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 31 Oct 2018 09:34:02 +0000 Subject: Change in osmo-bsc[master]: ipaccess_sign_link_reject: fix: use osmo_strlcpy() to safely copy IP Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11538 Change subject: ipaccess_sign_link_reject: fix: use osmo_strlcpy() to safely copy IP ...................................................................... ipaccess_sign_link_reject: fix: use osmo_strlcpy() to safely copy IP Fixes: coverity scan CID#189459 Change-Id: Ib9c5e374b9c5c8f79eecf95c439a25b0f438e4e5 --- M src/osmo-bsc/bts_ipaccess_nanobts.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/38/11538/1 diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 40cabb8..1fffd89 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -494,7 +495,7 @@ return; entry->site_id = site_id; entry->bts_id = bts_id; - strncpy(entry->ip, ip, sizeof(entry->ip)); + osmo_strlcpy(entry->ip, ip, sizeof(entry->ip)); } /* Add to beginning with current timestamp */ -- To view, visit https://gerrit.osmocom.org/11538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9c5e374b9c5c8f79eecf95c439a25b0f438e4e5 Gerrit-Change-Number: 11538 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 09:37:05 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 31 Oct 2018 09:37:05 +0000 Subject: Change in osmo-bsc[master]: ipaccess_sign_link_reject: fix: use osmo_strlcpy() to safely copy IP In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11538 ) Change subject: ipaccess_sign_link_reject: fix: use osmo_strlcpy() to safely copy IP ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib9c5e374b9c5c8f79eecf95c439a25b0f438e4e5 Gerrit-Change-Number: 11538 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 31 Oct 2018 09:37:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 09:42:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 09:42:24 +0000 Subject: Change in osmo-bsc[master]: ipaccess_sign_link_reject: fix: use osmo_strlcpy() to safely copy IP In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11538 ) Change subject: ipaccess_sign_link_reject: fix: use osmo_strlcpy() to safely copy IP ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib9c5e374b9c5c8f79eecf95c439a25b0f438e4e5 Gerrit-Change-Number: 11538 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 31 Oct 2018 09:42:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 09:43:45 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 31 Oct 2018 09:43:45 +0000 Subject: Change in osmo-bsc[master]: ipaccess_sign_link_reject: fix: use osmo_strlcpy() to safely copy IP In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11538 ) Change subject: ipaccess_sign_link_reject: fix: use osmo_strlcpy() to safely copy IP ...................................................................... ipaccess_sign_link_reject: fix: use osmo_strlcpy() to safely copy IP Fixes: coverity scan CID#189459 Change-Id: Ib9c5e374b9c5c8f79eecf95c439a25b0f438e4e5 --- M src/osmo-bsc/bts_ipaccess_nanobts.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 40cabb8..1fffd89 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -494,7 +495,7 @@ return; entry->site_id = site_id; entry->bts_id = bts_id; - strncpy(entry->ip, ip, sizeof(entry->ip)); + osmo_strlcpy(entry->ip, ip, sizeof(entry->ip)); } /* Add to beginning with current timestamp */ -- To view, visit https://gerrit.osmocom.org/11538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib9c5e374b9c5c8f79eecf95c439a25b0f438e4e5 Gerrit-Change-Number: 11538 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 11:19:39 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 31 Oct 2018 11:19:39 +0000 Subject: Change in osmo-iuh[master]: add a VTY command which shows a specific HNB In-Reply-To: References: Message-ID: Hello lynxis lazus, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11506 to look at the new patch set (#2). Change subject: add a VTY command which shows a specific HNB ...................................................................... add a VTY command which shows a specific HNB Add the 'show hnb NAME' VTY command which displays just one specific HNB, addressed by its identity string. This augments the functionality provided by 'show hnb all'. Change-Id: Iab12aa4ab090b72c472358b84daf6919b30747f6 Related: OS#2774 --- M include/osmocom/iuh/hnbgw.h M src/hnbgw.c M src/hnbgw_vty.c 3 files changed, 37 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/06/11506/2 -- To view, visit https://gerrit.osmocom.org/11506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iab12aa4ab090b72c472358b84daf6919b30747f6 Gerrit-Change-Number: 11506 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 11:20:15 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 31 Oct 2018 11:20:15 +0000 Subject: Change in osmo-iuh[master]: add a VTY command which shows a specific HNB In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11506 ) Change subject: add a VTY command which shows a specific HNB ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11506/1/src/hnbgw_vty.c File src/hnbgw_vty.c: https://gerrit.osmocom.org/#/c/11506/1/src/hnbgw_vty.c at 234 PS1, Line 234: hnb = hnb_context_by_identity_info(&g_hnb_gw, identity_info); > I suggest to add a hnb_context_by_identity_info() function, similar to hnb_context_by_id() which we [?] Agreed. See patch set 2. -- To view, visit https://gerrit.osmocom.org/11506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iab12aa4ab090b72c472358b84daf6919b30747f6 Gerrit-Change-Number: 11506 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 31 Oct 2018 11:20:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 11:43:51 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 31 Oct 2018 11:43:51 +0000 Subject: Change in osmo-mgw[master]: add aggregated rtp connection stats to osmo-mgw In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11519 ) Change subject: add aggregated rtp connection stats to osmo-mgw ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11519/1/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/#/c/11519/1/src/libosmo-mgcp/mgcp_protocol.c at 108 PS1, Line 108: static const struct rate_ctr_desc all_rtp_conn_rate_ctr_desc[] = { > Let's better use a macro instead of manually keeping them in sync. That's going to break eventually. [?] I think moving both of these definitions to a shared header file is the best approach. If we keep these two definitions close to each other, the chances of them getting out of sync are insignificant. See patch set 2. Using a macro seems like overkill to me. Apart from the index values which derive from the enum, all the string fields contain different values. And dynamic allocation of rate counter group definitions is discouraged; the rate counter documentation states that definitions are "usually const". -- To view, visit https://gerrit.osmocom.org/11519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I80d36181600901ae2e0f321dc02b5d54ddc94139 Gerrit-Change-Number: 11519 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 31 Oct 2018 11:43:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 11:45:25 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 31 Oct 2018 11:45:25 +0000 Subject: Change in osmo-mgw[master]: add aggregated rtp connection stats to osmo-mgw In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11519 to look at the new patch set (#2). Change subject: add aggregated rtp connection stats to osmo-mgw ...................................................................... add aggregated rtp connection stats to osmo-mgw Add a counter group for aggregated RTP connection statistics. This group contains RTP counters which aggregate values of the ephemeral RTP counters maintained per connection (mgcp_conn). This provides a global overview of RTP processing for each trunk throughout the lifetime of the osmo-mgw process. The counters are displayed by 'show mgcp stats' and 'show rate-counters'. Change-Id: I80d36181600901ae2e0f321dc02b5d54ddc94139 Related: OS#2660 --- M include/osmocom/mgcp/mgcp.h M include/osmocom/mgcp/mgcp_conn.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c 5 files changed, 80 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/19/11519/2 -- To view, visit https://gerrit.osmocom.org/11519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I80d36181600901ae2e0f321dc02b5d54ddc94139 Gerrit-Change-Number: 11519 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 11:58:21 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 31 Oct 2018 11:58:21 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11521 to look at the new patch set (#2). Change subject: add DLCX command statistics to osmo-mgw ...................................................................... add DLCX command statistics to osmo-mgw Add a counter group for DLCX commands. The group contains counters for successful connection processing as well as various error conditions. This provides a quick overview of DLCX failures on each trunk throughout the lifetime of the osmo-mgw process. The counters are displayed by 'show mgcp stats' and 'show rate-counters' Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Depends: I80d36181600901ae2e0f321dc02b5d54ddc94139I Related: OS#2660 --- M include/osmocom/mgcp/mgcp.h M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c 3 files changed, 66 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/21/11521/2 -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 11:59:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 31 Oct 2018 11:59:48 +0000 Subject: Change in osmo-pcap[master]: test NOT FOR MERGE Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11542 Change subject: test NOT FOR MERGE ...................................................................... test NOT FOR MERGE Change-Id: I07108657f0d37ba14e85cf30df28be6f3fac9fa5 --- M README.md 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/42/11542/1 diff --git a/README.md b/README.md index b2a26cf..1ec4dae 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +test # osmo-pcap distributed network capture osmo-pcap has been created to collect network traces at different nodes -- To view, visit https://gerrit.osmocom.org/11542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I07108657f0d37ba14e85cf30df28be6f3fac9fa5 Gerrit-Change-Number: 11542 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 12:00:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 31 Oct 2018 12:00:40 +0000 Subject: Change in osmo-pcap[master]: test NOT FOR MERGE In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/11542 ) Change subject: test NOT FOR MERGE ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I07108657f0d37ba14e85cf30df28be6f3fac9fa5 Gerrit-Change-Number: 11542 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 12:02:08 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 31 Oct 2018 12:02:08 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11521 ) Change subject: add DLCX command statistics to osmo-mgw ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c at 1573 PS1, Line 1573: * (called once at startup by main function) */ > It doesn't hurt either. [?] If it were up to me, all allocation failures in osmocom projects would be handled like regular errors, i.e. propagated back to callers. But our code was written with a different style. Back when I first asked about this, I remember Harald specifically telling me that osmocom projects check allocations with OSMO_ASSERT(), so that's what I've been doing. It's fine if you guys change your minds, but consistency will be appreciated nevertheless :) -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 31 Oct 2018 12:02:08 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 12:06:26 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 31 Oct 2018 12:06:26 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11521 ) Change subject: add DLCX command statistics to osmo-mgw ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c at 1347 PS1, Line 1347: } > I'd say that's not a failure, but an app decision to handle it its own way, so better remove FAIL fr [?] I'd prefer consistency over making exceptions. I think it is fine to treat this and the case below like any other non-success cases. -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 31 Oct 2018 12:06:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 12:06:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 12:06:38 +0000 Subject: Change in osmo-pcap[master]: test Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11543 Change subject: test ...................................................................... test Change-Id: Iaab1f6d2d563df7ec3a1f56add2e883b4f697da6 --- M README.md 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/43/11543/1 diff --git a/README.md b/README.md index b2a26cf..a147b82 100644 --- a/README.md +++ b/README.md @@ -49,3 +49,4 @@ ## Author and License osmo-pcap has been created by Holger Hans Peter Freyther (holger at freyther.de) and is licensed as AGPLv3+. The author appreciates failure or success reports of using the software. +test -- To view, visit https://gerrit.osmocom.org/11543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iaab1f6d2d563df7ec3a1f56add2e883b4f697da6 Gerrit-Change-Number: 11543 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 12:10:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 12:10:25 +0000 Subject: Change in osmo-mgw[master]: add aggregated rtp connection stats to osmo-mgw In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11519 ) Change subject: add aggregated rtp connection stats to osmo-mgw ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11519/1/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/#/c/11519/1/src/libosmo-mgcp/mgcp_protocol.c at 108 PS1, Line 108: static const struct rate_ctr_desc all_rtp_conn_rate_ctr_desc[] = { > I think moving both of these definitions to a shared header file is the best approach. [?] Ok, I didn't pay attention to the fact that strings are different, I thought only the last RTP_NUM_CONNECTIONS field was added. -- To view, visit https://gerrit.osmocom.org/11519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I80d36181600901ae2e0f321dc02b5d54ddc94139 Gerrit-Change-Number: 11519 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 31 Oct 2018 12:10:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 12:13:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 12:13:56 +0000 Subject: Change in osmo-mgw[master]: add aggregated rtp connection stats to osmo-mgw In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11519 ) Change subject: add aggregated rtp connection stats to osmo-mgw ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11519/2/include/osmocom/mgcp/mgcp_conn.h File include/osmocom/mgcp/mgcp_conn.h: https://gerrit.osmocom.org/#/c/11519/2/include/osmocom/mgcp/mgcp_conn.h at 64 PS2, Line 64: [RTP_OCTETS_TX_CTR] = {"all_rtp:octets_tx", "Total outbound rtp octets."}, You ar still sneaking this octets_rx/octets_tx change without at least describing it in the commit log. Best would be to have it on a separate patch. -- To view, visit https://gerrit.osmocom.org/11519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I80d36181600901ae2e0f321dc02b5d54ddc94139 Gerrit-Change-Number: 11519 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 31 Oct 2018 12:13:56 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 12:17:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 12:17:15 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11521 ) Change subject: add DLCX command statistics to osmo-mgw ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c at 1347 PS1, Line 1347: rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_REJECTED_BY_POLICY]); > I'd prefer consistency over making exceptions. [?] Well, deferring in this case is more a success than a failure, that's what I'm trying to tell you. https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c at 1573 PS1, Line 1573: OSMO_ASSERT(trunk->mgcp_dlcx_ctr_group); > If it were up to me, all allocation failures in osmocom projects would be handled like regular error [?] That's first notice I get regarding we use OSMO_ASSERT during allocations, I would say we usually don't. -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 31 Oct 2018 12:17:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 12:19:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 12:19:21 +0000 Subject: Change in osmo-pcap[master]: debian: Clean up to look like other osmocom projects Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11544 Change subject: debian: Clean up to look like other osmocom projects ...................................................................... debian: Clean up to look like other osmocom projects Change-Id: Id71699642b799f5b2f8f3b794b9493ddaeb70cc0 --- D debian/README M debian/compat A debian/copyright D debian/init.d.ex D debian/osmo-pcap-client.init D debian/osmo-pcap.default.ex M debian/rules 7 files changed, 28 insertions(+), 338 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/44/11544/1 diff --git a/debian/README b/debian/README deleted file mode 100644 index 1719eed..0000000 --- a/debian/README +++ /dev/null @@ -1,6 +0,0 @@ -The Debian Package osmo-pcap ----------------------------- - -Comments regarding the Package - - -- Holger Hans Peter Freyther Wed, 01 Jun 2011 14:51:32 +0200 diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..5b7df8b --- /dev/null +++ b/debian/copyright @@ -0,0 +1,21 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: OsmoHLR +Source: http://cgit.osmocom.org/osmo-hlr/ + +Files: * +Copyright: 2018 Sysmocom s. f. m. c. GmbH +License: AGPL-3+ + +License: AGPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . diff --git a/debian/init.d.ex b/debian/init.d.ex deleted file mode 100644 index 8cabb58..0000000 --- a/debian/init.d.ex +++ /dev/null @@ -1,154 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: osmo-pcap -# Required-Start: $network $local_fs -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: -# Description: -# <...> -# <...> -### END INIT INFO - -# Author: Holger Hans Peter Freyther - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC=osmo-pcap # Introduce a short description here -NAME=osmo-pcap # Introduce the short server's name here -DAEMON=/usr/sbin/osmo-pcap # Introduce the server's location here -DAEMON_ARGS="" # Arguments to run the daemon with -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed -[ -x $DAEMON ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/debian/osmo-pcap-client.init b/debian/osmo-pcap-client.init deleted file mode 100755 index 6bfee7a..0000000 --- a/debian/osmo-pcap-client.init +++ /dev/null @@ -1,152 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: osmo-pcap-client -# Required-Start: $network $local_fs -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start the pcap client -# Description: PCAP Client for the PCAP aggregation -### END INIT INFO - -# Author: Holger Hans Peter Freyther - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC=osmo-pcap-client # Introduce a short description here -NAME=osmo-pcap-client # Introduce the short server's name here -DAEMON=/usr/bin/osmo-pcap-client # Introduce the server's location here -DAEMON_ARGS="-c /etc/osmo-pcap/osmo-pcap-client.cfg" # Arguments to run the daemon with -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed -[ -x $DAEMON ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon -b -m --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - #start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - #[ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/debian/osmo-pcap.default.ex b/debian/osmo-pcap.default.ex deleted file mode 100644 index 08824c5..0000000 --- a/debian/osmo-pcap.default.ex +++ /dev/null @@ -1,10 +0,0 @@ -# Defaults for osmo-pcap initscript -# sourced by /etc/init.d/osmo-pcap -# installed at /etc/default/osmo-pcap by the maintainer scripts - -# -# This is a POSIX shell fragment -# - -# Additional options that are passed to the Daemon. -DAEMON_OPTS="" diff --git a/debian/rules b/debian/rules index 872097c..6862888 100755 --- a/debian/rules +++ b/debian/rules @@ -1,27 +1,18 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# -# Modified to make a template file for a multi-binary package with separated -# build-arch and build-indep targets by Bill Allombert 2001 -# Uncomment this to turn on verbose mode. +DEBIAN := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2) +DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1) +VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g') + #export DH_VERBOSE=1 - -# This has to be exported to make some magic below work. -export DH_OPTIONS +export DEB_BUILD_MAINT_OPTIONS = hardening=+all # Maybe we require some moreadvanced testing in the future PCAP_CFLAGS="-I/usr/include" PCAP_LIBS="-lpcap" %: - dh --with autoreconf $@ + dh $@ --with autoreconf --fail-missing override_dh_auto_configure: dh_auto_configure -- \ -- To view, visit https://gerrit.osmocom.org/11544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id71699642b799f5b2f8f3b794b9493ddaeb70cc0 Gerrit-Change-Number: 11544 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 12:19:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 12:19:43 +0000 Subject: Change in osmo-pcap[master]: Install systemd services with autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11545 Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: Id938f3dab4826ac748abb5e0b169d800c2a625a5 --- M Makefile.am M configure.ac M contrib/Makefile.am A contrib/systemd/Makefile.am A contrib/systemd/osmo-pcap-client.service A contrib/systemd/osmo-pcap-server.service M debian/osmo-pcap-client.install M debian/osmo-pcap-server.install M debian/rules 9 files changed, 56 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/45/11545/1 diff --git a/Makefile.am b/Makefile.am index 6caa009..61eb85d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,10 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen .version +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + + @RELMAKE@ $(top_srcdir)/.version: diff --git a/configure.ac b/configure.ac index b5468ee..a0f786f 100644 --- a/configure.ac +++ b/configure.ac @@ -52,6 +52,21 @@ CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" fi +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_ARG_ENABLE([external_tests], AC_HELP_STRING([--enable-external-tests], [Include the VTY tests in make check [default=no]]), @@ -122,5 +137,6 @@ include/osmo-pcap/Makefile src/Makefile contrib/Makefile + contrib/systemd/Makefile tests/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 3585924..7bd8c23 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,2 +1,3 @@ +SUBDIRS = systemd dist_pkgdata_DATA = osmo_pcap_clean_old EXTRA_DIST = osmo-pcap-server.cfg osmo-pcap-client.cfg diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..49a2625 --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,8 @@ +if HAVE_SYSTEMD +SYSTEMD_SERVICES = \ + osmo-pcap-client.service \ + osmo-pcap-server.service + +EXTRA_DIST = $(SYSTEMD_SERVICES) +systemdsystemunit_DATA = $(SYSTEMD_SERVICES) +endif diff --git a/contrib/systemd/osmo-pcap-client.service b/contrib/systemd/osmo-pcap-client.service new file mode 100644 index 0000000..fd0de75 --- /dev/null +++ b/contrib/systemd/osmo-pcap-client.service @@ -0,0 +1,12 @@ +[Unit] +Description=PCAP Client for the PCAP aggregation + +[Service] +Type=simple +Restart=always +ExecStart=/usr/bin/osmo-pcap-client -c /etc/osmocom/osmo-pcap-client.cfg +RestartSec=2 + +[Install] +WantedBy=multi-user.target + diff --git a/contrib/systemd/osmo-pcap-server.service b/contrib/systemd/osmo-pcap-server.service new file mode 100644 index 0000000..3094fc4 --- /dev/null +++ b/contrib/systemd/osmo-pcap-server.service @@ -0,0 +1,12 @@ +[Unit] +Description=PCAP Server for the PCAP aggregation + +[Service] +Type=simple +Restart=always +ExecStart=/usr/bin/osmo-pcap-server -c /etc/osmocom/osmo-pcap-server.cfg +RestartSec=2 + +[Install] +WantedBy=multi-user.target + diff --git a/debian/osmo-pcap-client.install b/debian/osmo-pcap-client.install index f149b14..ac7c65c 100644 --- a/debian/osmo-pcap-client.install +++ b/debian/osmo-pcap-client.install @@ -1 +1,2 @@ +lib/systemd/system/osmo-pcap-client.service usr/bin/osmo-pcap-client diff --git a/debian/osmo-pcap-server.install b/debian/osmo-pcap-server.install index ad58c8e..6ba698e 100644 --- a/debian/osmo-pcap-server.install +++ b/debian/osmo-pcap-server.install @@ -1 +1,2 @@ +lib/systemd/system/osmo-pcap-server.service usr/bin/osmo-pcap-server diff --git a/debian/rules b/debian/rules index 6862888..a9a8b30 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,7 @@ override_dh_auto_configure: dh_auto_configure -- \ + --with-systemdsystemunitdir=/lib/systemd/system \ --with-pcap-config=/bin/false \ PCAP_CFLAGS=$(PCAP_CFLAGS) \ PCAP_LIBS=$(PCAP_LIBS) -- To view, visit https://gerrit.osmocom.org/11545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id938f3dab4826ac748abb5e0b169d800c2a625a5 Gerrit-Change-Number: 11545 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 12:19:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 12:19:57 +0000 Subject: Change in osmo-pcap[master]: Install cfg files with autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11546 Change subject: Install cfg files with autotools ...................................................................... Install cfg files with autotools Cfg files are moved to doc/examples like in other osmocom projects. All the cfg files get installed into $prefix/share/doc/osmo-trx/examples/$subdir/, and 1 script per binary is installed into /etc/osmocom. Change-Id: If3f3a7d3867c0d4d2b1fe01f465532d1ce4bda66 --- M Makefile.am M configure.ac M contrib/Makefile.am M debian/osmo-pcap-client.install M debian/osmo-pcap-server.install M debian/rules A doc/Makefile.am A doc/examples/Makefile.am R doc/examples/osmo-pcap-client/osmo-pcap-client-tls.cfg R doc/examples/osmo-pcap-client/osmo-pcap-client.cfg R doc/examples/osmo-pcap-server/osmo-pcap-server-tls.cfg R doc/examples/osmo-pcap-server/osmo-pcap-server.cfg 12 files changed, 40 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/46/11546/1 diff --git a/Makefile.am b/Makefile.am index 61eb85d..cf8dfa3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 -SUBDIRS = include src contrib tests +SUBDIRS = include src contrib doc tests BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen .version diff --git a/configure.ac b/configure.ac index a0f786f..b16ae13 100644 --- a/configure.ac +++ b/configure.ac @@ -138,5 +138,7 @@ src/Makefile contrib/Makefile contrib/systemd/Makefile + doc/Makefile + doc/examples/Makefile tests/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 7bd8c23..e1927a7 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,3 +1,2 @@ SUBDIRS = systemd dist_pkgdata_DATA = osmo_pcap_clean_old -EXTRA_DIST = osmo-pcap-server.cfg osmo-pcap-client.cfg diff --git a/debian/osmo-pcap-client.install b/debian/osmo-pcap-client.install index ac7c65c..ef6576e 100644 --- a/debian/osmo-pcap-client.install +++ b/debian/osmo-pcap-client.install @@ -1,2 +1,5 @@ +etc/osmocom/osmo-pcap-client.cfg lib/systemd/system/osmo-pcap-client.service usr/bin/osmo-pcap-client +usr/share/doc/osmo-pcap/examples/osmo-pcap-client/osmo-pcap-client.cfg +usr/share/doc/osmo-pcap/examples/osmo-pcap-client/osmo-pcap-client-tls.cfg diff --git a/debian/osmo-pcap-server.install b/debian/osmo-pcap-server.install index 6ba698e..cedee92 100644 --- a/debian/osmo-pcap-server.install +++ b/debian/osmo-pcap-server.install @@ -1,2 +1,5 @@ +etc/osmocom/osmo-pcap-server.cfg lib/systemd/system/osmo-pcap-server.service usr/bin/osmo-pcap-server +usr/share/doc/osmo-pcap/examples/osmo-pcap-server/osmo-pcap-server.cfg +usr/share/doc/osmo-pcap/examples/osmo-pcap-server/osmo-pcap-server-tls.cfg diff --git a/debian/rules b/debian/rules index a9a8b30..90bd79e 100755 --- a/debian/rules +++ b/debian/rules @@ -21,17 +21,6 @@ PCAP_CFLAGS=$(PCAP_CFLAGS) \ PCAP_LIBS=$(PCAP_LIBS) -override_dh_auto_install: - dh_auto_install $@ - install -d -m 0755 $(CURDIR)/debian/osmo-pcap-client/etc/osmo-pcap/ - install -m 0644 $(CURDIR)/contrib/osmo-pcap-client.cfg $(CURDIR)/debian/osmo-pcap-client/etc/osmo-pcap - - install -d -m 0755 $(CURDIR)/debian/osmo-pcap-server/etc/osmo-pcap/ - install -m 0644 $(CURDIR)/contrib/osmo-pcap-server.cfg $(CURDIR)/debian/osmo-pcap-server/etc/osmo-pcap - - install -d -m 0755 $(CURDIR)/debian/osmo-pcap-server/etc/cron.daily/ - install -m 0755 $(CURDIR)/contrib/osmo_pcap_clean_old $(CURDIR)/debian/osmo-pcap-server/etc/cron.daily/ - override_dh_strip: dh_strip -posmo-pcap-client --dbg-package=osmo-pcap-client-dbg dh_strip -posmo-pcap-server --dbg-package=osmo-pcap-server-dbg diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..aee2d7b --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = examples diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am new file mode 100644 index 0000000..9337c9e --- /dev/null +++ b/doc/examples/Makefile.am @@ -0,0 +1,30 @@ +OSMOCONF_FILES = \ + osmo-pcap-client/osmo-pcap-client.cfg \ + osmo-pcap-server/osmo-pcap-server.cfg + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = $(OSMOCONF_FILES) +EXTRA_DIST = $(OSMOCONF_FILES) + +CFG_FILES = find $(srcdir) -type f -name '*.cfg*' | sed -e 's,^$(srcdir),,' + +dist-hook: + for f in $$($(CFG_FILES)); do \ + j="$(distdir)/$$f" && \ + mkdir -p "$$(dirname $$j)" && \ + $(INSTALL_DATA) $(srcdir)/$$f $$j; \ + done + +install-data-hook: + for f in $$($(CFG_FILES)); do \ + j="$(DESTDIR)$(docdir)/examples/$$f" && \ + mkdir -p "$$(dirname $$j)" && \ + $(INSTALL_DATA) $(srcdir)/$$f $$j; \ + done + +uninstall-hook: + @$(PRE_UNINSTALL) + for f in $$($(CFG_FILES)); do \ + j="$(DESTDIR)$(docdir)/examples/$$f" && \ + $(RM) $$j; \ + done diff --git a/contrib/osmo-pcap-client-tls.cfg b/doc/examples/osmo-pcap-client/osmo-pcap-client-tls.cfg similarity index 100% rename from contrib/osmo-pcap-client-tls.cfg rename to doc/examples/osmo-pcap-client/osmo-pcap-client-tls.cfg diff --git a/contrib/osmo-pcap-client.cfg b/doc/examples/osmo-pcap-client/osmo-pcap-client.cfg similarity index 100% rename from contrib/osmo-pcap-client.cfg rename to doc/examples/osmo-pcap-client/osmo-pcap-client.cfg diff --git a/contrib/osmo-pcap-server-tls.cfg b/doc/examples/osmo-pcap-server/osmo-pcap-server-tls.cfg similarity index 100% rename from contrib/osmo-pcap-server-tls.cfg rename to doc/examples/osmo-pcap-server/osmo-pcap-server-tls.cfg diff --git a/contrib/osmo-pcap-server.cfg b/doc/examples/osmo-pcap-server/osmo-pcap-server.cfg similarity index 100% rename from contrib/osmo-pcap-server.cfg rename to doc/examples/osmo-pcap-server/osmo-pcap-server.cfg -- To view, visit https://gerrit.osmocom.org/11546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If3f3a7d3867c0d4d2b1fe01f465532d1ce4bda66 Gerrit-Change-Number: 11546 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 12:20:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 12:20:11 +0000 Subject: Change in osmo-pcap[master]: gitignore: Add compile Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11547 Change subject: gitignore: Add compile ...................................................................... gitignore: Add compile Change-Id: Ie801d6929068d11fafd24a1370e60e984b0137c2 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/47/11547/1 diff --git a/.gitignore b/.gitignore index 7e4da82..b80db93 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ install-sh missing stamp-h1 +compile osmopcapconfig.h* -- To view, visit https://gerrit.osmocom.org/11547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie801d6929068d11fafd24a1370e60e984b0137c2 Gerrit-Change-Number: 11547 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 12:20:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 12:20:21 +0000 Subject: Change in osmo-pcap[master]: debian: Install osmo_pcap_clean_old in osmo-pcap-server pkg Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11548 Change subject: debian: Install osmo_pcap_clean_old in osmo-pcap-server pkg ...................................................................... debian: Install osmo_pcap_clean_old in osmo-pcap-server pkg Change-Id: Ia4b031fdf54cde3d00818df82e89733420a735ba --- M debian/osmo-pcap-server.install 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/48/11548/1 diff --git a/debian/osmo-pcap-server.install b/debian/osmo-pcap-server.install index cedee92..0cb99b1 100644 --- a/debian/osmo-pcap-server.install +++ b/debian/osmo-pcap-server.install @@ -3,3 +3,4 @@ usr/bin/osmo-pcap-server usr/share/doc/osmo-pcap/examples/osmo-pcap-server/osmo-pcap-server.cfg usr/share/doc/osmo-pcap/examples/osmo-pcap-server/osmo-pcap-server-tls.cfg +usr/share/osmo-pcap/osmo_pcap_clean_old -- To view, visit https://gerrit.osmocom.org/11548 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia4b031fdf54cde3d00818df82e89733420a735ba Gerrit-Change-Number: 11548 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 13:06:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 31 Oct 2018 13:06:42 +0000 Subject: Change in osmo-dev[master]: fill_config.py: add NET_DIR variable In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11426 ) Change subject: fill_config.py: add NET_DIR variable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idbdf478ebb9f0b2fcd860e5eff3c414a0a459561 Gerrit-Change-Number: 11426 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 31 Oct 2018 13:06:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 13:06:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 31 Oct 2018 13:06:57 +0000 Subject: Change in osmo-dev[master]: fill_config.py: add NET_DIR variable In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11426 ) Change subject: fill_config.py: add NET_DIR variable ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idbdf478ebb9f0b2fcd860e5eff3c414a0a459561 Gerrit-Change-Number: 11426 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 31 Oct 2018 13:06:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 13:07:00 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 31 Oct 2018 13:07:00 +0000 Subject: Change in osmo-dev[master]: fill_config.py: add NET_DIR variable In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11426 ) Change subject: fill_config.py: add NET_DIR variable ...................................................................... fill_config.py: add NET_DIR variable Allow all config files to use a new NET_DIR variable, which always points to the network folder with the generated configs. We can use this to place all temporary files (sockets, pid files, ...) there. Change-Id: Idbdf478ebb9f0b2fcd860e5eff3c414a0a459561 --- M net/README M net/fill_config.py 2 files changed, 6 insertions(+), 3 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved; Verified diff --git a/net/README b/net/README index 352bc56..1d07775 100644 --- a/net/README +++ b/net/README @@ -71,7 +71,8 @@ The fill_config.py script helps to fill the templates with the config values. Simply invoke fill_config.py with a dir argument (templates dir) and a file argument (specific -config values). +config values). The dir argument can be used in the templates with ${NET_DIR}, +temporary files (sockets etc.) should be placed inside this folder. If one or both are omitted, the script tries to re-use the most recent paths, they were stored in local files '.last_config' and '.last_templates'. diff --git a/net/fill_config.py b/net/fill_config.py index d0e2e04..c33e6b7 100755 --- a/net/fill_config.py +++ b/net/fill_config.py @@ -50,8 +50,9 @@ local_config_file = os.path.realpath(local_config_file) tmpl_dir = os.path.realpath(tmpl_dir) +net_dir = os.path.realpath(".") -print('using config file %r\non templates %r' % (local_config_file, tmpl_dir)) +print('using config file %r\non templates %r\nwith NET_DIR %r' % (local_config_file, tmpl_dir, net_dir)) with open(LAST_LOCAL_CONFIG_FILE, 'w') as last_file: last_file.write(local_config_file) @@ -59,7 +60,8 @@ last_file.write(tmpl_dir) # read in variable values from config file -local_config = {} +# NET_DIR is the folder where fill_config.py was started +local_config = {"NET_DIR": net_dir} line_nr = 0 for line in open(local_config_file): -- To view, visit https://gerrit.osmocom.org/11426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idbdf478ebb9f0b2fcd860e5eff3c414a0a459561 Gerrit-Change-Number: 11426 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 13:08:06 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 31 Oct 2018 13:08:06 +0000 Subject: Change in osmo-dev[master]: support osmo-sip-connector with kamailio In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11144 ) Change subject: support osmo-sip-connector with kamailio ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 Gerrit-Change-Number: 11144 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: daniel Gerrit-Comment-Date: Wed, 31 Oct 2018 13:08:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 13:11:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 31 Oct 2018 13:11:02 +0000 Subject: Change in osmo-dev[master]: 3G+2G.deps: add osmo-trx In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11389 ) Change subject: 3G+2G.deps: add osmo-trx ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11389/2/3G%2B2G.deps File 3G+2G.deps: https://gerrit.osmocom.org/#/c/11389/2/3G%2B2G.deps at 16 PS2, Line 16: osmo-trx libosmocore how about in 2G.deps as well? -- To view, visit https://gerrit.osmocom.org/11389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia4ebf2732694cee0600b602b82c660cf6278958d Gerrit-Change-Number: 11389 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 31 Oct 2018 13:11:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 13:11:31 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 31 Oct 2018 13:11:31 +0000 Subject: Change in osmo-dev[master]: gen_makefile.py: detect changes in cpp files In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11434 ) Change subject: gen_makefile.py: detect changes in cpp files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9382d984fa1988eefbb6be3e45d88b2f1f5b598a Gerrit-Change-Number: 11434 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 31 Oct 2018 13:11:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 13:13:46 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 31 Oct 2018 13:13:46 +0000 Subject: Change in osmo-dev[master]: 2G.deps, 3G+2G.deps: add osmo-trx In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11389 to look at the new patch set (#3). Change subject: 2G.deps, 3G+2G.deps: add osmo-trx ...................................................................... 2G.deps, 3G+2G.deps: add osmo-trx Change-Id: Ia4ebf2732694cee0600b602b82c660cf6278958d --- M 2G.deps M 3G+2G.deps 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/89/11389/3 -- To view, visit https://gerrit.osmocom.org/11389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia4ebf2732694cee0600b602b82c660cf6278958d Gerrit-Change-Number: 11389 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 13:14:03 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 31 Oct 2018 13:14:03 +0000 Subject: Change in osmo-dev[master]: 2G.deps, 3G+2G.deps: add osmo-trx In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11389 ) Change subject: 2G.deps, 3G+2G.deps: add osmo-trx ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11389/2/3G%2B2G.deps File 3G+2G.deps: https://gerrit.osmocom.org/#/c/11389/2/3G%2B2G.deps at 16 PS2, Line 16: osmo-trx libosmocore > how about in 2G. [?] Done -- To view, visit https://gerrit.osmocom.org/11389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia4ebf2732694cee0600b602b82c660cf6278958d Gerrit-Change-Number: 11389 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 31 Oct 2018 13:14:03 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 13:14:24 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 31 Oct 2018 13:14:24 +0000 Subject: Change in osmo-dev[master]: support osmo-sip-connector with kamailio In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11144 ) Change subject: support osmo-sip-connector with kamailio ...................................................................... Patch Set 9: Verified+1 -- To view, visit https://gerrit.osmocom.org/11144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 Gerrit-Change-Number: 11144 Gerrit-PatchSet: 9 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: daniel Gerrit-Comment-Date: Wed, 31 Oct 2018 13:14:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 13:14:29 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 31 Oct 2018 13:14:29 +0000 Subject: Change in osmo-dev[master]: support osmo-sip-connector with kamailio In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11144 ) Change subject: support osmo-sip-connector with kamailio ...................................................................... support osmo-sip-connector with kamailio Kamailio is a SIP server, that is relatively easy to configure, in contrary to asterisk it only has one config file. The config file here is based on the example config provided in the wiki: To enable the osmo-sip-connector, build it, install kamailio and then set SIPCON_ENABLE=true in your copy of config_2g_3g. Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 --- M net/config_2g3g A net/tmpl_std/kamailio.cfg A net/tmpl_std/osmo-sip-connector.cfg M net/tmpl_std/run.sh 4 files changed, 462 insertions(+), 3 deletions(-) Approvals: osmith: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/net/config_2g3g b/net/config_2g3g index c4545a4..622a4be 100644 --- a/net/config_2g3g +++ b/net/config_2g3g @@ -30,6 +30,7 @@ HLR_IP="127.0.0.1" MSC_PC="0.23.1" +MSC_MNCC_SOCKET="${NET_DIR}/msc_mncc_socket" AUTH=optional ENCR_A5=0 @@ -72,3 +73,9 @@ SCRAMBLE2=258 LAC2=2${UARFCN2} RAC2=22 + +SIPCON_ENABLE="false" +SIPCON_LOCAL="${PUBLIC_IP}" +SIPCON_LOCAL_PORT="5069" +SIPCON_REMOTE="${PUBLIC_IP}" +SIPCON_REMOTE_PORT="5060" diff --git a/net/tmpl_std/kamailio.cfg b/net/tmpl_std/kamailio.cfg new file mode 100644 index 0000000..c5b0bf2 --- /dev/null +++ b/net/tmpl_std/kamailio.cfg @@ -0,0 +1,419 @@ +#!KAMAILIO + +#!define WITH_DEBUG +#!define WITH_PSTN + +####### Defined Values ######### + +# - flags +# FLT_ - per transaction (message) flags +# FLB_ - per branch flags +#!define FLT_ACC 1 +#!define FLT_ACCMISSED 2 +#!define FLT_ACCFAILED 3 +#!define FLT_NATS 5 +#!define FLB_NATB 6 +#!define FLB_NATSIPPING 7 + +####### Global Parameters ######### + +### LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR +#!ifdef WITH_DEBUG +debug=2 +log_stderror=yes +#!else +debug=2 +log_stderror=no +#!endif + +memdbg=5 +memlog=5 + +log_facility=LOG_LOCAL0 +rundir="${NET_DIR}/kamailio_rundir" + +fork=yes +children=4 + +/* uncomment the next line to disable TCP (default on) */ +disable_tcp=yes + +/* uncomment the next line to disable the auto discovery of local aliases + based on reverse DNS on IPs (default on) */ +auto_aliases=no + +/* add local domain aliases */ +#alias="sip.mydomain.com" + +/* uncomment and configure the following line if you want Kamailio to + bind on a specific interface/port/proto (default bind on all available) */ +listen=${SIPCON_REMOTE}:${SIPCON_REMOTE_PORT} + +/* port to listen to + * - can be specified more than once if needed to listen on many ports */ +port=${SIPCON_REMOTE_PORT} + +# life time of TCP connection when there is no traffic +# - a bit higher than registration expires to cope with UA behind NAT +tcp_connection_lifetime=3605 + +####### Custom Parameters ######### + +# These parameters can be modified runtime via RPC interface +# - see the documentation of 'cfg_rpc' module. +# +# Format: group.id = value 'desc' description +# Access: $sel(cfg_get.group.id) or @cfg_get.group.id +# + +#!ifdef WITH_PSTN +# PSTN GW Routing +# +# - pstn.gw_ip: valid IP or hostname as string value, example: +# pstn.gw_ip = "10.0.0.101" desc "My PSTN GW Address" +# +# - by default is empty to avoid misrouting +pstn.gw_ip = "${SIPCON_LOCAL}:${SIPCON_LOCAL_PORT}" desc "osmo-sip-connector Address" +#!endif + + +####### Modules Section ######## + +# set paths to location of modules (to sources or installation folders) +#!ifdef WITH_SRCPATH +mpath="modules" +#!else +mpath="/usr/lib/x86_64-linux-gnu/kamailio/modules/" +#!endif + +# loadmodule "mi_fifo.so" +loadmodule "kex.so" +loadmodule "corex.so" +loadmodule "tm.so" +loadmodule "tmx.so" +loadmodule "sl.so" +loadmodule "rr.so" +loadmodule "pv.so" +loadmodule "maxfwd.so" +loadmodule "usrloc.so" +loadmodule "registrar.so" +loadmodule "textops.so" +loadmodule "siputils.so" +loadmodule "xlog.so" +loadmodule "sanity.so" +# loadmodule "ctl.so" +loadmodule "cfg_rpc.so" +loadmodule "mi_rpc.so" +loadmodule "acc.so" + +#!ifdef WITH_NAT +loadmodule "nathelper.so" +loadmodule "rtpproxy.so" +#!endif + +#!ifdef WITH_DEBUG +loadmodule "debugger.so" +#!endif + +# ----------------- setting module-specific parameters --------------- + +# ----- mi_fifo params ----- +#modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo") + +# ----- ctl params ----- +#modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") + +# ----- tm params ----- +# auto-discard branches from previous serial forking leg +modparam("tm", "failure_reply_mode", 3) +# default retransmission timeout: 30sec +modparam("tm", "fr_timer", 30000) +# default invite retransmission timeout after 1xx: 120sec +modparam("tm", "fr_inv_timer", 120000) + +# ----- rr params ----- +# add value to ;lr param to cope with most of the UAs +modparam("rr", "enable_full_lr", 1) +# do not append from tag to the RR (no need for this script) +modparam("rr", "append_fromtag", 0) + +# ----- registrar params ----- +modparam("registrar", "method_filtering", 1) +/* uncomment the next line to disable parallel forking via location */ +# modparam("registrar", "append_branches", 0) +/* uncomment the next line not to allow more than 10 contacts per AOR */ +#modparam("registrar", "max_contacts", 10) +# max value for expires of registrations +modparam("registrar", "max_expires", 3600) +# set it to 1 to enable GRUU +modparam("registrar", "gruu_enabled", 0) + +# ----- acc params ----- +/* what special events should be accounted ? */ +modparam("acc", "early_media", 0) +modparam("acc", "report_ack", 0) +modparam("acc", "report_cancels", 0) +/* by default ww do not adjust the direct of the sequential requests. + if you enable this parameter, be sure the enable "append_fromtag" + in "rr" module */ +modparam("acc", "detect_direction", 0) +/* account triggers (flags) */ +modparam("acc", "log_flag", FLT_ACC) +modparam("acc", "log_missed_flag", FLT_ACCMISSED) +modparam("acc", "log_extra", + "src_user=$fU;src_domain=$fd;src_ip=$si;" + "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd") +modparam("acc", "failed_transaction_flag", FLT_ACCFAILED) + + +#!ifdef WITH_NAT +# ----- rtpproxy params ----- +modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") + +# ----- nathelper params ----- +modparam("nathelper", "natping_interval", 30) +modparam("nathelper", "ping_nated_only", 1) +modparam("nathelper", "sipping_bflag", FLB_NATSIPPING) +modparam("nathelper", "sipping_from", "sip:pinger at kamailio.org") + +# params needed for NAT traversal in other modules +modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)") +modparam("usrloc", "nat_bflag", FLB_NATB) +#!endif + + +#!ifdef WITH_DEBUG +# ----- debugger params ----- +modparam("debugger", "cfgtrace", 0) +#!endif + +####### Routing Logic ######## + + +# Main SIP request routing logic +# - processing of any incoming SIP request starts with this route +# - note: this is the same as route { ... } +request_route { + + xlog("GOT SIP $rm from $fu: $ru\n"); + # per request initial checks + route(REQINIT); + + # CANCEL processing + if (is_method("CANCEL")) { + if (t_check_trans()) { + route(RELAY); + } + exit; + } + # handle requests within SIP dialogs + route(WITHINDLG); + + ### only initial requests (no To tag) + + # handle retransmissions + if(t_precheck_trans()) { + t_check_trans(); + exit; + } + t_check_trans(); + + if ("600" == $rU) { + route(ECHO); + } + + if ("500" == $rU) { + route(TEST); + } + + route(PSTN); +} + + +route[RELAY] { + # enable additional event routes for forwarded requests + # - serial forking, RTP relaying handling, a.s.o. + if (is_method("INVITE|BYE|SUBSCRIBE|UPDATE")) { + if(!t_is_set("branch_route")) t_on_branch("MANAGE_BRANCH"); + } + if (is_method("INVITE|SUBSCRIBE|UPDATE")) { + if(!t_is_set("onreply_route")) t_on_reply("MANAGE_REPLY"); + } + if (is_method("INVITE")) { + if(!t_is_set("failure_route")) t_on_failure("MANAGE_FAILURE"); + } + + if (!t_relay()) { + sl_reply_error(); + } + exit; +} + +# Per SIP request initial checks +route[REQINIT] { +#!ifdef WITH_ANTIFLOOD + # flood dection from same IP and traffic ban for a while + # be sure you exclude checking trusted peers, such as pstn gateways + # - local host excluded (e.g., loop to self) + if(src_ip!=myself) { + if($sht(ipban=>$si)!=$null) { + # ip is already blocked + xdbg("request from blocked IP - $rm from $fu (IP:$si:$sp)\n"); + exit; + } + if (!pike_check_req()) { + xlog("L_ALERT","ALERT: pike blocking $rm from $fu (IP:$si:$sp)\n"); + $sht(ipban=>$si) = 1; + exit; + } + } +#!endif + + if (!mf_process_maxfwd_header("2")) { + sl_send_reply("483","Too Many Hops"); + exit; + } + + if(is_method("OPTIONS") && uri==myself && $rU==$null) { + sl_send_reply("200","Keepalive"); + exit; + } + + if(!sanity_check("1511", "7")) { + xlog("Malformed SIP message from $si:$sp\n"); + exit; + } +} + +# Handle requests within SIP dialogs +route[WITHINDLG] { + if (!has_totag()) return; + + # sequential request withing a dialog should + # take the path determined by record-routing + if (loose_route()) { + if (is_method("BYE")) { + setflag(FLT_ACC); # do accounting ... + setflag(FLT_ACCFAILED); # ... even if the transaction fails + } + else if ( is_method("ACK") ) { + # ACK is forwarded statelessy + route(NATMANAGE); + } + else if ( is_method("NOTIFY") ) { + # Add Record-Route for in-dialog NOTIFY as per RFC 6665. + record_route(); + } + route(RELAY); + exit; + } + if ( is_method("ACK") ) { + if ( t_check_trans() ) { + # no loose-route, but stateful ACK; + # must be an ACK after a 487 + # or e.g. 404 from upstream server + route(RELAY); + exit; + } else { + # ACK without matching transaction ... ignore and discard + exit; + } + } + sl_send_reply("404", "Not here"); + exit; +} + +# RTPProxy control +route[NATMANAGE] { +#!ifdef WITH_NAT + if (is_request()) { + if(has_totag()) { + if(check_route_param("nat=yes")) { + setbflag(FLB_NATB); + } + } + } + if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) + return; + + rtpproxy_manage("co"); + + if (is_request()) { + if (!has_totag()) { + if(t_is_branch_route()) { + add_rr_param(";nat=yes"); + } + } + } + if (is_reply()) { + if(isbflagset(FLB_NATB)) { + set_contact_alias(); + } + } +#!endif + return; +} + +# PSTN GW routing +route[PSTN] { +#!ifdef WITH_PSTN + # check if PSTN GW IP is defined + if (strempty($sel(cfg_get.pstn.gw_ip))) { + xlog("SCRIPT: PSTN rotuing enabled but pstn.gw_ip not defined\n"); + return; + } + + # route to PSTN dialed numbers starting with '+' or '00' + # (international format) + # - update the condition to match your dialing rules for PSTN routing + #if(!($rU=~"^(\+|00)[1-9][0-9]{3,20}$")) + # return; + + # only local users allowed to call + #if(from_uri!=myself) { + # sl_send_reply("403", "Not Allowed"); + # exit; + #} + + $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip); + + route(RELAY); + exit; +#!endif + + return; +} + +route[ECHO] { + $ru = "sip:echo at iptel.org"; + route(RELAY); + exit; +} + +route[TEST] { + $ru = "sip:music at iptel.org"; + route(RELAY); + exit; +} + +# Manage outgoing branches +branch_route[MANAGE_BRANCH] { + xdbg("new branch [$T_branch_idx] to $ru\n"); + route(NATMANAGE); +} + +# Manage incoming replies +onreply_route[MANAGE_REPLY] { + xdbg("incoming reply\n"); + if(status=~"[12][0-9][0-9]") + route(NATMANAGE); +} + +# Manage failure routing cases +failure_route[MANAGE_FAILURE] { + route(NATMANAGE); + + if (t_is_canceled()) { + exit; + } +} diff --git a/net/tmpl_std/osmo-sip-connector.cfg b/net/tmpl_std/osmo-sip-connector.cfg new file mode 100644 index 0000000..953eccd --- /dev/null +++ b/net/tmpl_std/osmo-sip-connector.cfg @@ -0,0 +1,6 @@ +app +mncc + socket-path ${MSC_MNCC_SOCKET} +sip + local ${SIPCON_LOCAL} ${SIPCON_LOCAL_PORT} + remote ${SIPCON_REMOTE} ${SIPCON_REMOTE_PORT} diff --git a/net/tmpl_std/run.sh b/net/tmpl_std/run.sh index cca7a75..829c236 100755 --- a/net/tmpl_std/run.sh +++ b/net/tmpl_std/run.sh @@ -58,9 +58,6 @@ find_term -sudo tcpdump -i $dev -n -w current_log/$dev.single.pcap -U not port 22 & -sudo tcpdump -i lo -n -w current_log/lo.single.pcap -U not port 22 & - hnbgw="osmo-hnbgw" msc="gdb -ex run --args $(which osmo-msc)" gbproxy="osmo-gbproxy" @@ -74,6 +71,23 @@ stp="osmo-stp" bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc -c osmo-bsc.cfg" +if [ "${SIPCON_ENABLE}" == "true" ]; then + sipcon="osmo-sip-connector -c osmo-sip-connector.cfg" + msc="$msc -M ${MSC_MNCC_SOCKET}" + + # Require kamailio (PATH hack is needed for Debian) + kamailio="$(PATH="$PATH:/usr/sbin:/sbin" which kamailio)" + if [ -z "$kamailio" ]; then + echo "ERROR: kamailio is not installed, but it's required for SIPCON_ENABLE." + echo "After installing it, make sure that it does *not* run as daemon." + exit 1 + fi + kamailio="$kamailio -f kamailio.cfg -D -e -E" +fi + +sudo tcpdump -i $dev -n -w current_log/$dev.single.pcap -U not port 22 & +sudo tcpdump -i lo -n -w current_log/lo.single.pcap -U not port 22 & + term "$ggsn" GGSN & sleep .2 term "$stp" STP & @@ -94,6 +108,13 @@ sleep .2 term "$bsc" BSC & +if [ "${SIPCON_ENABLE}" == "true" ]; then + sleep .2 + term "$sipcon" SIPCON & + sleep .2 + term "$kamailio" KAMAILIO & +fi + #ssh bts rm /tmp/bts.log /tmp/pcu.log #ssh bts neels/run_remote.sh & @@ -101,6 +122,12 @@ read enter_to_close echo Closing... +if [ "${SIPCON_ENABLE}" == "true" ]; then + kill %13 %14 + killall osmo-sip-connector + killall kamailio +fi + #ssh bts neels/stop_remote.sh kill %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 -- To view, visit https://gerrit.osmocom.org/11144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2 Gerrit-Change-Number: 11144 Gerrit-PatchSet: 9 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 13:14:47 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 31 Oct 2018 13:14:47 +0000 Subject: Change in osmo-dev[master]: gen_makefile.py: detect changes in cpp files In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11434 ) Change subject: gen_makefile.py: detect changes in cpp files ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/11434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9382d984fa1988eefbb6be3e45d88b2f1f5b598a Gerrit-Change-Number: 11434 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 31 Oct 2018 13:14:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 13:19:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 31 Oct 2018 13:19:41 +0000 Subject: Change in osmo-dev[master]: 2G.deps, 3G+2G.deps: add osmo-trx In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11389 ) Change subject: 2G.deps, 3G+2G.deps: add osmo-trx ...................................................................... Patch Set 3: Code-Review+2 that was fast -- To view, visit https://gerrit.osmocom.org/11389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia4ebf2732694cee0600b602b82c660cf6278958d Gerrit-Change-Number: 11389 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 31 Oct 2018 13:19:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 13:23:07 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 31 Oct 2018 13:23:07 +0000 Subject: Change in osmo-dev[master]: 2G.deps, 3G+2G.deps: add osmo-trx In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11389 ) Change subject: 2G.deps, 3G+2G.deps: add osmo-trx ...................................................................... Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/11389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia4ebf2732694cee0600b602b82c660cf6278958d Gerrit-Change-Number: 11389 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 31 Oct 2018 13:23:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 13:23:12 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 31 Oct 2018 13:23:12 +0000 Subject: Change in osmo-dev[master]: 2G.deps, 3G+2G.deps: add osmo-trx In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11389 ) Change subject: 2G.deps, 3G+2G.deps: add osmo-trx ...................................................................... 2G.deps, 3G+2G.deps: add osmo-trx Change-Id: Ia4ebf2732694cee0600b602b82c660cf6278958d --- M 2G.deps M 3G+2G.deps 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved osmith: Verified diff --git a/2G.deps b/2G.deps index d6a58ad..213cb3d 100644 --- a/2G.deps +++ b/2G.deps @@ -10,3 +10,4 @@ osmo-msc libosmo-sccp osmo-mgw libsmpp34 osmo-bsc libosmo-sccp osmo-mgw osmo-sgsn libosmo-sccp osmo-ggsn +osmo-trx libosmocore diff --git a/3G+2G.deps b/3G+2G.deps index 5a17146..0eea175 100644 --- a/3G+2G.deps +++ b/3G+2G.deps @@ -13,3 +13,4 @@ osmo-bsc libosmo-sccp osmo-mgw osmo-sgsn osmo-iuh osmo-ggsn osmo-sip-connector libosmocore +osmo-trx libosmocore -- To view, visit https://gerrit.osmocom.org/11389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia4ebf2732694cee0600b602b82c660cf6278958d Gerrit-Change-Number: 11389 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 13:23:17 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 31 Oct 2018 13:23:17 +0000 Subject: Change in osmo-dev[master]: gen_makefile.py: detect changes in cpp files In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11434 ) Change subject: gen_makefile.py: detect changes in cpp files ...................................................................... gen_makefile.py: detect changes in cpp files Properly rebuild when cpp files (e.g. from osmo-trx) have been changed. Change-Id: I9382d984fa1988eefbb6be3e45d88b2f1f5b598a --- M gen_makefile.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: osmith: Verified Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved diff --git a/gen_makefile.py b/gen_makefile.py index c2b6128..1ae29f5 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -168,7 +168,7 @@ ### {proj} ### {proj}_configure_files := $(shell find {src_proj} -name "Makefile.am" -or -name "*.in" ) -{proj}_files := $(shell find {src_proj} -name "*.[hc]" -or -name "*.py" ) +{proj}_files := $(shell find {src_proj} -name "*.[hc]" -or -name "*.py" -or -name "*.cpp" ) .make.{proj}.clone: @echo "\n\n\n===== $@\n" -- To view, visit https://gerrit.osmocom.org/11434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9382d984fa1988eefbb6be3e45d88b2f1f5b598a Gerrit-Change-Number: 11434 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 13:27:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 13:27:16 +0000 Subject: Change in osmo-dev[master]: deps: osmo-sgsn depends on osmo-hlr's liboso-gsup-client In-Reply-To: References: Message-ID: Pau Espin Pedrol has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11537 ) Change subject: deps: osmo-sgsn depends on osmo-hlr's liboso-gsup-client ...................................................................... deps: osmo-sgsn depends on osmo-hlr's liboso-gsup-client Change-Id: Ie47ca98740ca438e04d6ea76421e0f58d9e5715a --- M 2G.deps M 3G+2G.deps 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/37/11537/2 -- To view, visit https://gerrit.osmocom.org/11537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie47ca98740ca438e04d6ea76421e0f58d9e5715a Gerrit-Change-Number: 11537 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 13:27:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 13:27:56 +0000 Subject: Change in osmo-pcap[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11545 to look at the new patch set (#2). Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: Id938f3dab4826ac748abb5e0b169d800c2a625a5 --- M Makefile.am M configure.ac M contrib/Makefile.am A contrib/systemd/Makefile.am A contrib/systemd/osmo-pcap-client.service A contrib/systemd/osmo-pcap-server.service M debian/osmo-pcap-client.install M debian/osmo-pcap-server.install M debian/rules 9 files changed, 63 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/45/11545/2 -- To view, visit https://gerrit.osmocom.org/11545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id938f3dab4826ac748abb5e0b169d800c2a625a5 Gerrit-Change-Number: 11545 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 13:27:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 13:27:57 +0000 Subject: Change in osmo-pcap[master]: contrib/jenkins.sh: Update to current osmocom infra Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11549 Change subject: contrib/jenkins.sh: Update to current osmocom infra ...................................................................... contrib/jenkins.sh: Update to current osmocom infra Otherwise builds end failing in osmocom jenkins/gerrit. Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14 --- M contrib/jenkins.sh 1 file changed, 37 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/49/11549/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index e099ceb..d708369 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,19 +1,44 @@ #!/usr/bin/env bash +# jenkins build helper script for osmo-pcap. This is how we build on jenkins.osmocom.org + +if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then + echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" + exit 2 +fi set -ex -rm -rf deps/install -mkdir deps || true -cd deps -osmo-deps.sh libosmocore -cd libosmocore -autoreconf --install --force -./configure --prefix=$PWD/../install -$MAKE $PARALLEL_MAKE install +base="$PWD" +deps="$base/deps" +inst="$deps/install" +export deps inst -cd ../../ +osmo-clean-workspace.sh + +mkdir "$deps" || true + +verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") + +export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" +export LD_LIBRARY_PATH="$inst/lib" +osmo-build-dep.sh libosmocore "" '--disable-doxygen --enable-gnutls' + +set +x +echo +echo +echo +echo " =============================== osmo-pcap ===============================" +echo +set -x + + +cd "$base" autoreconf --install --force -PCAP_LIBS="-lpcap" PCAP_CFLAGS="" PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig ./configure --with-pcap-config=/bin/true --enable-sanitize --enable-werror -PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig $MAKE $PARALLEL_MAKE -DISTCHECK_CONFIGURE_FLAGS="--with-pcap-config=/bin/true" PCAP_LIBS="-lpcap" PCAP_CFLAGS="" PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig LD_LIBRARY_PATH=$PWD/deps/install/lib $MAKE distcheck +PCAP_LIBS="-lpcap" PCAP_CFLAGS="" ./configure --with-pcap-config=/bin/true --enable-sanitize --enable-werror +$MAKE $PARALLEL_MAKE +DISTCHECK_CONFIGURE_FLAGS="--with-pcap-config=/bin/true" \ + PCAP_LIBS="-lpcap" PCAP_CFLAGS="" \ + $MAKE distcheck || cat-testlogs.sh + +osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/11549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14 Gerrit-Change-Number: 11549 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 14:32:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 14:32:25 +0000 Subject: Change in osmo-dev[master]: deps: osmo-sgsn depends on osmo-hlr's liboso-gsup-client In-Reply-To: References: Message-ID: Pau Espin Pedrol has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/11537 ) Change subject: deps: osmo-sgsn depends on osmo-hlr's liboso-gsup-client ...................................................................... deps: osmo-sgsn depends on osmo-hlr's liboso-gsup-client Change-Id: Ie47ca98740ca438e04d6ea76421e0f58d9e5715a --- M 2G.deps M 3G+2G.deps 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/37/11537/3 -- To view, visit https://gerrit.osmocom.org/11537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie47ca98740ca438e04d6ea76421e0f58d9e5715a Gerrit-Change-Number: 11537 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Oct 31 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 31 Oct 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#293?= Message-ID: <2108103370.356.1540998607302.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... 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 dependency style of gcc... gcc3 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 ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all 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 dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Oct 31 17:44:27 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 31 Oct 2018 17:44:27 +0000 Subject: Change in osmo-pcap[master]: debian: Clean up to look like other osmocom projects In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11544 ) Change subject: debian: Clean up to look like other osmocom projects ...................................................................... Patch Set 2: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/11544/2/debian/copyright File debian/copyright: https://gerrit.osmocom.org/#/c/11544/2/debian/copyright at 2 PS2, Line 2: Upstream-Name: OsmoHLR c&p issue https://gerrit.osmocom.org/#/c/11544/2/debian/copyright at 3 PS2, Line 3: Source: http://cgit.osmocom.org/osmo-hlr/ Here as well https://gerrit.osmocom.org/#/c/11544/2/debian/copyright at 6 PS2, Line 6: Copyright: 2018 Sysmocom s. f. m. c. GmbH The sources all only list Holger and On-Waves as copyright holders... -- To view, visit https://gerrit.osmocom.org/11544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id71699642b799f5b2f8f3b794b9493ddaeb70cc0 Gerrit-Change-Number: 11544 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 31 Oct 2018 17:44:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 17:44:38 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 31 Oct 2018 17:44:38 +0000 Subject: Change in osmo-pcap[master]: debian: Install osmo_pcap_clean_old in osmo-pcap-server pkg In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11548 ) Change subject: debian: Install osmo_pcap_clean_old in osmo-pcap-server pkg ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11548 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia4b031fdf54cde3d00818df82e89733420a735ba Gerrit-Change-Number: 11548 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 31 Oct 2018 17:44:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 18:02:14 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 31 Oct 2018 18:02:14 +0000 Subject: Change in osmo-pcap[master]: Install cfg files with autotools In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11546 ) Change subject: Install cfg files with autotools ...................................................................... Patch Set 2: Code-Review-1 (1 comment) Apart from the commit message it looks good https://gerrit.osmocom.org/#/c/11546/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11546/2//COMMIT_MSG at 11 PS2, Line 11: $prefix/share/doc/osmo-trx/examples/$subdir/, and 1 script per binary is s/osmo-trx/osmo-pcap/ -- To view, visit https://gerrit.osmocom.org/11546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If3f3a7d3867c0d4d2b1fe01f465532d1ce4bda66 Gerrit-Change-Number: 11546 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 31 Oct 2018 18:02:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 18:03:16 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 31 Oct 2018 18:03:16 +0000 Subject: Change in osmo-pcap[master]: gitignore: Add compile In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11547 ) Change subject: gitignore: Add compile ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie801d6929068d11fafd24a1370e60e984b0137c2 Gerrit-Change-Number: 11547 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 31 Oct 2018 18:03:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 18:16:28 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 31 Oct 2018 18:16:28 +0000 Subject: Change in osmo-pcap[master]: contrib/jenkins.sh: Update to current osmocom infra In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11549 ) Change subject: contrib/jenkins.sh: Update to current osmocom infra ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Looks okay comparing it to an existing jenkins.sh in osmo-bsc https://gerrit.osmocom.org/#/c/11549/1/contrib/jenkins.sh File contrib/jenkins.sh: https://gerrit.osmocom.org/#/c/11549/1/contrib/jenkins.sh at 42 PS1, Line 42: $MAKE distcheck || cat-testlogs.sh cat-testlogs.sh wouldn't actually do anything useful since we don't have tests (yet?), but it shouldn't do any harm, either. If you want to leave it in for future tests why not leave the make check call in as well since there is already an empty testsuite? -- To view, visit https://gerrit.osmocom.org/11549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14 Gerrit-Change-Number: 11549 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 31 Oct 2018 18:16:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 18:21:48 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 31 Oct 2018 18:21:48 +0000 Subject: Change in osmo-msc[master]: Fix VLR test macro In-Reply-To: References: Message-ID: Max has abandoned this change. ( https://gerrit.osmocom.org/6296 ) Change subject: Fix VLR test macro ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/6296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I36ae1f9bb395921dc2c5a39e35fbb8040ba47213 Gerrit-Change-Number: 6296 Gerrit-PatchSet: 7 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: neels Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 18:22:21 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 31 Oct 2018 18:22:21 +0000 Subject: Change in osmo-pcap[master]: test In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11543 ) Change subject: test ...................................................................... Patch Set 1: Code-Review-1 Abandon? -- To view, visit https://gerrit.osmocom.org/11543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaab1f6d2d563df7ec3a1f56add2e883b4f697da6 Gerrit-Change-Number: 11543 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 31 Oct 2018 18:22:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 18:23:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 18:23:01 +0000 Subject: Change in osmo-pcap[master]: contrib/jenkins.sh: Update to current osmocom infra In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11549 ) Change subject: contrib/jenkins.sh: Update to current osmocom infra ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11549/1/contrib/jenkins.sh File contrib/jenkins.sh: https://gerrit.osmocom.org/#/c/11549/1/contrib/jenkins.sh at 42 PS1, Line 42: $MAKE distcheck || cat-testlogs.sh > cat-testlogs. [?] Because at least locally make check failed due to some at{foobar} makefile target not working, so I didn't invest time on fixing it since we don't have tests anyway. -- To view, visit https://gerrit.osmocom.org/11549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14 Gerrit-Change-Number: 11549 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 31 Oct 2018 18:23:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 18:23:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 18:23:19 +0000 Subject: Change in osmo-pcap[master]: test In-Reply-To: References: Message-ID: Pau Espin Pedrol has abandoned this change. ( https://gerrit.osmocom.org/11543 ) Change subject: test ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Iaab1f6d2d563df7ec3a1f56add2e883b4f697da6 Gerrit-Change-Number: 11543 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 18:31:45 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 31 Oct 2018 18:31:45 +0000 Subject: Change in osmo-pcap[master]: contrib/jenkins.sh: Update to current osmocom infra In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11549 ) Change subject: contrib/jenkins.sh: Update to current osmocom infra ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11549/1/contrib/jenkins.sh File contrib/jenkins.sh: https://gerrit.osmocom.org/#/c/11549/1/contrib/jenkins.sh at 42 PS1, Line 42: $MAKE distcheck || cat-testlogs.sh > Because at least locally make check failed due to some at{foobar} makefile target not working, so I [?] Interesting, it worked when I tried it. distcheck will also run make check so maybe make sure that that works for you as well. It does here. -- To view, visit https://gerrit.osmocom.org/11549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14 Gerrit-Change-Number: 11549 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 31 Oct 2018 18:31:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 18:39:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 18:39:00 +0000 Subject: Change in osmo-pcap[master]: contrib/jenkins.sh: Update to current osmocom infra In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11549 ) Change subject: contrib/jenkins.sh: Update to current osmocom infra ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11549/1/contrib/jenkins.sh File contrib/jenkins.sh: https://gerrit.osmocom.org/#/c/11549/1/contrib/jenkins.sh at 42 PS1, Line 42: $MAKE distcheck || cat-testlogs.sh > Interesting, it worked when I tried it. [?] Making check in tests make[2]: Entering directory '/home/pespin/dev/sysmocom/build/new/tmpdir/osmo-pcap/tests' make check-local make[3]: Entering directory '/home/pespin/dev/sysmocom/build/new/tmpdir/osmo-pcap/tests' make[3]: *** No rule to make target 'atconfig', needed by 'check-local'. Stop. make[3]: Leaving directory '/home/pespin/dev/sysmocom/build/new/tmpdir/osmo-pcap/tests' make[2]: *** [Makefile:316: check-am] Error 2 -- To view, visit https://gerrit.osmocom.org/11549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14 Gerrit-Change-Number: 11549 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 31 Oct 2018 18:39:00 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 19:13:59 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 31 Oct 2018 19:13:59 +0000 Subject: Change in osmo-bsc[master]: RSL: restructure MDCX functions In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11550 ) Change subject: RSL: restructure MDCX functions ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iffe2f4f10e841fc36965cce02b4e5f017a5ae6c8 Gerrit-Change-Number: 11550 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 31 Oct 2018 19:13:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 19:14:05 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 31 Oct 2018 19:14:05 +0000 Subject: Change in osmo-bsc[master]: LCLS: prepare for adding new mode In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11551 ) Change subject: LCLS: prepare for adding new mode ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32ba232ad802625d97a0ad9d0511edc6ac7f251c Gerrit-Change-Number: 11551 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 31 Oct 2018 19:14:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 19:15:14 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 31 Oct 2018 19:15:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cosmetic: fix typos In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11553 ) Change subject: cosmetic: fix typos ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11553 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6e75af46e134d33f752214988054105aba91366c Gerrit-Change-Number: 11553 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 31 Oct 2018 19:15:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 19:15:18 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 31 Oct 2018 19:15:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC: remove explicit address In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11554 ) Change subject: BSC: remove explicit address ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ideb8a78348af435f9992c42bce0bb197d1e73e04 Gerrit-Change-Number: 11554 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 31 Oct 2018 19:15:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 19:15:23 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 31 Oct 2018 19:15:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC LCLS: restructure tests In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11555 ) Change subject: BSC LCLS: restructure tests ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idf9fc8e639b0ece662ab26c481899ef39fb7edfe Gerrit-Change-Number: 11555 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 31 Oct 2018 19:15:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 19:15:28 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 31 Oct 2018 19:15:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC LCLS: explicitly check for RSL_IE_CHAN_NR In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11556 ) Change subject: BSC LCLS: explicitly check for RSL_IE_CHAN_NR ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icc6824d7acef809d76c70b5ff060a8261a82e2be Gerrit-Change-Number: 11556 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 31 Oct 2018 19:15:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 19:15:33 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 31 Oct 2018 19:15:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cosmetic: fix compilation warnings In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11557 ) Change subject: cosmetic: fix compilation warnings ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6210ecf5fcb39f751116ad63a69d2ae8651a60c5 Gerrit-Change-Number: 11557 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 31 Oct 2018 19:15:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 19:23:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 19:23:20 +0000 Subject: Change in osmo-bsc[master]: RSL: restructure MDCX functions In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11550 ) Change subject: RSL: restructure MDCX functions ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11550/2/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/#/c/11550/2/src/osmo-bsc/abis_rsl.c at 1865 PS2, Line 1865: struct msgb *rsl_make_ipacc_mdcx(uint8_t chan_nr, uint16_t conn_id, uint32_t connect_ip, uint16_t connect_port, Why not simply passing lchan and keeping all code? Lots of parameters for no apparent reason? -- To view, visit https://gerrit.osmocom.org/11550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iffe2f4f10e841fc36965cce02b4e5f017a5ae6c8 Gerrit-Change-Number: 11550 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 31 Oct 2018 19:23:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 19:33:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 19:33:13 +0000 Subject: Change in osmo-bsc[master]: LCLS: prepare for adding new mode In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11551 ) Change subject: LCLS: prepare for adding new mode ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11551/2/src/osmo-bsc/osmo_bsc_lcls.c File src/osmo-bsc/osmo_bsc_lcls.c: https://gerrit.osmocom.org/#/c/11551/2/src/osmo-bsc/osmo_bsc_lcls.c at 232 PS2, Line 232: static inline void lcls_mdcx(const struct gsm_subscriber_connection *conn, struct mgcp_conn_peer *mdcx_info) Can you break adding this function and its users to a separate previous patch? you are doing several things at the same time in nearby code and it's difficult to track all changes here. -- To view, visit https://gerrit.osmocom.org/11551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32ba232ad802625d97a0ad9d0511edc6ac7f251c Gerrit-Change-Number: 11551 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 31 Oct 2018 19:33:13 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 20:40:16 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 31 Oct 2018 20:40:16 +0000 Subject: Change in osmo-dev[master]: replace src/* git scripts with a single src/gits Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11560 Change subject: replace src/* git scripts with a single src/gits ...................................................................... replace src/* git scripts with a single src/gits I keep re-using this functionality in completely unrelated realms, and decided to unify the oddly named scripts in a single 'gits' meta-repos tool, so I can just symlink this script into my ~/bin and use it everywhere. Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 --- M src/README D src/e D src/g D src/git_branch_summary.py A src/gits D src/s D src/st 7 files changed, 353 insertions(+), 298 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/60/11560/1 diff --git a/src/README b/src/README index a2fbe81..f066561 100644 --- a/src/README +++ b/src/README @@ -11,12 +11,11 @@ Pass a patch number seen on gerrit to fetch the latest patch set into your git clone. See top comment in the script. - ./g run a git command in each source tree - ./e run an arbitrary shell command in each source tree - ./st show a brief branch and local mods status for each source tree - ./s walk through each source tree and use gitk as well as user interaction - to quickly fast-forward / reset changes coming in from upstream. (This - is potentially dangerous, but safe if you only hit enter every time.) + gits Conveniently manage several git clones: + - run a git or shell command in each source tree + - show a brief branch and local mods status for each source tree + - merge / rebase / fast-forward each source tree interactively + See ./gits help Examples: @@ -54,7 +53,7 @@ ----------------------------------------------------------------------------- -./g fetch # run 'git fetch' in each clone = fetch all from upstream +./gits fetch # run 'git fetch' in each clone = fetch all from upstream ===== libasn1c ===== remote: Counting objects: 29, done @@ -90,7 +89,7 @@ ----------------------------------------------------------------------------- -./st # any modifications / updates? (e.g. useful after './g fetch') +./gits st # any modifications / updates? (e.g. useful after './g fetch') # (checks only 'master' and the current checked-out branch) libasn1c master @@ -116,13 +115,13 @@ ----------------------------------------------------------------------------- -./e rm .version # in each source tree, remove the local .version file +./gits sh rm .version # in each source tree, remove the local .version file ----------------------------------------------------------------------------- -./s # interactively try to fast-forward to upstream and/or save - # local modifications. - # If you just hit Enter all the time, nothing will be changed. +./gits rebase # interactively try to fast-forward to upstream and/or save + # local modifications. + # If you just hit Enter all the time, nothing dangerous will happen. libosmocore diff --git a/src/e b/src/e deleted file mode 100755 index 4d32bf1..0000000 --- a/src/e +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env python3 -import os -import os.path -import sys -import subprocess - -base_dir = os.getcwd() - -for p in list(os.listdir('.')): - subdir = os.path.join(base_dir, p) - if not os.path.isdir(os.path.join(subdir, '.git')): - continue - print("\n===== %s =====" % p) - os.chdir(subdir) - subprocess.call(sys.argv[1:]) diff --git a/src/g b/src/g deleted file mode 100755 index bb9b693..0000000 --- a/src/g +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env python3 - -import sys -import os -import subprocess - -git_subdirs = [] - -for subdir in os.listdir(): - if not os.path.isdir(os.path.join(subdir, '.git')): - continue - - print('\n===== %s =====' % subdir) - sys.stdout.flush() - subprocess.call(['git', '-C', subdir] + sys.argv[1:]) - sys.stdout.flush() - sys.stderr.flush() diff --git a/src/git_branch_summary.py b/src/git_branch_summary.py deleted file mode 100755 index 9d81f8b..0000000 --- a/src/git_branch_summary.py +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/env python - -import sys, subprocess, re - -if len(sys.argv) < 2: - print("Usage: %s [...]\nThis is mostly here for helping the 'st' script." % sys.argv[0]) - exit(1) - -interesting_branch_names = [ 'master', 'sysmocom/iu', 'sysmocom/sccp', 'aper-prefix-onto-upstream' ] - -re_branch_name = re.compile('^..([^ ]+) .*') -re_ahead = re.compile('ahead [0-9]+|behind [0-9]+') - -def branch_name(line): - m = re_branch_name.match(line) - return m.group(1) - -interesting = [] - -def do_one_git(git_dir): - global interesting - branch_strs = subprocess.check_output(('git', '-C', git_dir, 'branch', '-vv')).decode('utf-8').splitlines() - interesting_branches = [] - - for line in branch_strs: - name = branch_name(line) - current_branch = False - if line.startswith('*'): - current_branch = True - elif name not in interesting_branch_names: - continue - ahead = re_ahead.findall(line) - if not ahead and not current_branch: - continue - ahead = [x.replace('ahead ', '+').replace('behind ', '-') for x in ahead] - br = (current_branch, name, ahead) - if current_branch: - interesting_branches.insert(0, br) - else: - interesting_branches.append(br) - - status = subprocess.check_output(('git', '-C', git_dir, 'status')).decode() - has_mods = 'modified:' in status - - interesting.append((git_dir, has_mods, interesting_branches)) - - -for git_dir in sys.argv[1:]: - do_one_git(git_dir) - - -first_col = max([len(git_dir) for git_dir, _, _ in interesting]) -first_col_fmt = '%' + str(first_col) + 's' - -for git_dir, has_mods, interesting_branches in interesting: - strs = [first_col_fmt % git_dir,] - if has_mods: - strs.append('MODS') - for current_branch, name, ahead in interesting_branches: - br = [] - br.append(name) - if ahead: - br.append('[%s]' % '|'.join(ahead)) - strs.append(''.join(br)) - - print(' '.join(strs)) - -# vim: shiftwidth=2 expandtab tabstop=2 diff --git a/src/gits b/src/gits new file mode 100755 index 0000000..7d7f253 --- /dev/null +++ b/src/gits @@ -0,0 +1,342 @@ +#!/usr/bin/env python3 +import sys, subprocess, re, argparse, os + +doc = '''gits: conveniently manage several git subdirectories. +Instead of doing the 'cd foo; git status; cd ../bar; git status' dance, this +helps to save your time with: status, fetch, rebase, ... + +See 'gits help' +''' + +re_status_mods = re.compile('^\t(modified|deleted):.*') + +def error(*msgs): + sys.stderr.write(''.join(msgs)) + sys.stderr.write('\n') + exit(1) + +def usage(*msgs): + global doc + error(doc, '\n\n', *msgs) + +def git(git_dir, *args, may_fail=False, section_marker=False, show_cmd=True): + if section_marker: + print('\n===== %s =====' % git_dir) + sys.stdout.flush() + + cmd = ['git', '-C', git_dir] + list(args) + if show_cmd: + print(' '.join(cmd)) + + rc = subprocess.call(cmd) + if rc and not may_fail: + error('git returned error! command: git -C %r %s' % (git_dir, ' '.join(repr(arg) for arg in args))) + + if section_marker: + sys.stdout.flush() + sys.stderr.flush() + +def git_output(git_dir, *args): + return subprocess.check_output(['git', '-C', git_dir,] + list(args)).decode('utf-8') + +def git_branch(git_dir): + re_branch_name = re.compile('On branch ([^ ]*)') + status = git_output(git_dir, 'status') + m = re_branch_name.find(status) + if not m: + error('No current branch in %r' % git_dir) + return m.group(1) + +def git_status(git_dir): + status_lines = git_output(git_dir, 'status').splitlines() + + on_branch = None + branch_status_str = None + local_mods = False + + ON_BRANCH = 'On branch ' + STATUS = 'Your branch' + + for l in status_lines: + if l.startswith(ON_BRANCH): + if on_branch: + error('cannot parse status, more than one branch?') + on_branch = l[len(ON_BRANCH):] + elif l.startswith(STATUS): + if 'Your branch is up to date' in l: + branch_status_str = l + elif 'Your branch is ahead' in l: + branch_status_str = 'ahead: ' + l + elif 'Your branch is behind' in l: + branch_status_str = 'behind: ' + l + elif 'have diverged' in l: + branch_status_str = 'diverged: ' + l + else: + error('unknown status str: %r' % l) + else: + m = re_status_mods.match(l) + if m: + local_mods = True + + print('branch: %s\n%r%s' % (on_branch, branch_status_str, '\nLOCAL MODS' if local_mods else '')) + return (on_branch, branch_status_str, local_mods) + + +def git_branch_summary(git_dir): + '''return a list of strings: [branchname, info0, info1,...]''' + + interesting_branch_names = [ 'master' ] + + strs = [git_dir,] + + on_branch, branch_status_str, has_mods = git_status(git_dir) + + if has_mods: + strs.append('MODS') + + branch_strs = git_output(git_dir, 'branch', '-vv').splitlines() + re_branch_name = re.compile('^..([^ ]+) .*') + re_ahead = re.compile('ahead [0-9]+|behind [0-9]+') + + for line in branch_strs: + m = re_branch_name.match(line) + name = m.group(1) + + current_branch = False + if line.startswith('*'): + current_branch = True + elif name not in interesting_branch_names: + continue + ahead = re_ahead.findall(line) + if not ahead and not current_branch: + continue + ahead = [x.replace('ahead ', '+').replace('behind ', '-') for x in ahead] + + branch_info = [name] + if ahead: + branch_info.append('[%s]' % '|'.join(ahead)) + + strs.append(''.join(branch_info)) + + return strs + +def format_summaries(summaries, sep0=' ', sep1=' '): + first_col = max([len(row[0]) for row in summaries]) + first_col_fmt = '%' + str(first_col) + 's' + + lines = [] + for row in summaries: + lines.append('%s%s%s' % (first_col_fmt % row[0], sep0, sep1.join(row[1:]))) + + return '\n'.join(lines) + +def git_dirs(): + dirs = [] + for sub in os.listdir(): + git_path = os.path.join(sub, '.git') + if not os.path.isdir(git_path): + continue + dirs.append(sub) + + if not dirs: + error('No subdirectories found that are git clones') + + return dirs + +def cmd_help(): + global commands + global aliases + + if len(sys.argv) > 2: + error('no arguments allowed') + + lines = [] + + for name, cmd in commands.items(): + + names = [name,] + + for alias_name, alias_for in aliases.items(): + if alias_for == name: + names.append(alias_name) + + line = ['|'.join(names), ] + + func, doc = cmd + line.append(doc) + + lines.append(line) + + lines.append(('', "Run arbitrary git command in each clone, shortcut for 'do'")) + print(format_summaries(lines, ': ')) + +def cmd_status(): + if len(sys.argv) > 2: + error('no arguments allowed') + + infos = [git_branch_summary(git_dir) for git_dir in git_dirs()] + print(format_summaries(infos)) + +def cmd_do(argv=None): + if argv is None: + argv = sys.argv[2:] + for git_dir in git_dirs(): + git(git_dir, *argv, may_fail=True, section_marker=True) + +def cmd_sh(): + cmd = sys.argv[2:] + for git_dir in git_dirs(): + print('\n===== %s =====' % git_dir) + sys.stdout.flush() + subprocess.call(cmd, cwd=git_dir) + sys.stdout.flush() + sys.stderr.flush() + +class SkipThisRepos(Exception): + pass + +def ask(git_dir, *question, valid_answers=('*',)): + while True: + print('\n' + '\n '.join(question)) + print(' ' + '\n '.join(( + 's skip this repos', + 't show in tig', + 'g show in gitk', + ))) + + answer = sys.stdin.readline().strip() + if answer == 's': + raise SkipThisRepos() + if answer == 't': + subprocess.call(('tig', '--all'), cwd=git_dir) + continue + if answer == 'g': + subprocess.call(('gitk', '--all'), cwd=git_dir) + continue + + for v in valid_answers: + if v == answer: + return answer + if v == '*': + return answer + if v == '+' and len(answer) > 0: + return answer + +def rebase(git_dir): + orig_branch, branch_status_str, local_mods = git_status(git_dir) + + if local_mods: + do_commit = ask(git_dir, 'Local mods.', + 'c commit to this branch', + ' commit to new branch',) + + if do_commit == 'c': + git(git_dir, 'commit', '-am', 'wip', may_fail=True) + else: + git(git_dir, 'checkout', '-b', do_commit) + git(git_dir, 'commit', '-am', 'wip', may_fail=True) + git(git_dir, 'checkout', orig_branch) + + _, _, local_mods = git_status(git_dir) + + if local_mods: + print('There still are local modifications') + raise SkipThisRepos() + + + if branch_status_str is None: + print('there is no upstream branch for %r' % orig_branch) + + elif branch_status_str.startswith('behind'): + if 'and can be fast-forwarded' in branch_status_str: + print('fast-forwarding...') + git(git_dir, 'merge') + else: + do_merge = ask(git_dir, 'Behind. git merge?', + " don't merge", + 'ok git merge', + valid_answers=('', 'ok') + ) + + if do_merge == 'ok': + git(git_dir, 'merge') + + elif branch_status_str.startswith('ahead'): + do_commit = ask(git_dir, 'Ahead. commit to new branch?', + ' no', + ' create new branch', + ) + if do_commit: + git(git_dir, 'checkout', '-b', do_commit) + git(git_dir, 'commit', '-am', 'wip', may_fail=True) + git(git_dir, 'checkout', orig_branch) + + do_reset = ask(git_dir, '%s: git reset --hard origin/%s?' % (orig_branch, orig_branch), + ' no', + 'OK yes (write OK in caps!)', + valid_answers=('', 'OK')) + + if do_reset == 'OK': + git(git_dir, 'reset', '--hard', 'origin/%s' % orig_branch) + + elif branch_status_str.startswith('diverged'): + do_reset = ask(git_dir, 'Diverged.', + '%s: git reset --hard origin/%s?' % (orig_branch, orig_branch), + ' no', + 'OK yes (write OK in caps!)', + valid_answers=('', 'OK')) + + if do_reset == 'OK': + git(git_dir, 'reset', '--hard', 'origin/%s' % orig_branch) + + return orig_branch + + +def cmd_rebase(): + for git_dir in git_dirs(): + try: + print('\n\n===== %s =====' % git_dir) + sys.stdout.flush() + + branch = rebase(git_dir) + if branch != 'master': + git(git_dir, 'checkout', 'master') + rebase(git_dir) + git(git_dir, 'checkout', branch) + + except SkipThisRepos: + print('\nSkipping %r' % git_dir) + +commands = { + 'help': (cmd_help, 'List commands.'), + 'status': (cmd_status, 'Show a branch summary and indicate modifications.'), + 'rebase': (cmd_rebase, 'Interactively merge master and rebase current branch.'), + 'sh': (cmd_sh, 'Run arbitrary shell command in each clone'), + 'do': (cmd_do, 'Run arbitrary git command in each clone'), +} + +aliases = { + 'st': 'status', + 'r': 'rebase', +} + +if __name__ == '__main__': + + if len(sys.argv) < 2: + usage('Pass at least one argument to tell me what to do.') + + command_str = sys.argv[1] + alias_for = aliases.get(command_str) + if alias_for: + command_str = alias_for + command = commands.get(command_str) + + if command: + func, doc = command + func() + else: + # run arbitrary git command + cmd_do(sys.argv[1:]) + + +# vim: shiftwidth=2 expandtab tabstop=2 diff --git a/src/s b/src/s deleted file mode 100755 index f897bc1..0000000 --- a/src/s +++ /dev/null @@ -1,176 +0,0 @@ -#!/usr/bin/env bash -fastforwards="" - -Git() { - echo "git $@" - git $@ - if [ "$?" != "0" ]; then - echo "GIT RETURNED ERROR!" - exit 1 - fi -} - -Git_may_fail() { - git $@ -} - -Git_branch() { - echo "$(Git -C "$dir" status)" | grep 'On branch' | sed 's/On branch //' -} - - -gitk_start() { - if [ -n "$DISPLAY" ]; then - gitk --all & - gitk_started="1" - fi -} - -status() { - st="$(Git status)" - mods="$(echo "$st" | grep 'modified:')" - - stline="$(echo "$st" | grep '\(behind\|ahead\|up-to-date\|diverged\)')" - - echo "$br" - echo "$stline" -} - -dance() { - echo - echo - br="$(Git_branch)" - - echo "$dir" - cd "$dir" - - status - - if [ -z "$mods" -a -n "$(echo "$stline" | grep up-to-date)" ]; then - return 0 - fi - - gitk_start - - if [ -n "$mods" ]; then - echo "Local mods" - echo "$mods" - echo - echo "commit to new branch? (enter name, empty = no)" - read wipbranch - if [ -n "$wipbranch" ]; then - Git checkout -b "$wipbranch" - Git_may_fail commit -am wip - #Git push --set-upstream origin "$wipbranch" - Git checkout "$br" - else - echo "commit to this branch $br ? (empty = no, 'ok' = yes)" - read ok - if [ "x$ok" = xok ]; then - Git commit -am wip - #Git push - fi - fi - - status - - if [ -n "$mods" ]; then - return 0 - fi - fi - - if [ -n "$(echo "$stline" | grep behind)" ]; then - if [ -n "$(echo "$stline" | grep "and can be fast-forwarded")" ]; then - echo "fast forwarding..." - fastforwards="${fastforwards} $dir/$br:$(Git_may_fail rev-parse --short HEAD)" - ok="ok" - else - echo "Behind. git merge? (empty = no, 'ok' = yes)" - read ok - fi - if [ "x$ok" = xok ]; then - Git merge - fi - elif [ -n "$(echo "$stline" | grep ahead)" ]; then - echo "Ahead. commit to new branch? (enter name, empty = no)" - read wipbranch - if [ -n "$wipbranch" ]; then - Git checkout -b "$wipbranch" - Git_may_fail commit -am wip - #Git push --set-upstream origin "$wipbranch" - Git checkout "$br" - fi - echo "$br: git reset --hard origin/$br ? (empty = no, 'OK' IN CAPS = yes)" - read ok - if [ "x$ok" = xOK ]; then - Git reset --hard "origin/$br" - fi - return 0 - elif [ -n "$(echo "$stline" | grep diverged)" ]; then - echo "Diverged. git reset --hard origin/$br ? (empty = no, 'OK' IN CAPS = yes)" - read ok - if [ "x$ok" = xOK ]; then - wipbranch="neels/wip_$(date +%Y%m%d_%H%M)" - Git checkout -b "$wipbranch" - Git_may_fail commit -am wip - Git checkout "$br" - Git reset --hard "origin/$br" - fi - elif [ -z "$(echo "$stline" | grep up-to-date)" ]; then - echo "Nothing to do." - echo "$st" - fi - -} - -kill_gitk() { - if [ "$gitk_started" = "1" ]; then - kill %1 - gitk_started="0" - fi -} - - -basedir="$(pwd)" -gitk_started="0" -for gitdir in */.git ; do - cd "$basedir" - dir="$(dirname "$gitdir")" - - orig_branch="$(Git_branch)" - - kill_gitk - dance - cd "$basedir" - - if [ "$orig_branch" != master ]; then - kill_gitk - git -C "$dir" checkout master || continue - dance - cd "$basedir" - pwd - git -C "$dir" checkout "$orig_branch" - fi - -# if [ "$dir" = "openbsc" ]; then -# kill_gitk -# Git checkout "sysmocom/iu" -# dance -# fi - - sleep .1 - -done - -kill_gitk - -echo -echo -./st - -if [ -n "$fastforwards" ]; then - echo - echo "FAST-FORWARDED: $fastforwards" -fi - -# vim: shiftwidth=2 expandtab diff --git a/src/st b/src/st deleted file mode 100755 index a47de6b..0000000 --- a/src/st +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -git_dirs() { - for gitdir in */.git ; do - echo "$(dirname "$gitdir")" - done -} - -./git_branch_summary.py $(git_dirs) -# vim: shiftwidth=2 expandtab -- To view, visit https://gerrit.osmocom.org/11560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 Gerrit-Change-Number: 11560 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 20:41:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 31 Oct 2018 20:41:10 +0000 Subject: Change in osmo-dev[master]: replace src/* git scripts with a single src/gits In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11560 ) Change subject: replace src/* git scripts with a single src/gits ...................................................................... Patch Set 1: I'm not sure that this is ready yet, will work with it for a few days to see if it still needs fixing. But uploading it already to share with osmith. -- To view, visit https://gerrit.osmocom.org/11560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 Gerrit-Change-Number: 11560 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 31 Oct 2018 20:41:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 20:41:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 31 Oct 2018 20:41:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC_Types.ttcn: add MS-side related messages Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11561 Change subject: library/MNCC_Types.ttcn: add MS-side related messages ...................................................................... library/MNCC_Types.ttcn: add MS-side related messages Change-Id: Icc41074e80da7115cfbd5075f88a14fedaf73489 --- M library/MNCC_Types.ttcn 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/11561/1 diff --git a/library/MNCC_Types.ttcn b/library/MNCC_Types.ttcn index 157457a..a3714b1 100644 --- a/library/MNCC_Types.ttcn +++ b/library/MNCC_Types.ttcn @@ -115,6 +115,13 @@ MNCC_USERINFO_IND ('0126'O), MNCC_REJ_REQ ('0127'O), MNCC_REJ_IND ('0128'O), + MNCC_PROGRESS_IND ('0129'O), + MNCC_CALL_PROC_IND ('012a'O), + MNCC_CALL_CONF_REQ ('012b'O), + MNCC_START_DTMF_REQ ('012c'O), + MNCC_STOP_DTMF_REQ ('012d'O), + MNCC_HOLD_REQ ('012e'O), + MNCC_RETRIEVE_REQ ('012f'O), MNCC_BRIDGE ('0200'O), MNCC_FRAME_RECV ('0201'O), -- To view, visit https://gerrit.osmocom.org/11561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icc41074e80da7115cfbd5075f88a14fedaf73489 Gerrit-Change-Number: 11561 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Oct 31 20:42:03 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 31 Oct 2018 20:42:03 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_norma?= =?UTF-8?Q?l_:_master-osmo-ggsn_=C2=BB_--disabl?= =?UTF-8?Q?e-gtp-linux,a2=3Ddefault,a3=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#1051?= In-Reply-To: <1949842991.351.1540971398577.JavaMail.jenkins@jenkins.osmocom.org> References: <1949842991.351.1540971398577.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1464286144.357.1541018523346.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Oct 31 20:58:00 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 31 Oct 2018 20:58:00 +0000 Subject: Change in osmo-dev[master]: replace src/* git scripts with a single src/gits In-Reply-To: References: Message-ID: Hello osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11560 to look at the new patch set (#2). Change subject: replace src/* git scripts with a single src/gits ...................................................................... replace src/* git scripts with a single src/gits I keep re-using this functionality in completely unrelated realms, and decided to unify the oddly named scripts in a single 'gits' meta-repos tool, so I can just symlink this script into my ~/bin and use it everywhere. Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 --- M src/README D src/e D src/g D src/git_branch_summary.py A src/gits D src/s D src/st 7 files changed, 354 insertions(+), 298 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/60/11560/2 -- To view, visit https://gerrit.osmocom.org/11560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 Gerrit-Change-Number: 11560 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 21:10:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 31 Oct 2018 21:10:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11562 Change subject: WIP: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL ...................................................................... WIP: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL Change-Id: I438fd3ee82d88498d928dbcc89ce9bd80d37ab64 --- M bts/BTS_Tests.ttcn M library/RSL_Emulation.ttcn M library/RSL_Types.ttcn 3 files changed, 76 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/11562/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 5b073ef..0676214 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1344,17 +1344,37 @@ } } +/* Send RACH request through l1CTL and wait for ChanReq on RSL BST->BSC */ +private function f_rach_req_wait_chan_rqd(integer ra) runs on ConnHdlr return GsmFrameNumber { + var GsmFrameNumber fn; + timer T := 8.0; + + f_L1CTL_PARAM(L1CTL, g_pars.l1_pars.ms_actual_ta, g_pars.l1_pars.ms_power_level); + /* Send the actual RACH */ + log("PESPIN: calling f_L1CTL_RACH ", ra); + fn := f_L1CTL_RACH(L1CTL, ra); + log("PESPIN: called with fn returned ", fn); + /* advertise to RSL Emulation that we expect to receive confirmation from RACH */ + RSL.send(ts_RSLDC_ChanRqd(int2oct(ra,1), fn)); + T.start; + alt { + [] RSL.receive(tr_RSL_CHAN_RQD(int2oct(ra,1), fn)) { setverdict(pass, "Received CHAN-RQD from RACH REQ")} + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Timeout waiting for CHAN-RQD from RACH REQ <", ra, ", ", fn, ">")); + } + } + T.stop + return fn; +} /* Establish dedicated channel: L1CTL + RSL side */ private function f_est_dchan(boolean encr_enable := false) runs on ConnHdlr { - var GsmFrameNumber fn; var ImmediateAssignment imm_ass; var integer ra := 23; + var GsmFrameNumber fn; - f_L1CTL_PARAM(L1CTL, g_pars.l1_pars.ms_actual_ta, g_pars.l1_pars.ms_power_level); - fn := f_L1CTL_RACH(L1CTL, ra); - /* This arrives on CCHAN, so we cannot test for receiving CHAN RQDhere */ - //RSL.receive(tr_RSL_CHAN_RQD(int2oct(23,1))); + /* Send RACH request and wait for ChanReq */ + fn := f_rach_req_wait_chan_rqd(ra); /* Activate channel on BTS side */ f_rsl_chan_act(g_pars.chan_mode, encr_enable); diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn index cf02d00..24c9202 100644 --- a/library/RSL_Emulation.ttcn +++ b/library/RSL_Emulation.ttcn @@ -148,7 +148,7 @@ runs on RSL_Emulation_CT return integer { var integer i; for (i := 0; i < sizeof(ConnectionTable); i := i+1) { - if (ispresent(ConnectionTable[i].comp_ref) and + if (ispresent(ConnectionTable[i].comp_ref) and ConnectionTable[i].comp_ref == comp_ref) { return i; } @@ -161,7 +161,7 @@ runs on RSL_Emulation_CT return integer { var integer i; for (i := 0; i < sizeof(ConnectionTable); i := i+1) { - if (ispresent(ConnectionTable[i].chan_nr) and + if (ispresent(ConnectionTable[i].chan_nr) and ConnectionTable[i].chan_nr == chan_nr and ConnectionTable[i].trx_nr == trx_nr) { return i; } @@ -183,6 +183,24 @@ return -1; } +private function f_cid_by_ra_fn2(OCT1 ra, RSL_IE_FrameNumber fn) +runs on RSL_Emulation_CT return integer { + var RSL_IE_FrameNumber ct_fn; + var integer i; + for (i := 0; i < sizeof(ConnectionTable); i := i+1) { + if (ispresent(ConnectionTable[i].ra) and + ConnectionTable[i].ra == ra) { + ct_fn := f_compute_RSL_IE_FrameNumber(ConnectionTable[i].ra_fn); + log("PESPIN: matching ", fn, " with ", ct_fn) + if (ct_fn == fn) { + return i; + } + } + } + log("No Dchan handler for ", ra, fn); + return -1; +} + /* create an ew client with given RA and FN */ private function f_cid_create(OCT1 ra, GsmFrameNumber fn, RSL_DchanHdlr comp_ref) runs on RSL_Emulation_CT { @@ -394,6 +412,23 @@ } } } + [not bts_role] IPA_PT.receive(tr_RSL(tr_RSL_CHAN_RQD(?))) -> value rx_rsl { + var RSL_IE_RequestRef req_ref; + var OCT1 ra; + var GsmFrameNumber fn; + req_ref := rx_rsl.rsl.ies[1].body.req_ref; + ra := req_ref.ra + //fn := 23; //FIXME(req_ref.frame_nr); + cid := f_cid_by_ra_fn2(req_ref.ra, req_ref.frame_nr); + if (cid != -1) { + //ConnectionTable[cid].chan_nr := rx_rsl.rsl.ies[0].body.chan_nr; + CLIENT_PT.send(rx_rsl.rsl) to ConnectionTable[cid].comp_ref; + f_cid_clear(cid); + } else { + log("Received CHAN-RQD from unknown RACH REQ", req_ref); + CCHAN_PT.send(rx_rsl); + } + } [bts_role] IPA_PT.receive(tr_RSL(tr_RSL_PAGING_CMD(?, ?))) -> value rx_rsl { /* broadcast to all clients? */ @@ -446,6 +481,11 @@ ts_RSL_CHAN_RQD(chan_rqd.ra, chan_rqd.fn))); } + [not bts_role] CLIENT_PT.receive(RSLDC_ChanRqd:?) -> value chan_rqd sender vc_conn { + /* Store the knowledge that this sender has requested a certain RQ+time */ + f_cid_create(chan_rqd.ra, chan_rqd.fn, vc_conn); + } + [] CLIENT_PT.receive(tr_RSL_MsgType(?)) -> value rx_rsl_msg sender vc_conn { /* forward to BSC */ cid := f_cid_by_comp_ref(vc_conn); diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index cd4ba58..1741c01 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -404,6 +404,15 @@ } type RSL_IE_FrameNumber RSL_IE_StartingTime; + /* compute the expected request reference for given RA + FN */ + function f_compute_RSL_IE_FrameNumber(GsmFrameNumber fn) return RSL_IE_FrameNumber { + var RSL_IE_FrameNumber frame_nr; + frame_nr.t1_p := (fn / 1326) mod 32; + frame_nr.t2 := fn mod 26; + frame_nr.t3 := fn mod 51; + return frame_nr + } + /* 9.3.10 */ type record RSL_IE_L1Info { uint5_t ms_power_lvl, -- To view, visit https://gerrit.osmocom.org/11562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I438fd3ee82d88498d928dbcc89ce9bd80d37ab64 Gerrit-Change-Number: 11562 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 22:04:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 22:04:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC_Types.ttcn: add MS-side related messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11561 ) Change subject: library/MNCC_Types.ttcn: add MS-side related messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icc41074e80da7115cfbd5075f88a14fedaf73489 Gerrit-Change-Number: 11561 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 31 Oct 2018 22:04:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 22:04:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 22:04:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC_Types.ttcn: add MS-side related messages In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11561 ) Change subject: library/MNCC_Types.ttcn: add MS-side related messages ...................................................................... library/MNCC_Types.ttcn: add MS-side related messages Change-Id: Icc41074e80da7115cfbd5075f88a14fedaf73489 --- M library/MNCC_Types.ttcn 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/library/MNCC_Types.ttcn b/library/MNCC_Types.ttcn index 157457a..a3714b1 100644 --- a/library/MNCC_Types.ttcn +++ b/library/MNCC_Types.ttcn @@ -115,6 +115,13 @@ MNCC_USERINFO_IND ('0126'O), MNCC_REJ_REQ ('0127'O), MNCC_REJ_IND ('0128'O), + MNCC_PROGRESS_IND ('0129'O), + MNCC_CALL_PROC_IND ('012a'O), + MNCC_CALL_CONF_REQ ('012b'O), + MNCC_START_DTMF_REQ ('012c'O), + MNCC_STOP_DTMF_REQ ('012d'O), + MNCC_HOLD_REQ ('012e'O), + MNCC_RETRIEVE_REQ ('012f'O), MNCC_BRIDGE ('0200'O), MNCC_FRAME_RECV ('0201'O), -- To view, visit https://gerrit.osmocom.org/11561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icc41074e80da7115cfbd5075f88a14fedaf73489 Gerrit-Change-Number: 11561 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 22:06:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 22:06:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cosmetic: fix typos In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11553 ) Change subject: cosmetic: fix typos ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11553 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6e75af46e134d33f752214988054105aba91366c Gerrit-Change-Number: 11553 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 31 Oct 2018 22:06:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 22:06:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 22:06:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC: remove explicit address In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11554 ) Change subject: BSC: remove explicit address ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ideb8a78348af435f9992c42bce0bb197d1e73e04 Gerrit-Change-Number: 11554 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 31 Oct 2018 22:06:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 22:07:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 22:07:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC LCLS: restructure tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11555 ) Change subject: BSC LCLS: restructure tests ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idf9fc8e639b0ece662ab26c481899ef39fb7edfe Gerrit-Change-Number: 11555 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 31 Oct 2018 22:07:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 22:07:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 22:07:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC LCLS: explicitly check for RSL_IE_CHAN_NR In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11556 ) Change subject: BSC LCLS: explicitly check for RSL_IE_CHAN_NR ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icc6824d7acef809d76c70b5ff060a8261a82e2be Gerrit-Change-Number: 11556 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 31 Oct 2018 22:07:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 22:07:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 22:07:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cosmetic: fix compilation warnings In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11557 ) Change subject: cosmetic: fix compilation warnings ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6210ecf5fcb39f751116ad63a69d2ae8651a60c5 Gerrit-Change-Number: 11557 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 31 Oct 2018 22:07:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 22:11:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 22:11:10 +0000 Subject: Change in osmo-pcap[master]: contrib/jenkins.sh: Update to current osmocom infra In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11549 ) Change subject: contrib/jenkins.sh: Update to current osmocom infra ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14 Gerrit-Change-Number: 11549 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 31 Oct 2018 22:11:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 22:12:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 22:12:00 +0000 Subject: Change in osmo-pcap[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11545 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id938f3dab4826ac748abb5e0b169d800c2a625a5 Gerrit-Change-Number: 11545 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 31 Oct 2018 22:12:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 22:12:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 22:12:28 +0000 Subject: Change in osmo-dev[master]: deps: osmo-sgsn depends on osmo-hlr's liboso-gsup-client In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11537 ) Change subject: deps: osmo-sgsn depends on osmo-hlr's liboso-gsup-client ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie47ca98740ca438e04d6ea76421e0f58d9e5715a Gerrit-Change-Number: 11537 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 31 Oct 2018 22:12:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 22:13:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 22:13:06 +0000 Subject: Change in osmo-iuh[master]: add a VTY command which shows a specific HNB In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11506 ) Change subject: add a VTY command which shows a specific HNB ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iab12aa4ab090b72c472358b84daf6919b30747f6 Gerrit-Change-Number: 11506 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 31 Oct 2018 22:13:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 22:13:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 22:13:07 +0000 Subject: Change in osmo-iuh[master]: add a VTY command which shows a specific HNB In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11506 ) Change subject: add a VTY command which shows a specific HNB ...................................................................... add a VTY command which shows a specific HNB Add the 'show hnb NAME' VTY command which displays just one specific HNB, addressed by its identity string. This augments the functionality provided by 'show hnb all'. Change-Id: Iab12aa4ab090b72c472358b84daf6919b30747f6 Related: OS#2774 --- M include/osmocom/iuh/hnbgw.h M src/hnbgw.c M src/hnbgw_vty.c 3 files changed, 37 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/iuh/hnbgw.h b/include/osmocom/iuh/hnbgw.h index db49dc1..4848c2f 100644 --- a/include/osmocom/iuh/hnbgw.h +++ b/include/osmocom/iuh/hnbgw.h @@ -151,6 +151,7 @@ extern void *talloc_asn1_ctx; struct hnb_context *hnb_context_by_id(struct hnb_gw *gw, uint32_t cid); +struct hnb_context *hnb_context_by_identity_info(struct hnb_gw *gw, const char *identity_info); unsigned hnb_contexts(const struct hnb_gw *gw); struct ue_context *ue_context_by_id(struct hnb_gw *gw, uint32_t id); diff --git a/src/hnbgw.c b/src/hnbgw.c index cd6104b..e40996f 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -105,6 +105,19 @@ return NULL; } +struct hnb_context *hnb_context_by_identity_info(struct hnb_gw *gw, const char *identity_info) +{ + struct hnb_context *hnb; + + llist_for_each_entry(hnb, &gw->hnb_list, list) { + if (strcmp(identity_info, hnb->identity_info) == 0) + return hnb; + } + + return NULL; +} + + unsigned hnb_contexts(const struct hnb_gw *gw) { unsigned num_ctx = 0; diff --git a/src/hnbgw_vty.c b/src/hnbgw_vty.c index 859cd31..15fdaf8 100644 --- a/src/hnbgw_vty.c +++ b/src/hnbgw_vty.c @@ -200,7 +200,7 @@ vty_out(vty, "UE IMSI \"%s\" context ID %u%s", ue->imsi, ue->context_id, VTY_NEWLINE); } -DEFUN(show_hnb, show_hnb_cmd, "show hnb all", SHOW_STR "Display information about a HNB") +DEFUN(show_hnb, show_hnb_cmd, "show hnb all", SHOW_STR "Display information about all HNB") { struct hnb_context *hnb; unsigned int count = 0; @@ -220,6 +220,27 @@ return CMD_SUCCESS; } +DEFUN(show_one_hnb, show_one_hnb_cmd, "show hnb NAME ", SHOW_STR "Display information about a HNB") +{ + struct hnb_context *hnb; + int found = 0; + const char *identity_info = argv[0]; + + if (llist_empty(&g_hnb_gw->hnb_list)) { + vty_out(vty, "No HNB connected%s", VTY_NEWLINE); + return CMD_SUCCESS; + } + + hnb = hnb_context_by_identity_info(&g_hnb_gw, identity_info); + if (hnb == NULL) { + vty_out(vty, "No HNB found with identity '%s'%s", identity_info, VTY_NEWLINE); + return CMD_SUCCESS; + } + + vty_dump_hnb_info(vty, hnb); + return CMD_SUCCESS; +} + DEFUN(show_ue, show_ue_cmd, "show ue all", SHOW_STR "Display information about a UE") { struct ue_context *ue; @@ -377,6 +398,7 @@ install_element_ve(&show_cnlink_cmd); install_element_ve(&show_hnb_cmd); + install_element_ve(&show_one_hnb_cmd); install_element_ve(&show_ue_cmd); install_element_ve(&show_talloc_cmd); } -- To view, visit https://gerrit.osmocom.org/11506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iab12aa4ab090b72c472358b84daf6919b30747f6 Gerrit-Change-Number: 11506 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 22:14:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 31 Oct 2018 22:14:11 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11521 ) Change subject: add DLCX command statistics to osmo-mgw ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 31 Oct 2018 22:14:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 31 22:34:59 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 31 Oct 2018 22:34:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cosmetic: fix typos In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11553 ) Change subject: cosmetic: fix typos ...................................................................... Patch Set 1: FYI, I don't have permissions to submit this change - someone else have to do it. -- To view, visit https://gerrit.osmocom.org/11553 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6e75af46e134d33f752214988054105aba91366c Gerrit-Change-Number: 11553 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Wed, 31 Oct 2018 22:34:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From dwillmann at sysmocom.de Tue Oct 9 15:47:38 2018 From: dwillmann at sysmocom.de (Daniel Willmann) Date: Tue, 09 Oct 2018 15:47:38 -0000 Subject: Change in osmo-sip-connector[master]: Fix mncc socket name In-Reply-To: <20181005175548.770BF103@isonoe.totalueberwachung.de> References: <20181005175548.770BF103@isonoe.totalueberwachung.de> Message-ID: On Fri, 2018-10-05 at 17:55 +0000, Keith Whyte wrote: > Keith Whyte has posted comments on this change. ( > https://gerrit.osmocom.org/11240 ) > > Change subject: Fix mncc socket name > Hmm.. broken now for anybody who was using osmo-nitb... of course > they can fix it by passing the socket name to nitb Yeah, I sort of assumed (wrongly?) that the socket name would be explicitly set in the osmo-sip-connector config file for any more complex/unusual setup. In that case everything should continue working. Regards, Daniel -- - Daniel Willmann http://www.sysmocom.de/ ======================================================================= * sysmocom - systems for mobile communications GmbH * Alt-Moabit 93 * 10559 Berlin, Germany * Sitz / Registered office: Berlin, HRB 134158 B * Geschaeftsfuehrer / Managing Directors: Harald Welte